diff --git a/ccm-ldn-aplaws/sql/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
similarity index 100%
rename from ccm-ldn-aplaws/sql/default/upgrade/0.0.0-6.6.1/remove_htmlform.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/0.0.0-6.6.1/remove_htmlform.sql
diff --git a/ccm-ldn-aplaws/sql/default/upgrade/content-types.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/content-types.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/default/upgrade/content-types.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/default/upgrade/content-types.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/fk-indexes.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/fk-indexes.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/fk-indexes.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/fk-indexes.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/content-types.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/content-types.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/content-types.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/content-types.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/deferred.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/deferred.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/deferred.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/deferred.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/delete-public-registered.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/delete-public-registered.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/delete-public-registered.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/delete-public-registered.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/formbuilder.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/formbuilder.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/formbuilder.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/formbuilder.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/portals.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/portals.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/portals.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/portals.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/table-vc_objects.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/table-vc_objects.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/table-vc_objects.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/table-vc_objects.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-1.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-2.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-2.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-2.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-2.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-3.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-3.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-3.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/1.1.18-1.2.10/upgrade-1.1.18-1.2.10-3.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.0-1.0.1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.0-1.0.1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.0-1.0.1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.0-1.0.1.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.1-1.0.2.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.1-1.0.2.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.1-1.0.2.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.1-1.0.2.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.10-1.0.11.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.10-1.0.11.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.10-1.0.11.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.10-1.0.11.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.11-1.0.12.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.11-1.0.12.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.11-1.0.12.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.11-1.0.12.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.12-1.1.1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.12-1.1.1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.12-1.1.1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.12-1.1.1.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.2-1.0.3.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.2-1.0.3.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.2-1.0.3.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.2-1.0.3.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.3-1.0.4.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.3-1.0.4.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.3-1.0.4.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.3-1.0.4.sql
diff --git a/ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.4-1.0.5.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.4-1.0.5.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/oracle-se/upgrade/aplaws-1.0.4-1.0.5.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/oracle-se/upgrade/aplaws-1.0.4-1.0.5.sql
diff --git a/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-0.0.0-6.6.1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-0.0.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-0.0.0-6.6.1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-0.0.0-6.6.1.sql
diff --git a/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-1.sql
diff --git a/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-2.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-2.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-2.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/oracle-se-2.sql
diff --git a/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-0.0.0-6.6.1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-0.0.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-0.0.0-6.6.1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-0.0.0-6.6.1.sql
diff --git a/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-1.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-1.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-1.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-1.sql
diff --git a/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-2.sql b/ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-2.sql
similarity index 100%
rename from ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-2.sql
rename to ccm-ldn-aplaws/sql/ccm-ldn-aplaws/upgrade/ccm-ldn-aplaws/postgres-2.sql