diff --git a/.idea/misc.xml b/.idea/misc.xml
index e56fe0c..85ecaa5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,6 +7,7 @@
         <option value="$PROJECT_DIR$/src/common/pom.xml" />
         <option value="$PROJECT_DIR$/src/sqlite/pom.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/old-pom.xml" />
       </list>
     </option>
     <option name="ignoredFiles">
diff --git a/src/common/pom.xml b/src/common/pom.xml
index cec57cb..85865a4 100644
--- a/src/common/pom.xml
+++ b/src/common/pom.xml
@@ -19,6 +19,12 @@
     <description>Expose a document store interface for PostgreSQL and SQLite (Common Library)</description>
     <url>https://bitbadger.solutions/open-source/relational-documents/jvm/</url>
 
+    <scm>
+        <connection>scm:git:https://git.bitbadger.solutions/bit-badger/solutions.bitbadger.documents.git</connection>
+        <developerConnection>scm:git:https://git.bitbadger.solutions/bit-badger/solutions.bitbadger.documents.git</developerConnection>
+        <url>https://git.bitbadger.solutions/bit-badger/solutions.bitbadger.documents</url>
+    </scm>
+
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>
@@ -34,6 +40,11 @@
                         <goals>
                             <goal>compile</goal>
                         </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
                     </execution>
                     <execution>
                         <id>test-compile</id>
@@ -41,6 +52,12 @@
                         <goals>
                             <goal>test-compile</goal>
                         </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/test/java</sourceDir>
+                                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
                     </execution>
                 </executions>
                 <configuration>
