diff --git a/documents.iml b/documents.iml
index f0b3e9b..115f078 100644
--- a/documents.iml
+++ b/documents.iml
@@ -5,9 +5,9 @@
       <sourceFolder url="file://$MODULE_DIR$/src/common/src/main/kotlin" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/common/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/common/src/test/kotlin" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/java/src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/java/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/java/src/test/kotlin" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jvm/src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jvm/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jvm/src/test/kotlin" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/kotlin/src/main/kotlin" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/kotlin/src/test/kotlin" isTestSource="true" />
     </content>
diff --git a/src/java/pom.xml b/src/jvm/pom.xml
similarity index 100%
rename from src/java/pom.xml
rename to src/jvm/pom.xml
diff --git a/src/java/src/main/kotlin/ConnectionExtensions.kt b/src/jvm/src/main/kotlin/ConnectionExtensions.kt
similarity index 100%
rename from src/java/src/main/kotlin/ConnectionExtensions.kt
rename to src/jvm/src/main/kotlin/ConnectionExtensions.kt
diff --git a/src/java/src/main/kotlin/Count.kt b/src/jvm/src/main/kotlin/Count.kt
similarity index 100%
rename from src/java/src/main/kotlin/Count.kt
rename to src/jvm/src/main/kotlin/Count.kt
diff --git a/src/java/src/main/kotlin/Custom.kt b/src/jvm/src/main/kotlin/Custom.kt
similarity index 100%
rename from src/java/src/main/kotlin/Custom.kt
rename to src/jvm/src/main/kotlin/Custom.kt
diff --git a/src/java/src/main/kotlin/Definition.kt b/src/jvm/src/main/kotlin/Definition.kt
similarity index 100%
rename from src/java/src/main/kotlin/Definition.kt
rename to src/jvm/src/main/kotlin/Definition.kt
diff --git a/src/java/src/main/kotlin/Delete.kt b/src/jvm/src/main/kotlin/Delete.kt
similarity index 100%
rename from src/java/src/main/kotlin/Delete.kt
rename to src/jvm/src/main/kotlin/Delete.kt
diff --git a/src/java/src/main/kotlin/Document.kt b/src/jvm/src/main/kotlin/Document.kt
similarity index 100%
rename from src/java/src/main/kotlin/Document.kt
rename to src/jvm/src/main/kotlin/Document.kt
diff --git a/src/java/src/main/kotlin/DocumentConfig.kt b/src/jvm/src/main/kotlin/DocumentConfig.kt
similarity index 100%
rename from src/java/src/main/kotlin/DocumentConfig.kt
rename to src/jvm/src/main/kotlin/DocumentConfig.kt
diff --git a/src/java/src/main/kotlin/Exists.kt b/src/jvm/src/main/kotlin/Exists.kt
similarity index 100%
rename from src/java/src/main/kotlin/Exists.kt
rename to src/jvm/src/main/kotlin/Exists.kt
diff --git a/src/java/src/main/kotlin/Find.kt b/src/jvm/src/main/kotlin/Find.kt
similarity index 100%
rename from src/java/src/main/kotlin/Find.kt
rename to src/jvm/src/main/kotlin/Find.kt
diff --git a/src/java/src/main/kotlin/NullDocumentSerializer.kt b/src/jvm/src/main/kotlin/NullDocumentSerializer.kt
similarity index 100%
rename from src/java/src/main/kotlin/NullDocumentSerializer.kt
rename to src/jvm/src/main/kotlin/NullDocumentSerializer.kt
diff --git a/src/java/src/main/kotlin/Parameters.kt b/src/jvm/src/main/kotlin/Parameters.kt
similarity index 100%
rename from src/java/src/main/kotlin/Parameters.kt
rename to src/jvm/src/main/kotlin/Parameters.kt
diff --git a/src/java/src/main/kotlin/Patch.kt b/src/jvm/src/main/kotlin/Patch.kt
similarity index 100%
rename from src/java/src/main/kotlin/Patch.kt
rename to src/jvm/src/main/kotlin/Patch.kt
diff --git a/src/java/src/main/kotlin/RemoveFields.kt b/src/jvm/src/main/kotlin/RemoveFields.kt
similarity index 100%
rename from src/java/src/main/kotlin/RemoveFields.kt
rename to src/jvm/src/main/kotlin/RemoveFields.kt
diff --git a/src/java/src/main/kotlin/Results.kt b/src/jvm/src/main/kotlin/Results.kt
similarity index 100%
rename from src/java/src/main/kotlin/Results.kt
rename to src/jvm/src/main/kotlin/Results.kt
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/integration/common/CountFunctions.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/common/CountFunctions.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/integration/common/CountFunctions.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/common/CountFunctions.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/integration/postgresql/CountIT.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/postgresql/CountIT.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/integration/postgresql/CountIT.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/postgresql/CountIT.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/integration/sqlite/CountIT.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/sqlite/CountIT.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/integration/sqlite/CountIT.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/sqlite/CountIT.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ByteIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ByteIdClass.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ByteIdClass.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ByteIdClass.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/IntIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/IntIdClass.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/IntIdClass.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/IntIdClass.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/JsonDocument.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/JsonDocument.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/JsonDocument.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/JsonDocument.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/LongIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/LongIdClass.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/LongIdClass.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/LongIdClass.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ShortIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ShortIdClass.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ShortIdClass.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ShortIdClass.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/StringIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/StringIdClass.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/StringIdClass.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/StringIdClass.java
diff --git a/src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/SubDocument.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/SubDocument.java
similarity index 100%
rename from src/java/src/test/java/solutions/bitbadger/documents/java/java/testDocs/SubDocument.java
rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/SubDocument.java
diff --git a/src/java/src/test/kotlin/JacksonDocumentSerializer.kt b/src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt
similarity index 100%
rename from src/java/src/test/kotlin/JacksonDocumentSerializer.kt
rename to src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt
diff --git a/src/java/src/test/kotlin/ParametersTest.kt b/src/jvm/src/test/kotlin/ParametersTest.kt
similarity index 100%
rename from src/java/src/test/kotlin/ParametersTest.kt
rename to src/jvm/src/test/kotlin/ParametersTest.kt
diff --git a/src/java/src/test/kotlin/integration/ThrowawayDatabase.kt b/src/jvm/src/test/kotlin/integration/ThrowawayDatabase.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/ThrowawayDatabase.kt
rename to src/jvm/src/test/kotlin/integration/ThrowawayDatabase.kt
diff --git a/src/java/src/test/kotlin/integration/Types.kt b/src/jvm/src/test/kotlin/integration/Types.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/Types.kt
rename to src/jvm/src/test/kotlin/integration/Types.kt
diff --git a/src/java/src/test/kotlin/integration/common/Count.kt b/src/jvm/src/test/kotlin/integration/common/Count.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/Count.kt
rename to src/jvm/src/test/kotlin/integration/common/Count.kt
diff --git a/src/java/src/test/kotlin/integration/common/Custom.kt b/src/jvm/src/test/kotlin/integration/common/Custom.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/Custom.kt
rename to src/jvm/src/test/kotlin/integration/common/Custom.kt
diff --git a/src/java/src/test/kotlin/integration/common/Definition.kt b/src/jvm/src/test/kotlin/integration/common/Definition.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/Definition.kt
rename to src/jvm/src/test/kotlin/integration/common/Definition.kt
diff --git a/src/java/src/test/kotlin/integration/common/Delete.kt b/src/jvm/src/test/kotlin/integration/common/Delete.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/Delete.kt
rename to src/jvm/src/test/kotlin/integration/common/Delete.kt
diff --git a/src/java/src/test/kotlin/integration/common/Document.kt b/src/jvm/src/test/kotlin/integration/common/Document.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/Document.kt
rename to src/jvm/src/test/kotlin/integration/common/Document.kt
diff --git a/src/java/src/test/kotlin/integration/common/Exists.kt b/src/jvm/src/test/kotlin/integration/common/Exists.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/Exists.kt
rename to src/jvm/src/test/kotlin/integration/common/Exists.kt
diff --git a/src/java/src/test/kotlin/integration/common/Find.kt b/src/jvm/src/test/kotlin/integration/common/Find.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/Find.kt
rename to src/jvm/src/test/kotlin/integration/common/Find.kt
diff --git a/src/java/src/test/kotlin/integration/common/Patch.kt b/src/jvm/src/test/kotlin/integration/common/Patch.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/Patch.kt
rename to src/jvm/src/test/kotlin/integration/common/Patch.kt
diff --git a/src/java/src/test/kotlin/integration/common/RemoveFields.kt b/src/jvm/src/test/kotlin/integration/common/RemoveFields.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/common/RemoveFields.kt
rename to src/jvm/src/test/kotlin/integration/common/RemoveFields.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/CountIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/CountIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/CountIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/CountIT.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/CustomIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/CustomIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/CustomIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/CustomIT.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/DefinitionIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/DefinitionIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/DefinitionIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/DefinitionIT.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/DeleteIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/DeleteIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/DeleteIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/DeleteIT.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/DocumentIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/DocumentIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/DocumentIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/DocumentIT.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/ExistsIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/ExistsIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/ExistsIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/ExistsIT.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/FindIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/FindIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/FindIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/FindIT.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/PatchIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/PatchIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/PatchIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/PatchIT.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/PgDB.kt b/src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/PgDB.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt
diff --git a/src/java/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt b/src/jvm/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt
rename to src/jvm/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/CountIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/CountIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/CustomIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/CustomIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/CustomIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/CustomIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/DefinitionIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/DefinitionIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/DeleteIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/DeleteIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/DeleteIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/DeleteIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/DocumentIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/DocumentIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/DocumentIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/DocumentIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/ExistsIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/ExistsIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/FindIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/FindIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/FindIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/FindIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/PatchIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/PatchIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/PatchIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/PatchIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt
diff --git a/src/java/src/test/kotlin/integration/sqlite/SQLiteDB.kt b/src/jvm/src/test/kotlin/integration/sqlite/SQLiteDB.kt
similarity index 100%
rename from src/java/src/test/kotlin/integration/sqlite/SQLiteDB.kt
rename to src/jvm/src/test/kotlin/integration/sqlite/SQLiteDB.kt