diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 8e9a6a461..32d0af0f1 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index e9b82dd73..c8a56ad58 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 519563624..e1ae789ef 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -81,69 +81,69 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
-        <artifactId>ebean-ddlgen</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <artifactId>ebean-ddl-generator</artifactId>
+        <version>12.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.5.3-SNAPSHOT</version>
+        <version>12.6.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 4511ccfa9..b3f5ecf2c 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -66,7 +66,7 @@
       <version>1.0</version>
     </dependency>
 
-    <!-- keep testing in core using ebean-ddlgen & ebean-migration -->
+    <!-- keep testing in core using ebean-ddl-generator & ebean-migration -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
@@ -81,7 +81,7 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- test scope for supporting ebean-ddlgen -->
+    <!-- test scope for supporting ebean-ddl-generator -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
@@ -92,13 +92,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddlgen/pom.xml b/ebean-ddl-generator/pom.xml
similarity index 95%
rename from ebean-ddlgen/pom.xml
rename to ebean-ddl-generator/pom.xml
index bafb0c6d9..1dc41ffcb 100644
--- a/ebean-ddlgen/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
   <description>DDL and DB Migration generation</description>
-  <artifactId>ebean-ddlgen</artifactId>
+  <artifactId>ebean-ddl-generator</artifactId>
 <!--  <version>12.5.2A</version>-->
 
   <dependencies>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddlgen/src/main/java/io/ebean/dbmigration/DbMigration.java b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebean/dbmigration/DbMigration.java