@@ -72,20 +89,12 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <configuration>
-                    <mainClass>MainKt</mainClass>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>9</source>
-                    <target>9</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/common/src/kotlin/AutoId.kt b/src/common/src/main/kotlin/AutoId.kt
similarity index 100%
rename from src/common/src/kotlin/AutoId.kt
rename to src/common/src/main/kotlin/AutoId.kt
diff --git a/src/common/src/kotlin/Comparison.kt b/src/common/src/main/kotlin/Comparison.kt
similarity index 100%
rename from src/common/src/kotlin/Comparison.kt
rename to src/common/src/main/kotlin/Comparison.kt
diff --git a/src/common/src/kotlin/Configuration.kt b/src/common/src/main/kotlin/Configuration.kt
similarity index 100%
rename from src/common/src/kotlin/Configuration.kt
rename to src/common/src/main/kotlin/Configuration.kt
diff --git a/src/common/src/kotlin/Dialect.kt b/src/common/src/main/kotlin/Dialect.kt
similarity index 100%
rename from src/common/src/kotlin/Dialect.kt
rename to src/common/src/main/kotlin/Dialect.kt
diff --git a/src/common/src/kotlin/DocumentException.kt b/src/common/src/main/kotlin/DocumentException.kt
similarity index 100%
rename from src/common/src/kotlin/DocumentException.kt
rename to src/common/src/main/kotlin/DocumentException.kt
diff --git a/src/common/src/kotlin/DocumentIndex.kt b/src/common/src/main/kotlin/DocumentIndex.kt
similarity index 100%
rename from src/common/src/kotlin/DocumentIndex.kt
rename to src/common/src/main/kotlin/DocumentIndex.kt
diff --git a/src/common/src/kotlin/Field.kt b/src/common/src/main/kotlin/Field.kt
similarity index 100%
rename from src/common/src/kotlin/Field.kt
rename to src/common/src/main/kotlin/Field.kt
diff --git a/src/common/src/kotlin/FieldFormat.kt b/src/common/src/main/kotlin/FieldFormat.kt
similarity index 100%
rename from src/common/src/kotlin/FieldFormat.kt
rename to src/common/src/main/kotlin/FieldFormat.kt
diff --git a/src/common/src/kotlin/FieldMatch.kt b/src/common/src/main/kotlin/FieldMatch.kt
similarity index 100%
rename from src/common/src/kotlin/FieldMatch.kt
rename to src/common/src/main/kotlin/FieldMatch.kt
diff --git a/src/common/src/kotlin/Op.kt b/src/common/src/main/kotlin/Op.kt
similarity index 100%
rename from src/common/src/kotlin/Op.kt
rename to src/common/src/main/kotlin/Op.kt
diff --git a/src/common/src/kotlin/Parameter.kt b/src/common/src/main/kotlin/Parameter.kt
similarity index 100%
rename from src/common/src/kotlin/Parameter.kt
rename to src/common/src/main/kotlin/Parameter.kt
diff --git a/src/common/src/kotlin/ParameterName.kt b/src/common/src/main/kotlin/ParameterName.kt
similarity index 100%
rename from src/common/src/kotlin/ParameterName.kt
rename to src/common/src/main/kotlin/ParameterName.kt
diff --git a/src/common/src/kotlin/ParameterType.kt b/src/common/src/main/kotlin/ParameterType.kt
similarity index 100%
rename from src/common/src/kotlin/ParameterType.kt
rename to src/common/src/main/kotlin/ParameterType.kt
diff --git a/src/common/src/kotlin/query/Count.kt b/src/common/src/main/kotlin/query/Count.kt
similarity index 100%
rename from src/common/src/kotlin/query/Count.kt
rename to src/common/src/main/kotlin/query/Count.kt
diff --git a/src/common/src/kotlin/query/Definition.kt b/src/common/src/main/kotlin/query/Definition.kt
similarity index 100%
rename from src/common/src/kotlin/query/Definition.kt
rename to src/common/src/main/kotlin/query/Definition.kt
diff --git a/src/common/src/kotlin/query/Delete.kt b/src/common/src/main/kotlin/query/Delete.kt
similarity index 100%
rename from src/common/src/kotlin/query/Delete.kt
rename to src/common/src/main/kotlin/query/Delete.kt
diff --git a/src/common/src/kotlin/query/Document.kt b/src/common/src/main/kotlin/query/Document.kt
similarity index 100%
rename from src/common/src/kotlin/query/Document.kt
rename to src/common/src/main/kotlin/query/Document.kt
diff --git a/src/common/src/kotlin/query/Exists.kt b/src/common/src/main/kotlin/query/Exists.kt
similarity index 100%
rename from src/common/src/kotlin/query/Exists.kt
rename to src/common/src/main/kotlin/query/Exists.kt
diff --git a/src/common/src/kotlin/query/Find.kt b/src/common/src/main/kotlin/query/Find.kt
similarity index 100%
rename from src/common/src/kotlin/query/Find.kt
rename to src/common/src/main/kotlin/query/Find.kt
diff --git a/src/common/src/kotlin/query/Patch.kt b/src/common/src/main/kotlin/query/Patch.kt
similarity index 100%
rename from src/common/src/kotlin/query/Patch.kt
rename to src/common/src/main/kotlin/query/Patch.kt
diff --git a/src/common/src/kotlin/query/Query.kt b/src/common/src/main/kotlin/query/Query.kt
similarity index 100%
rename from src/common/src/kotlin/query/Query.kt
rename to src/common/src/main/kotlin/query/Query.kt
diff --git a/src/common/src/kotlin/query/RemoveFields.kt b/src/common/src/main/kotlin/query/RemoveFields.kt
similarity index 100%
rename from src/common/src/kotlin/query/RemoveFields.kt
rename to src/common/src/main/kotlin/query/RemoveFields.kt
diff --git a/src/common/src/kotlin/query/Where.kt b/src/common/src/main/kotlin/query/Where.kt
similarity index 100%
rename from src/common/src/kotlin/query/Where.kt
rename to src/common/src/main/kotlin/query/Where.kt
diff --git a/src/common/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java
similarity index 100%
rename from src/common/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java
rename to src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java
diff --git a/src/common/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java
similarity index 100%
rename from src/common/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java
rename to src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java
diff --git a/src/common/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java
similarity index 100%
rename from src/common/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java
rename to src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java
diff --git a/src/common/test/java/solutions/bitbadger/documents/common/java/FieldTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java
similarity index 100%
rename from src/common/test/java/solutions/bitbadger/documents/common/java/FieldTest.java
rename to src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java
diff --git a/src/common/test/java/solutions/bitbadger/documents/common/java/OpTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java
similarity index 100%
rename from src/common/test/java/solutions/bitbadger/documents/common/java/OpTest.java
rename to src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java
diff --git a/src/common/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java
similarity index 100%
rename from src/common/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java
rename to src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java
diff --git a/src/common/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java
similarity index 100%
rename from src/common/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java
rename to src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java
diff --git a/src/common/test/kotlin/AutoIdTest.kt b/src/common/src/test/kotlin/AutoIdTest.kt
similarity index 100%
rename from src/common/test/kotlin/AutoIdTest.kt
rename to src/common/src/test/kotlin/AutoIdTest.kt
diff --git a/src/common/test/kotlin/ComparisonTest.kt b/src/common/src/test/kotlin/ComparisonTest.kt
similarity index 100%
rename from src/common/test/kotlin/ComparisonTest.kt
rename to src/common/src/test/kotlin/ComparisonTest.kt
diff --git a/src/common/test/kotlin/ConfigurationTest.kt b/src/common/src/test/kotlin/ConfigurationTest.kt
similarity index 100%
rename from src/common/test/kotlin/ConfigurationTest.kt
rename to src/common/src/test/kotlin/ConfigurationTest.kt
diff --git a/src/common/test/kotlin/DialectTest.kt b/src/common/src/test/kotlin/DialectTest.kt
similarity index 100%
rename from src/common/test/kotlin/DialectTest.kt
rename to src/common/src/test/kotlin/DialectTest.kt
diff --git a/src/common/test/kotlin/DocumentIndexTest.kt b/src/common/src/test/kotlin/DocumentIndexTest.kt
similarity index 100%
rename from src/common/test/kotlin/DocumentIndexTest.kt
rename to src/common/src/test/kotlin/DocumentIndexTest.kt
diff --git a/src/common/test/kotlin/FieldMatchTest.kt b/src/common/src/test/kotlin/FieldMatchTest.kt
similarity index 100%
rename from src/common/test/kotlin/FieldMatchTest.kt
rename to src/common/src/test/kotlin/FieldMatchTest.kt
diff --git a/src/common/test/kotlin/FieldTest.kt b/src/common/src/test/kotlin/FieldTest.kt
similarity index 100%
rename from src/common/test/kotlin/FieldTest.kt
rename to src/common/src/test/kotlin/FieldTest.kt
diff --git a/src/common/test/kotlin/OpTest.kt b/src/common/src/test/kotlin/OpTest.kt
similarity index 100%
rename from src/common/test/kotlin/OpTest.kt
rename to src/common/src/test/kotlin/OpTest.kt
diff --git a/src/common/test/kotlin/ParameterNameTest.kt b/src/common/src/test/kotlin/ParameterNameTest.kt
similarity index 100%
rename from src/common/test/kotlin/ParameterNameTest.kt
rename to src/common/src/test/kotlin/ParameterNameTest.kt
diff --git a/src/common/test/kotlin/ParameterTest.kt b/src/common/src/test/kotlin/ParameterTest.kt
similarity index 100%
rename from src/common/test/kotlin/ParameterTest.kt
rename to src/common/src/test/kotlin/ParameterTest.kt
diff --git a/src/common/test/kotlin/query/CountTest.kt b/src/common/src/test/kotlin/query/CountTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/CountTest.kt
rename to src/common/src/test/kotlin/query/CountTest.kt
diff --git a/src/common/test/kotlin/query/DefinitionTest.kt b/src/common/src/test/kotlin/query/DefinitionTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/DefinitionTest.kt
rename to src/common/src/test/kotlin/query/DefinitionTest.kt
diff --git a/src/common/test/kotlin/query/DeleteTest.kt b/src/common/src/test/kotlin/query/DeleteTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/DeleteTest.kt
rename to src/common/src/test/kotlin/query/DeleteTest.kt
diff --git a/src/common/test/kotlin/query/DocumentTest.kt b/src/common/src/test/kotlin/query/DocumentTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/DocumentTest.kt
rename to src/common/src/test/kotlin/query/DocumentTest.kt
diff --git a/src/common/test/kotlin/query/ExistsTest.kt b/src/common/src/test/kotlin/query/ExistsTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/ExistsTest.kt
rename to src/common/src/test/kotlin/query/ExistsTest.kt
diff --git a/src/common/test/kotlin/query/FindTest.kt b/src/common/src/test/kotlin/query/FindTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/FindTest.kt
rename to src/common/src/test/kotlin/query/FindTest.kt
diff --git a/src/common/test/kotlin/query/PatchTest.kt b/src/common/src/test/kotlin/query/PatchTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/PatchTest.kt
rename to src/common/src/test/kotlin/query/PatchTest.kt
diff --git a/src/common/test/kotlin/query/QueryTest.kt b/src/common/src/test/kotlin/query/QueryTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/QueryTest.kt
rename to src/common/src/test/kotlin/query/QueryTest.kt
diff --git a/src/common/test/kotlin/query/RemoveFieldsTest.kt b/src/common/src/test/kotlin/query/RemoveFieldsTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/RemoveFieldsTest.kt
rename to src/common/src/test/kotlin/query/RemoveFieldsTest.kt
diff --git a/src/common/test/kotlin/query/WhereTest.kt b/src/common/src/test/kotlin/query/WhereTest.kt
similarity index 100%
rename from src/common/test/kotlin/query/WhereTest.kt
rename to src/common/src/test/kotlin/query/WhereTest.kt
diff --git a/src/pom.xml b/src/pom.xml
index 928441f..60ce46a 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -36,9 +36,10 @@
     </scm>
 
     <properties>
+        <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.code.style>official</kotlin.code.style>
-        <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
         <kotlin.version>2.1.0</kotlin.version>
         <serialization.version>1.8.0</serialization.version>
     </properties>
@@ -89,4 +90,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>