diff --git a/.editorconfig b/ebean-postgis/.editorconfig
similarity index 100%
rename from .editorconfig
rename to ebean-postgis/.editorconfig
diff --git a/LICENSE b/ebean-postgis/LICENSE
similarity index 100%
rename from LICENSE
rename to ebean-postgis/LICENSE
diff --git a/README.md b/ebean-postgis/README.md
similarity index 100%
rename from README.md
rename to ebean-postgis/README.md
diff --git a/pom.xml b/ebean-postgis/pom.xml
similarity index 100%
rename from pom.xml
rename to ebean-postgis/pom.xml
diff --git a/src/main/java/io/ebean/postgis/RegisterFactory.java b/ebean-postgis/src/main/java/io/ebean/postgis/RegisterFactory.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/RegisterFactory.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/RegisterFactory.java
diff --git a/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
diff --git a/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java
diff --git a/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java
diff --git a/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java
diff --git a/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java
diff --git a/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java
diff --git a/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java
diff --git a/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
diff --git a/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java
diff --git a/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java
diff --git a/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java
diff --git a/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java
diff --git a/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java
diff --git a/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java
similarity index 100%
rename from src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java
rename to ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java
diff --git a/src/main/resources/META-INF/services/io.ebeaninternal.api.ExtraTypeFactory b/ebean-postgis/src/main/resources/META-INF/services/io.ebeaninternal.api.ExtraTypeFactory
similarity index 100%
rename from src/main/resources/META-INF/services/io.ebeaninternal.api.ExtraTypeFactory
rename to ebean-postgis/src/main/resources/META-INF/services/io.ebeaninternal.api.ExtraTypeFactory
diff --git a/src/test/java/org/example/domain/BaseEntity.java b/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java
similarity index 100%
rename from src/test/java/org/example/domain/BaseEntity.java
rename to ebean-postgis/src/test/java/org/example/domain/BaseEntity.java
diff --git a/src/test/java/org/example/domain/MyBean.java b/ebean-postgis/src/test/java/org/example/domain/MyBean.java
similarity index 100%
rename from src/test/java/org/example/domain/MyBean.java
rename to ebean-postgis/src/test/java/org/example/domain/MyBean.java
diff --git a/src/test/java/org/example/domain/OtherBeanGeoLatte.java b/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java
similarity index 100%
rename from src/test/java/org/example/domain/OtherBeanGeoLatte.java
rename to ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java
diff --git a/src/test/java/org/example/domain/TestInsertQuery.java b/ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java
similarity index 100%
rename from src/test/java/org/example/domain/TestInsertQuery.java
rename to ebean-postgis/src/test/java/org/example/domain/TestInsertQuery.java
diff --git a/src/test/java/org/example/domain/TestOtherInsertQuery.java b/ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java
similarity index 100%
rename from src/test/java/org/example/domain/TestOtherInsertQuery.java
rename to ebean-postgis/src/test/java/org/example/domain/TestOtherInsertQuery.java
diff --git a/src/test/java/org/example/domain/TestQuery.java b/ebean-postgis/src/test/java/org/example/domain/TestQuery.java
similarity index 100%
rename from src/test/java/org/example/domain/TestQuery.java
rename to ebean-postgis/src/test/java/org/example/domain/TestQuery.java
diff --git a/src/test/resources/application-test.yml b/ebean-postgis/src/test/resources/application-test.yml
similarity index 100%
rename from src/test/resources/application-test.yml
rename to ebean-postgis/src/test/resources/application-test.yml
diff --git a/src/test/resources/logback-test.xml b/ebean-postgis/src/test/resources/logback-test.xml
similarity index 100%
rename from src/test/resources/logback-test.xml
rename to ebean-postgis/src/test/resources/logback-test.xml
diff --git a/src/test/resources/notused-test-ebean.properties b/ebean-postgis/src/test/resources/notused-test-ebean.properties
similarity index 100%
rename from src/test/resources/notused-test-ebean.properties
rename to ebean-postgis/src/test/resources/notused-test-ebean.properties