rename to ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java
diff --git a/ebean-ddlgen/src/main/java/io/ebean/dbmigration/package-info.java b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/package-info.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebean/dbmigration/package-info.java
rename to ebean-ddl-generator/src/main/java/io/ebean/dbmigration/package-info.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DdlGeneratorProvider.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGeneratorProvider.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DdlGeneratorProvider.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGeneratorProvider.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/Detect.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/Detect.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/LastMigration.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlOptions.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlOptions.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlOptions.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlOptions.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/PlatformDdlBuilder.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/PlatformDdlBuilder.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/PlatformDdlBuilder.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/PlatformDdlBuilder.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/AbstractHanaDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlHandler.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlHandler.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlHandler.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlHandler.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseTableDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlIdentity.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlIdentity.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlIdentity.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlIdentity.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2Ddl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2Ddl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2Ddl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2Ddl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaColumnStoreDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlHandler.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlHandler.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlHandler.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlHandler.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaRowStoreDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaRowStoreDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaRowStoreDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaRowStoreDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaTableDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HsqldbDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HsqldbDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HsqldbDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HsqldbDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbHistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbHistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbHistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArray.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArray.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArray.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArray.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbHistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbHistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NuoDbHistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Postgres9Ddl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Postgres9Ddl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Postgres9Ddl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Postgres9Ddl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SplitColumns.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteCreateIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteCreateIndex.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteCreateIndex.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteCreateIndex.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteForeignKey.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteUniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteUniqueConstraint.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteUniqueConstraint.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/WriteUniqueConstraint.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexColumns.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexColumns.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexColumns.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexColumns.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexSet.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexSet.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexSet.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexSet.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemover.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemover.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemover.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemover.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundForeignKey.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MConfiguration.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MIndex.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationResource.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PendingDrops.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitor.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanVisitor.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanVisitor.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/BeanVisitor.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/package-info.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/package-info.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/package-info.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java
similarity index 100%
rename from ebean-ddlgen/src/main/java/io/ebeaninternal/extraddl/model/package-info.java
rename to ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java
diff --git a/ebean-ddlgen/src/main/resources/META-INF/MANIFEST.MF b/ebean-ddl-generator/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from ebean-ddlgen/src/main/resources/META-INF/MANIFEST.MF
rename to ebean-ddl-generator/src/main/resources/META-INF/MANIFEST.MF
diff --git a/ebean-ddlgen/src/main/resources/META-INF/services/io.ebean.dbmigration.DbMigration b/ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.dbmigration.DbMigration
similarity index 100%
rename from ebean-ddlgen/src/main/resources/META-INF/services/io.ebean.dbmigration.DbMigration
rename to ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.dbmigration.DbMigration
diff --git a/ebean-ddlgen/src/main/resources/META-INF/services/io.ebeaninternal.api.SpiDdlGeneratorProvider b/ebean-ddl-generator/src/main/resources/META-INF/services/io.ebeaninternal.api.SpiDdlGeneratorProvider
similarity index 100%
rename from ebean-ddlgen/src/main/resources/META-INF/services/io.ebeaninternal.api.SpiDdlGeneratorProvider
rename to ebean-ddl-generator/src/main/resources/META-INF/services/io.ebeaninternal.api.SpiDdlGeneratorProvider
diff --git a/ebean-ddlgen/src/main/resources/ebean-dbmigration-1.0.xsd b/ebean-ddl-generator/src/main/resources/ebean-dbmigration-1.0.xsd
similarity index 100%
rename from ebean-ddlgen/src/main/resources/ebean-dbmigration-1.0.xsd
rename to ebean-ddl-generator/src/main/resources/ebean-dbmigration-1.0.xsd
diff --git a/ebean-ddlgen/src/main/resources/ebean-extraddl-1.0.xsd b/ebean-ddl-generator/src/main/resources/ebean-extraddl-1.0.xsd
similarity index 100%
rename from ebean-ddlgen/src/main/resources/ebean-extraddl-1.0.xsd
rename to ebean-ddl-generator/src/main/resources/ebean-extraddl-1.0.xsd
diff --git a/ebean-ddlgen/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml b/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml
similarity index 100%
rename from ebean-ddlgen/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml
rename to ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl-partitioning.xml
diff --git a/ebean-ddlgen/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
similarity index 100%
rename from ebean-ddlgen/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
rename to ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
diff --git a/ebean-ddlgen/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebean/BaseTestCase.java
rename to ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
diff --git a/ebean-ddlgen/src/test/java/io/ebean/ConditionalTestRunner.java b/ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebean/ConditionalTestRunner.java
rename to ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java
diff --git a/ebean-ddlgen/src/test/java/io/ebean/annotation/ForPlatform.java b/ebean-ddl-generator/src/test/java/io/ebean/annotation/ForPlatform.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebean/annotation/ForPlatform.java
rename to ebean-ddl-generator/src/test/java/io/ebean/annotation/ForPlatform.java
diff --git a/ebean-ddlgen/src/test/java/io/ebean/annotation/IgnorePlatform.java b/ebean-ddl-generator/src/test/java/io/ebean/annotation/IgnorePlatform.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebean/annotation/IgnorePlatform.java
rename to ebean-ddl-generator/src/test/java/io/ebean/annotation/IgnorePlatform.java
diff --git a/ebean-ddlgen/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java b/ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
rename to ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DefaultDbMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DefaultDbMigrationTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/DefaultDbMigrationTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DefaultDbMigrationTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/H2PlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/H2PlatformTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/H2PlatformTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/H2PlatformTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/LastMigrationTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/MySqlPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MySqlPlatformTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/MySqlPlatformTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MySqlPlatformTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/OraclePlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/OraclePlatformTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/OraclePlatformTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/OraclePlatformTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/PostgresPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/PostgresPlatformTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/PostgresPlatformTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/PostgresPlatformTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/Helper.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/Helper.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/Helper.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/Helper.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArrayTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/IndexSetTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NativeDbArrayTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdlTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdlTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdlTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdlTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdlTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdlTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdlTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriterTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MColumnTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/MTableIdentityTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableIdentityTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/MTableIdentityTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableIdentityTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MTableTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelDiffTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/PendingDropsTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
diff --git a/ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
rename to ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-ddl-generator/src/test/java/misc/migration/history/v1_0/EHistory7.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/history/v1_0/EHistory7.java
rename to ebean-ddl-generator/src/test/java/misc/migration/history/v1_0/EHistory7.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/history/v1_1/EHistory7.java b/ebean-ddl-generator/src/test/java/misc/migration/history/v1_1/EHistory7.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/history/v1_1/EHistory7.java
rename to ebean-ddl-generator/src/test/java/misc/migration/history/v1_1/EHistory7.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyAssoc.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/CKeyAssoc.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyAssoc.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/CKeyDetail.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyDetail.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/CKeyDetail.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyDetail.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/CKeyParent.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParent.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/CKeyParent.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParent.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/CKeyParentId.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParentId.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/CKeyParentId.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/CKeyParentId.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkCascade.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascade.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkCascade.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascade.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascadeOne.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkCascadeOne.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkCascadeOne.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkNone.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNone.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkNone.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNone.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkOne.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkOne.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkOne.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkSetNull.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkSetNull.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/DfkSetNull.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/DfkSetNull.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EBasic.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/EBasic.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/EBasic.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EEnum.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/EEnum.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/EEnum.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory2.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory2.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory2.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory3.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory3.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory3.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory4.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory4.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory4.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory5.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory5.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory5.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory6.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/EHistory6.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/EHistory6.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/ERef.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/ERef.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/ERef.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/ERef.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/ESoftdelete.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/ESoftdelete.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/ESoftdelete.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/ESoftdelete.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/MtmChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmChild.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/MtmChild.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmChild.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/MtmMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmMaster.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/MtmMaster.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/MtmMaster.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/OtoChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoChild.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/OtoChild.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoChild.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_0/OtoMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoMaster.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_0/OtoMaster.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_0/OtoMaster.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyAssoc.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/CKeyAssoc.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyAssoc.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/CKeyDetail.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyDetail.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/CKeyDetail.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyDetail.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParent.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/CKeyParent.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParent.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/CKeyParentId.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParentId.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/CKeyParentId.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/CKeyParentId.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkCascade.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascade.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkCascade.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascade.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascadeOne.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkCascadeOne.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkCascadeOne.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkNone.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNone.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkNone.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNone.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkOne.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkOne.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkOne.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkSetNull.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkSetNull.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/DfkSetNull.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/DfkSetNull.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EBasic.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EBasic.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EBasic.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EEnum.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EEnum.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EEnum.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EEnum.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory2.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory2.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory2.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory3.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory3.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory3.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory4.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory4.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory4.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory5.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory5.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory5.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory6.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EHistory6.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EHistory6.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/ESoftdelete.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/ESoftdelete.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/ESoftdelete.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/EUser.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/EUser.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/EUser.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/EUser.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmChild.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/MtmChild.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmChild.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmMaster.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/MtmMaster.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/MtmMaster.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/OtoChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoChild.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/OtoChild.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoChild.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoMaster.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_1/OtoMaster.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_1/OtoMaster.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyAssoc.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/CKeyAssoc.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyAssoc.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/CKeyDetail.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyDetail.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/CKeyDetail.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyDetail.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/CKeyParent.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParent.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/CKeyParent.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParent.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/CKeyParentId.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParentId.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/CKeyParentId.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/CKeyParentId.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkCascade.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascade.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkCascade.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascade.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascadeOne.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkCascadeOne.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkCascadeOne.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkNone.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNone.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkNone.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNone.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkOne.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkOne.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkOne.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkOne.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkSetNull.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkSetNull.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/DfkSetNull.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/DfkSetNull.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EBasic.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/EBasic.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/EBasic.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EEnum.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/EEnum.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/EEnum.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory2.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory2.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory2.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory3.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory3.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory3.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory4.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory4.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory4.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory5.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory5.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory5.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory6.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/EHistory6.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/EHistory6.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/ERef.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/ERef.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/ERef.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/ERef.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/ESoftdelete.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/ESoftdelete.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/ESoftdelete.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/ESoftdelete.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/MtmChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmChild.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/MtmChild.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmChild.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/MtmMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmMaster.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/MtmMaster.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/MtmMaster.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/OtoChild.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoChild.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/OtoChild.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoChild.java
diff --git a/ebean-ddlgen/src/test/java/misc/migration/v1_2/OtoMaster.java b/ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoMaster.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/misc/migration/v1_2/OtoMaster.java
rename to ebean-ddl-generator/src/test/java/misc/migration/v1_2/OtoMaster.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/company/domain/Foo.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/model/CalculationResult.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/model/Configuration.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/model/Configurations.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/model/GroupConfiguration.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/inheritance/model/ProductConfiguration.java
rename to ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/BaseModel.java b/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/BaseModel.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/Address.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/Address.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/CKeyAssoc.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/CKeyDetail.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/CKeyParent.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/CKeyParentId.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/Person.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/Person.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/Phone.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/Phone.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/Truck.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/Truck.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/TruckRef.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/Vehicle.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/VehicleDriver.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/VehicleLease.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/VehicleLeaseLong.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/basic/VehicleLeaseShort.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/AuditInfo.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/AuditInfo.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/Item.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/Item.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/ItemKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/ItemKey.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/Parcel.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/Parcel.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/ParcelLocation.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/ParcelLocation.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/Region.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/Region.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/RegionKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/RegionKey.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/SubType.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/SubType.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/SubTypeKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/SubTypeKey.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/Type.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/Type.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/compositekeys/TypeKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/compositekeys/TypeKey.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/converstation/Conversation.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/converstation/Group.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/converstation/Group.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/converstation/Message.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/converstation/Message.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/converstation/Participation.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/converstation/Participation.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/converstation/User.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/converstation/User.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java
diff --git a/ebean-ddlgen/src/test/java/org/tests/model/metaannotation/SizeMedium.java b/ebean-ddl-generator/src/test/java/org/tests/model/metaannotation/SizeMedium.java
similarity index 100%
rename from ebean-ddlgen/src/test/java/org/tests/model/metaannotation/SizeMedium.java
rename to ebean-ddl-generator/src/test/java/org/tests/model/metaannotation/SizeMedium.java
diff --git a/ebean-ddlgen/src/test/resources/application-test.properties b/ebean-ddl-generator/src/test/resources/application-test.properties
similarity index 100%
rename from ebean-ddlgen/src/test/resources/application-test.properties
rename to ebean-ddl-generator/src/test/resources/application-test.properties
diff --git a/ebean-ddlgen/src/test/resources/assert/BaseDdlHandlerTest/baseApply.sql b/ebean-ddl-generator/src/test/resources/assert/BaseDdlHandlerTest/baseApply.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/BaseDdlHandlerTest/baseApply.sql
rename to ebean-ddl-generator/src/test/resources/assert/BaseDdlHandlerTest/baseApply.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/BaseDdlHandlerTest/baseDropAll.sql b/ebean-ddl-generator/src/test/resources/assert/BaseDdlHandlerTest/baseDropAll.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/BaseDdlHandlerTest/baseDropAll.sql
rename to ebean-ddl-generator/src/test/resources/assert/BaseDdlHandlerTest/baseDropAll.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/BaseTableDdlTest/createTable-apply.txt b/ebean-ddl-generator/src/test/resources/assert/BaseTableDdlTest/createTable-apply.txt
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/BaseTableDdlTest/createTable-apply.txt
rename to ebean-ddl-generator/src/test/resources/assert/BaseTableDdlTest/createTable-apply.txt
diff --git a/ebean-ddlgen/src/test/resources/assert/BaseTableDdlTest/createTable-applyLast.txt b/ebean-ddl-generator/src/test/resources/assert/BaseTableDdlTest/createTable-applyLast.txt
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/BaseTableDdlTest/createTable-applyLast.txt
rename to ebean-ddl-generator/src/test/resources/assert/BaseTableDdlTest/createTable-applyLast.txt
diff --git a/ebean-ddlgen/src/test/resources/assert/BaseTableDdlTest/createTable-rollback.txt b/ebean-ddl-generator/src/test/resources/assert/BaseTableDdlTest/createTable-rollback.txt
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/BaseTableDdlTest/createTable-rollback.txt
rename to ebean-ddl-generator/src/test/resources/assert/BaseTableDdlTest/createTable-rollback.txt
diff --git a/ebean-ddlgen/src/test/resources/assert/BaseTableDdlTest/createTable-rollbackFirst.txt b/ebean-ddl-generator/src/test/resources/assert/BaseTableDdlTest/createTable-rollbackFirst.txt
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/BaseTableDdlTest/createTable-rollbackFirst.txt
rename to ebean-ddl-generator/src/test/resources/assert/BaseTableDdlTest/createTable-rollbackFirst.txt
diff --git a/ebean-ddlgen/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql b/ebean-ddl-generator/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
rename to ebean-ddl-generator/src/test/resources/assert/ModelBuild_compoundKeyTest/apply.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/ModelBuild_explicitSequencesTest/apply.sql b/ebean-ddl-generator/src/test/resources/assert/ModelBuild_explicitSequencesTest/apply.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/ModelBuild_explicitSequencesTest/apply.sql
rename to ebean-ddl-generator/src/test/resources/assert/ModelBuild_explicitSequencesTest/apply.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/ModelBuild_explicitSequencesTest/pg-apply.sql b/ebean-ddl-generator/src/test/resources/assert/ModelBuild_explicitSequencesTest/pg-apply.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/ModelBuild_explicitSequencesTest/pg-apply.sql
rename to ebean-ddl-generator/src/test/resources/assert/ModelBuild_explicitSequencesTest/pg-apply.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/changeset-apply.txt b/ebean-ddl-generator/src/test/resources/assert/changeset-apply.txt
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/changeset-apply.txt
rename to ebean-ddl-generator/src/test/resources/assert/changeset-apply.txt
diff --git a/ebean-ddlgen/src/test/resources/assert/changeset-dropAll.txt b/ebean-ddl-generator/src/test/resources/assert/changeset-dropAll.txt
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/changeset-dropAll.txt
rename to ebean-ddl-generator/src/test/resources/assert/changeset-dropAll.txt
diff --git a/ebean-ddlgen/src/test/resources/assert/changeset-pg-apply.sql b/ebean-ddl-generator/src/test/resources/assert/changeset-pg-apply.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/changeset-pg-apply.sql
rename to ebean-ddl-generator/src/test/resources/assert/changeset-pg-apply.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/changeset-pg-applyLast.sql b/ebean-ddl-generator/src/test/resources/assert/changeset-pg-applyLast.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/changeset-pg-applyLast.sql
rename to ebean-ddl-generator/src/test/resources/assert/changeset-pg-applyLast.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/changeset-pg-rollbackFirst.sql b/ebean-ddl-generator/src/test/resources/assert/changeset-pg-rollbackFirst.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/changeset-pg-rollbackFirst.sql
rename to ebean-ddl-generator/src/test/resources/assert/changeset-pg-rollbackFirst.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/changeset-pg-rollbackLast.sql b/ebean-ddl-generator/src/test/resources/assert/changeset-pg-rollbackLast.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/changeset-pg-rollbackLast.sql
rename to ebean-ddl-generator/src/test/resources/assert/changeset-pg-rollbackLast.sql
diff --git a/ebean-ddlgen/src/test/resources/assert/create-column-table.txt b/ebean-ddl-generator/src/test/resources/assert/create-column-table.txt
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/create-column-table.txt
rename to ebean-ddl-generator/src/test/resources/assert/create-column-table.txt
diff --git a/ebean-ddlgen/src/test/resources/assert/create-table.txt b/ebean-ddl-generator/src/test/resources/assert/create-table.txt
similarity index 100%
rename from ebean-ddlgen/src/test/resources/assert/create-table.txt
rename to ebean-ddl-generator/src/test/resources/assert/create-table.txt
diff --git a/ebean-ddlgen/src/test/resources/container/test-alter-table.xml b/ebean-ddl-generator/src/test/resources/container/test-alter-table.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/container/test-alter-table.xml
rename to ebean-ddl-generator/src/test/resources/container/test-alter-table.xml
diff --git a/ebean-ddlgen/src/test/resources/container/test-compoundkey.xml b/ebean-ddl-generator/src/test/resources/container/test-compoundkey.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/container/test-compoundkey.xml
rename to ebean-ddl-generator/src/test/resources/container/test-compoundkey.xml
diff --git a/ebean-ddlgen/src/test/resources/container/test-create-table.xml b/ebean-ddl-generator/src/test/resources/container/test-create-table.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/container/test-create-table.xml
rename to ebean-ddl-generator/src/test/resources/container/test-create-table.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app2/v1.0__one.sql b/ebean-ddl-generator/src/test/resources/dbmigration/app2/v1.0__one.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app2/v1.0__one.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/app2/v1.0__one.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app2/v1.1__one.sql b/ebean-ddl-generator/src/test/resources/dbmigration/app2/v1.1__one.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app2/v1.1__one.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/app2/v1.1__one.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app2/v3.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/app2/v3.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app2/v3.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/app2/v3.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app3/model_larger/v4.1__foo.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/app3/model_larger/v4.1__foo.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app3/model_larger/v4.1__foo.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/app3/model_larger/v4.1__foo.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app3/model_smaller/v2.0.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/app3/model_smaller/v2.0.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app3/model_smaller/v2.0.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/app3/model_smaller/v2.0.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app3/model_smaller/v2.1__foo.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/app3/model_smaller/v2.1__foo.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app3/model_smaller/v2.1__foo.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/app3/model_smaller/v2.1__foo.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app3/v1.0__one.sql b/ebean-ddl-generator/src/test/resources/dbmigration/app3/v1.0__one.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app3/v1.0__one.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/app3/v1.0__one.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app3/v1.1__one.sql b/ebean-ddl-generator/src/test/resources/dbmigration/app3/v1.1__one.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app3/v1.1__one.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/app3/v1.1__one.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/app3/v3.1.2__foo.sql b/ebean-ddl-generator/src/test/resources/dbmigration/app3/v3.1.2__foo.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/app3/v3.1.2__foo.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/app3/v3.1.2__foo.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/mysql55/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
rename to ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/myapp/v1.0.xml b/ebean-ddl-generator/src/test/resources/dbmigration/myapp/v1.0.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/myapp/v1.0.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/myapp/v1.0.xml
diff --git a/ebean-ddlgen/src/test/resources/dbmigration/myapp/v2.0.xml b/ebean-ddl-generator/src/test/resources/dbmigration/myapp/v2.0.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/dbmigration/myapp/v2.0.xml
rename to ebean-ddl-generator/src/test/resources/dbmigration/myapp/v2.0.xml
diff --git a/ebean-ddlgen/src/test/resources/ebean.mf b/ebean-ddl-generator/src/test/resources/ebean.mf
similarity index 100%
rename from ebean-ddlgen/src/test/resources/ebean.mf
rename to ebean-ddl-generator/src/test/resources/ebean.mf
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/1.0.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/1.0.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/1.0.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/1.0.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/1.1.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/1.1.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/1.1.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/1.1.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/1.1_2__drops.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/1.1_2__drops.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/1.1_2__drops.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/1.1_2__drops.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/2.0.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/2.0.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/2.0.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/2.0.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/2.1.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/2.1.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/2.1.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/2.1.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/2.2__drops.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/2.2__drops.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/2.2__drops.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/2.2__drops.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/3.0__rawSql.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/3.0__rawSql.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/3.0__rawSql.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/3.0__rawSql.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/5.0__dropTable.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/5.0__dropTable.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/5.0__dropTable.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/5.0__dropTable.model.xml
diff --git a/ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/6.0__renameColumn.model.xml b/ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/6.0__renameColumn.model.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/io/ebeaninternal/dbmigration/model/6.0__renameColumn.model.xml
rename to ebean-ddl-generator/src/test/resources/io/ebeaninternal/dbmigration/model/6.0__renameColumn.model.xml
diff --git a/ebean-ddlgen/src/test/resources/logback-test.xml b/ebean-ddl-generator/src/test/resources/logback-test.xml
similarity index 100%
rename from ebean-ddlgen/src/test/resources/logback-test.xml
rename to ebean-ddl-generator/src/test/resources/logback-test.xml
diff --git a/ebean-ddlgen/src/test/resources/scripts/test-script-2.sql b/ebean-ddl-generator/src/test/resources/scripts/test-script-2.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/scripts/test-script-2.sql
rename to ebean-ddl-generator/src/test/resources/scripts/test-script-2.sql
diff --git a/ebean-ddlgen/src/test/resources/scripts/test-script.sql b/ebean-ddl-generator/src/test/resources/scripts/test-script.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/scripts/test-script.sql
rename to ebean-ddl-generator/src/test/resources/scripts/test-script.sql
diff --git a/ebean-ddlgen/src/test/resources/test-dbmigration/1.1.sql b/ebean-ddl-generator/src/test/resources/test-dbmigration/1.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/test-dbmigration/1.1.sql
rename to ebean-ddl-generator/src/test/resources/test-dbmigration/1.1.sql
diff --git a/ebean-ddlgen/src/test/resources/test-dbmigration/1.2.sql b/ebean-ddl-generator/src/test/resources/test-dbmigration/1.2.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/test-dbmigration/1.2.sql
rename to ebean-ddl-generator/src/test/resources/test-dbmigration/1.2.sql
diff --git a/ebean-ddlgen/src/test/resources/test-dbmigration/2.1.sql b/ebean-ddl-generator/src/test/resources/test-dbmigration/2.1.sql
similarity index 100%
rename from ebean-ddlgen/src/test/resources/test-dbmigration/2.1.sql
rename to ebean-ddl-generator/src/test/resources/test-dbmigration/2.1.sql
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index c1848954b..43f6ce903 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 662a8f8c9..e50be5b60 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <artifactId>ebean-ddl-generator</artifactId>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 42d6042bc..194d98aa6 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 81fe6df4d..6878227b0 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -66,15 +66,15 @@
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <artifactId>ebean-ddl-generator</artifactId>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 8289498e0..b2a14343b 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <artifactId>ebean-ddl-generator</artifactId>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index c9b414a92..6215f8551 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,34 +22,34 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
-    <!-- In future ebean-ddlgen would only be dependency of ebean-test -->
+    <!-- In future ebean-ddl-generator would only be dependency of ebean-test -->
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <artifactId>ebean-ddl-generator</artifactId>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
     <!-- In future this is optional and not included by default -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-autotune</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 613c96b37..83daf124d 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -63,8 +63,8 @@
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.3-SNAPSHOT</version>
+      <artifactId>ebean-ddl-generator</artifactId>
+      <version>12.6.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -106,7 +106,7 @@
                 <annotationProcessorPath>
                   <groupId>io.ebean</groupId>
                   <artifactId>kotlin-querybean-generator</artifactId>
-                  <version>12.5.3-SNAPSHOT</version>
+                  <version>12.6.0-SNAPSHOT</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
             </configuration>
diff --git a/pom.xml b/pom.xml
index 8a2ac38c9..a07749886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.5.3-SNAPSHOT</version>
+  <version>12.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -72,7 +72,7 @@
     <module>ebean-api</module>
     <module>ebean-bom</module>
     <module>ebean-core</module>
-    <module>ebean-ddlgen</module>
+    <module>ebean-ddl-generator</module>
     <module>ebean-autotune</module>
     <module>ebean-externalmapping-api</module>
     <module>ebean-externalmapping-xml</module>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 4c0d5b9f2..b285869e2 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.3-SNAPSHOT</version>
+    <version>12.6.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>