diff --git a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_system_tables.sql b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_system_tables.sql
index 6c2d34c9f..c8f775b3a 100644
--- a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_system_tables.sql
+++ b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_system_tables.sql
@@ -22,7 +22,22 @@
 UPDATE acs_objects
    SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTree',
        default_domain_class = 'com.arsdigita.cms.contenttypes.DecisionTree'
- WHERE default_domain_class = 'com.arsdigita.camden.cms.contenttypes.DecisionTree' ;
+ WHERE default_domain_class = 'com.arsdigita.camden.cms.contenttypes.DecisionTree';
+
+UPDATE acs_objects
+   SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTreeOptionTarget',
+       default_domain_class = 'com.arsdigita.cms.contenttypes.DecisionTreeOptionTarget'
+ WHERE default_domain_class = 'com.arsdigita.camden.cms.contenttypes.OptionTarget';
+
+UPDATE acs_objects
+   SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTreeSection',
+       default_domain_class = 'com.arsdigita.cms.contenttypes.DecisionTreeSection'
+ WHERE default_domain_class = 'com.arsdigita.camden.cms.contenttypes.TreeSection';
+
+UPDATE acs_objects
+   SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTreeSectionOption',
+       default_domain_class = 'com.arsdigita.cms.contenttypes.DecisionTreeSectionOption'
+ WHERE default_domain_class = 'com.arsdigita.camden.cms.contenttypes.SectionOption';
 
 --Adjust content type decisiontree in contenttype directory table
 UPDATE content_types
@@ -30,6 +45,24 @@ UPDATE content_types
        classname = 'com.arsdigita.cms.contenttypes.DecisionTree'
  WHERE object_type = 'com.arsdigita.camden.cms.contenttypes.DecisionTree' ;
 
+UPDATE content_types
+   SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTreeOptionTarget', 
+       classname = 'com.arsdigita.cms.contenttypes.DecisionTree'
+ WHERE object_type = 'com.arsdigita.camden.cms.contenttypes.OptionTarget' ;
+
+UPDATE content_types
+   SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTreeOptionSection', 
+       classname = 'com.arsdigita.cms.contenttypes.DecisionTree'
+ WHERE object_type = 'com.arsdigita.camden.cms.contenttypes.TreeSection' ;
+
+UPDATE content_types
+   SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTreeSectionOption', 
+       classname = 'com.arsdigita.cms.contenttypes.DecisionTree'
+ WHERE object_type = 'com.arsdigita.camden.cms.contenttypes.OptionSection' ;
+
+
+
+
 --Adjust content type decisiontree in authoring_steps directory table
 UPDATE authoring_steps 
    SET component = 'com.arsdigita.cms.contenttypes.ui.DecisionTreePropertiesStep'
diff --git a/ccm-cms-types-decisiontree/src/ccm-cms-types-decisiontree.upgrade b/ccm-cms-types-decisiontree/src/ccm-cms-types-decisiontree.upgrade
index 1569cdf65..0bea21e0b 100644
--- a/ccm-cms-types-decisiontree/src/ccm-cms-types-decisiontree.upgrade
+++ b/ccm-cms-types-decisiontree/src/ccm-cms-types-decisiontree.upgrade
@@ -2,9 +2,6 @@
 
   <version from="1.0.3" to="6.6.0">
     <script sql="ccm-cms-types-decisiontree/upgrade/::database::-1.0.3-6.6.0.sql"/>
-<!--    (just for easy reference in copy'nd'past programming  :-)  )
-    <script class="com.arsdigita.cms.contenttypes.upgrade.CreateGenericContentTypes"/>
--->
   </version>
 
 </upgrade>
diff --git a/ccm-ldn-aplaws/application.xml b/ccm-ldn-aplaws/application.xml
index 9229be217..3f6cd67c4 100755
--- a/ccm-ldn-aplaws/application.xml
+++ b/ccm-ldn-aplaws/application.xml
@@ -21,6 +21,7 @@
 
   <ccm:directories>
     <ccm:directory name="pdl"/>
+    <ccm:directory name="sql"/>
     <ccm:directory name="src"/>
   </ccm:directories>
 
diff --git a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/0.0.0-6.6.1/remove_htmlform.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/0.0.0-6.6.1/remove_htmlform.sql
index 5656f0726..17541f7b0 100644
--- a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/0.0.0-6.6.1/remove_htmlform.sql
+++ b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/0.0.0-6.6.1/remove_htmlform.sql
@@ -24,7 +24,22 @@ DELETE FROM init_requirements WHERE required_init = 'com.arsdigita.cms.contentty
                                  OR init = 'com.arsdigita.cms.contenttypes.HTMLFormInitializer';
 DELETE FROM inits WHERE class_name = 'com.arsdigita.cms.contenttypes.HTMLFormInitializer';
 
-INSERT INTO ct_articles (item_id, lead) VALUES (SELECT item_id, lead FROM ct_htmlform);
+-- HTMLForm did not have its own table in APLAWS 1.0.4
+-- INSERT INTO ct_articles (item_id, lead) SELECT item_id, lead FROM ct_htmlform;
+DELETE FROM authoring_kit_step_map 
+      WHERE kit_id = (SELECT kit_id 
+                        FROM authoring_kits 
+                       WHERE type_id = (SELECT type_id 
+                                          FROM content_types 
+                                         WHERE object_type = 'com.arsdigita.cms.contenttypes.HTMLForm'));
+
+DELETE FROM authoring_steps WHERE component = 'com.arsdigita.cms.contenttypes.ui.HTMLFormPropertiesStep';
+
+DELETE FROM authoring_kits 
+      WHERE type_id = (SELECT type_id 
+                         FROM content_types 
+                        WHERE object_type = 'com.arsdigita.cms.contenttypes.HTMLForm');
+
 UPDATE cms_items 
    SET type_id = (SELECT type_id FROM content_types WHERE object_type = 'com.arsdigita.cms.contenttypes.Article')
  WHERE type_id = (SELECT type_id FROM content_types WHERE object_type = 'com.arsdigita.cms.contenttypes.HTMLForm');
@@ -50,6 +65,10 @@ UPDATE vcx_tags
    SET tagged_oid = REPLACE(tagged_oid,'com.arsdigita.cms.contenttypes.HTMLForm', 'com.arsdigita.cms.contenttypes.Article')
  WHERE tagged_oid LIKE '%com.arsdigita.cms.contenttypes.HTMLForm%';
 
+DELETE FROM content_section_type_map 
+      WHERE type_id = (SELECT type_id 
+                         FROM content_types 
+                        WHERE object_type = 'com.arsdigita.cms.contenttypes.HTMLForm');
 DELETE FROM content_types WHERE object_type = 'com.arsdigita.cms.contenttypes.HTMLForm';
 
 DROP TABLE IF EXISTS ct_htmlform;
\ No newline at end of file
diff --git a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-0.0.0-6.6.1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/oracle-se-0.0.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-0.0.0-6.6.1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/oracle-se-0.0.0-6.6.1.sql
diff --git a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/oracle-se-1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/oracle-se-1.sql
diff --git a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-2.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/oracle-se-2.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-2.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/oracle-se-2.sql
diff --git a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-0.0.0-6.6.1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/postgres-0.0.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-0.0.0-6.6.1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/postgres-0.0.0-6.6.1.sql
diff --git a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/postgres-1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/postgres-1.sql
diff --git a/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-2.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/postgres-2.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-2.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/postgres-2.sql