diff --git a/ccm-cms-assets-fileattachment/src/ccm-cms-assets-fileattachment.config b/ccm-cms-assets-fileattachment/src/ccm-cms-assets-fileattachment.config
index 2be3502f3..a8d55bf8f 100755
--- a/ccm-cms-assets-fileattachment/src/ccm-cms-assets-fileattachment.config
+++ b/ccm-cms-assets-fileattachment/src/ccm-cms-assets-fileattachment.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
    <config class="com.arsdigita.cms.contentassets.FileAttachmentConfig"
-           storage="ccm-cms-assets-fileattachment/fa.properties"/>
+           storage="ccm-cms-assets/fileattachment.properties"/>
 </registry>
diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contenttypes/ui/FileAttachmentsStep.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contenttypes/ui/FileAttachmentsStep.java
deleted file mode 100755
index 5d5b5e65e..000000000
--- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contenttypes/ui/FileAttachmentsStep.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2004 Red Hat Inc. All Rights Reserved.
- *
- * The contents of this file are subject to the Open Software License v2.1
- * (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://rhea.redhat.com/licenses/osl2.1.html.
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- */
-package com.arsdigita.cms.contenttypes.ui;
-
-import com.arsdigita.cms.ItemSelectionModel;
-import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
-
-/**
- * @deprecated use {@link
- * com.arsdigita.cms.contentassets.ui.FileAttachmentsStep} instead
- */
-public class FileAttachmentsStep
-        extends com.arsdigita.cms.contentassets.ui.FileAttachmentsStep {
-    public FileAttachmentsStep(ItemSelectionModel itemModel,
-                               AuthoringKitWizard parent) {
-        super(itemModel, parent);
-    }
-}
diff --git a/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java b/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java
index fbf6935a1..c6d95982e 100755
--- a/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java
+++ b/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java
@@ -33,7 +33,7 @@ import java.math.BigDecimal;
  * @author Jack Chung (flattop@arsdigita.com)
  * @version $Id: AuthoringKitStepAssociation.java 287 2005-02-22 00:29:02Z sskracic $
  */
-class AuthoringKitStepAssociation extends DomainObject {
+public class AuthoringKitStepAssociation extends DomainObject {
 
     public static final String BASE_DATA_OBJECT_TYPE =
         "com.arsdigita.cms.AuthoringKitStepAssociation";
diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/applications.cfg b/ccm-gen-aplaws/bundles/handbook/cfg/applications.cfg
index 2353733a6..c13c6e098 100755
--- a/ccm-gen-aplaws/bundles/handbook/cfg/applications.cfg
+++ b/ccm-gen-aplaws/bundles/handbook/cfg/applications.cfg
@@ -4,6 +4,7 @@ ccm-cms
 
 # Content assets
 ccm-cms-assets-fileattachment
+ccm-cms-assets-imagestep
 ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
 ## -- ccm-ldn-dublin  ist das eigentlich ein asset?
@@ -29,7 +30,7 @@ ccm-forum
 ccm-user-preferences
 
 # LDN extensions
-ccm-ldn-image-step
+# ##  ccm-ldn-image-step
 ccm-ldn-navigation
 ccm-ldn-portal
 ccm-ldn-rss
diff --git a/environment/project.xml.handbook b/environment/project.xml.handbook
index 0a0a105b4..33b762654 100644
--- a/environment/project.xml.handbook
+++ b/environment/project.xml.handbook
@@ -7,8 +7,8 @@
               ccmVersion="6.1" 
                     name="aplaws-handbook" 
               prettyName="APLAWS plus" 
-                 version="1-0-9" 
-                 release="rc-5" 
+                 version="1-1-0" 
+                 release="423" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -23,6 +23,7 @@
 <!--   Content Assets   -->
 <!--   - - - - - - -    -->
         <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
         <ccm:application name="ccm-cms-assets-notes"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
@@ -76,7 +77,7 @@
 <!--    <ccm:application name="ccm-ldn-dublin"/>                     -->
 <!--    <ccm:application name="ccm-ldn-exporter"/>                   -->
 <!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
-        <ccm:application name="ccm-ldn-image-step"/>
+<!--    <ccm:application name="ccm-ldn-image-step"/>                 -->
 <!--    <ccm:application name="ccm-ldn-importer"/>                   -->
         <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-portal"/>