diff --git a/.gitignore b/.gitignore
index e36da4c..7fea862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@ replay_pid*
 
 # Temporary output directories
 **/target
+
+# Maven Central Repo settings
+settings.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 4d27ef0..b301a31 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="mavenCentral" />
-      <option name="name" value="mavenCentral" />
-      <option name="url" value="https://repo1.maven.org/maven2/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="mavenCentral" />
+      <option name="name" value="mavenCentral" />
+      <option name="url" value="https://repo1.maven.org/maven2/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
diff --git a/pom.xml b/pom.xml
index 4c36a0f..83150c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,34 @@
 
     <groupId>solutions.bitbadger</groupId>
     <artifactId>documents</artifactId>
-    <version>4.0-ALPHA</version>
+    <version>4.0.0-alpha1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>${project.groupId}:${project.artifactId}</name>
+    <description>Expose a document store interface for PostgreSQL and SQLite</description>
+    <url>https://bitbadger.solutions/open-source/solutions.bitbadger.documents</url>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://www.opensource.org/licenses/mit-license.php</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Daniel J. Summers</name>
+            <email>daniel@bitbadger.solutions</email>
+            <organization>Bit Badger Solutions</organization>
+            <organizationUrl>https://bitbadger.solutions</organizationUrl>
+        </developer>
+    </developers>
+
+    <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>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,12 +43,12 @@
         <serialization.version>1.8.0</serialization.version>
     </properties>
 
-    <repositories>
+    <!-- <repositories>
         <repository>
             <id>mavenCentral</id>
             <url>https://repo1.maven.org/maven2/</url>
         </repository>
-    </repositories>
+    </repositories> -->
 
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
@@ -67,6 +94,14 @@
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>2.22.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -111,13 +146,13 @@
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
             <version>3.46.1.2</version>
-            <scope>integration-test</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>42.7.5</version>
-            <scope>integration-test</scope>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/src/test/kotlin/ComparisonTest.kt b/src/test/kotlin/ComparisonTest.kt
index f92fb68..af6d4d9 100644
--- a/src/test/kotlin/ComparisonTest.kt
+++ b/src/test/kotlin/ComparisonTest.kt
@@ -2,6 +2,7 @@ package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
+import solutions.bitbadger.documents.integration.TEST_TABLE
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
diff --git a/src/integration-test/kotlin/ThrowawayDatabase.kt b/src/test/kotlin/integration/ThrowawayDatabase.kt
similarity index 90%
rename from src/integration-test/kotlin/ThrowawayDatabase.kt
rename to src/test/kotlin/integration/ThrowawayDatabase.kt
index 901f50b..5138ba4 100644
--- a/src/integration-test/kotlin/ThrowawayDatabase.kt
+++ b/src/test/kotlin/integration/ThrowawayDatabase.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents
+package solutions.bitbadger.documents.integration
 
 import java.sql.Connection
 
diff --git a/src/integration-test/kotlin/Types.kt b/src/test/kotlin/integration/Types.kt
similarity index 84%
rename from src/integration-test/kotlin/Types.kt
rename to src/test/kotlin/integration/Types.kt
index b655427..54adfb4 100644
--- a/src/integration-test/kotlin/Types.kt
+++ b/src/test/kotlin/integration/Types.kt
@@ -1,6 +1,7 @@
-package solutions.bitbadger.documents
+package solutions.bitbadger.documents.integration
 
 import kotlinx.serialization.Serializable
+import solutions.bitbadger.documents.insert
 
 /** The test table name to use for integration tests */
 const val TEST_TABLE = "test_table"
@@ -18,7 +19,8 @@ data class ArrayDocument(val id: String, val values: List<String>) {
         val testDocuments = listOf(
             ArrayDocument("first",  listOf("a", "b", "c")),
             ArrayDocument("second", listOf("c", "d", "e")),
-            ArrayDocument("third",  listOf("x", "y", "z")))
+            ArrayDocument("third",  listOf("x", "y", "z"))
+        )
     }
 }
 
@@ -31,7 +33,8 @@ data class JsonDocument(val id: String, val value: String = "", val numValue: In
             JsonDocument("two",   "another", 10, SubDocument("green", "blue")),
             JsonDocument("three", "",         4, null),
             JsonDocument("four",  "purple",  17, SubDocument("green", "red")),
-            JsonDocument("five",  "purple",  18, null))
+            JsonDocument("five",  "purple",  18, null)
+        )
 
         fun load(db: ThrowawayDatabase, tableName: String = TEST_TABLE) =
             testDocuments.forEach { db.conn.insert(tableName, it) }
diff --git a/src/integration-test/kotlin/common/Count.kt b/src/test/kotlin/integration/common/Count.kt
similarity index 88%
rename from src/integration-test/kotlin/common/Count.kt
rename to src/test/kotlin/integration/common/Count.kt
index 878d079..f6cad25 100644
--- a/src/integration-test/kotlin/common/Count.kt
+++ b/src/test/kotlin/integration/common/Count.kt
@@ -1,6 +1,9 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.JsonDocument
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 import kotlin.test.assertEquals
 
 /**
diff --git a/src/integration-test/kotlin/common/Custom.kt b/src/test/kotlin/integration/common/Custom.kt
similarity index 92%
rename from src/integration-test/kotlin/common/Custom.kt
rename to src/test/kotlin/integration/common/Custom.kt
index be28838..8170e94 100644
--- a/src/integration-test/kotlin/common/Custom.kt
+++ b/src/test/kotlin/integration/common/Custom.kt
@@ -1,6 +1,9 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.JsonDocument
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 import solutions.bitbadger.documents.query.Count
 import solutions.bitbadger.documents.query.Delete
 import solutions.bitbadger.documents.query.Find
diff --git a/src/integration-test/kotlin/common/Definition.kt b/src/test/kotlin/integration/common/Definition.kt
similarity index 92%
rename from src/integration-test/kotlin/common/Definition.kt
rename to src/test/kotlin/integration/common/Definition.kt
index 70e99b4..d8f763d 100644
--- a/src/integration-test/kotlin/common/Definition.kt
+++ b/src/test/kotlin/integration/common/Definition.kt
@@ -1,6 +1,8 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
diff --git a/src/integration-test/kotlin/common/Delete.kt b/src/test/kotlin/integration/common/Delete.kt
similarity index 92%
rename from src/integration-test/kotlin/common/Delete.kt
rename to src/test/kotlin/integration/common/Delete.kt
index 09b9f26..4a929b5 100644
--- a/src/integration-test/kotlin/common/Delete.kt
+++ b/src/test/kotlin/integration/common/Delete.kt
@@ -1,6 +1,9 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.JsonDocument
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 import kotlin.test.assertEquals
 
 /**
diff --git a/src/integration-test/kotlin/common/Document.kt b/src/test/kotlin/integration/common/Document.kt
similarity index 98%
rename from src/integration-test/kotlin/common/Document.kt
rename to src/test/kotlin/integration/common/Document.kt
index c0fdc51..9396776 100644
--- a/src/integration-test/kotlin/common/Document.kt
+++ b/src/test/kotlin/integration/common/Document.kt
@@ -1,6 +1,7 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.*
 import kotlin.test.*
 
 /**
diff --git a/src/integration-test/kotlin/common/Exists.kt b/src/test/kotlin/integration/common/Exists.kt
similarity index 89%
rename from src/integration-test/kotlin/common/Exists.kt
rename to src/test/kotlin/integration/common/Exists.kt
index 77525ff..05ba58e 100644
--- a/src/integration-test/kotlin/common/Exists.kt
+++ b/src/test/kotlin/integration/common/Exists.kt
@@ -1,6 +1,9 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.JsonDocument
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
diff --git a/src/integration-test/kotlin/common/Find.kt b/src/test/kotlin/integration/common/Find.kt
similarity index 99%
rename from src/integration-test/kotlin/common/Find.kt
rename to src/test/kotlin/integration/common/Find.kt
index d0de8ea..48cd857 100644
--- a/src/integration-test/kotlin/common/Find.kt
+++ b/src/test/kotlin/integration/common/Find.kt
@@ -1,6 +1,7 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.*
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
diff --git a/src/integration-test/kotlin/common/Patch.kt b/src/test/kotlin/integration/common/Patch.kt
similarity index 93%
rename from src/integration-test/kotlin/common/Patch.kt
rename to src/test/kotlin/integration/common/Patch.kt
index 888054f..77fc60a 100644
--- a/src/integration-test/kotlin/common/Patch.kt
+++ b/src/test/kotlin/integration/common/Patch.kt
@@ -1,6 +1,9 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.JsonDocument
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
diff --git a/src/integration-test/kotlin/common/RemoveFields.kt b/src/test/kotlin/integration/common/RemoveFields.kt
similarity index 95%
rename from src/integration-test/kotlin/common/RemoveFields.kt
rename to src/test/kotlin/integration/common/RemoveFields.kt
index 20fb33f..cbfeeaf 100644
--- a/src/integration-test/kotlin/common/RemoveFields.kt
+++ b/src/test/kotlin/integration/common/RemoveFields.kt
@@ -1,6 +1,9 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents.integration.common
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.JsonDocument
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 import kotlin.test.*
 
 
diff --git a/src/integration-test/kotlin/postgresql/CountIT.kt b/src/test/kotlin/integration/postgresql/CountIT.kt
similarity index 91%
rename from src/integration-test/kotlin/postgresql/CountIT.kt
rename to src/test/kotlin/integration/postgresql/CountIT.kt
index cf3c6d1..9709cf9 100644
--- a/src/integration-test/kotlin/postgresql/CountIT.kt
+++ b/src/test/kotlin/integration/postgresql/CountIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Count
+import solutions.bitbadger.documents.integration.common.Count
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/postgresql/CustomIT.kt b/src/test/kotlin/integration/postgresql/CustomIT.kt
similarity index 90%
rename from src/integration-test/kotlin/postgresql/CustomIT.kt
rename to src/test/kotlin/integration/postgresql/CustomIT.kt
index 8538446..5729df9 100644
--- a/src/integration-test/kotlin/postgresql/CustomIT.kt
+++ b/src/test/kotlin/integration/postgresql/CustomIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Custom
+import solutions.bitbadger.documents.integration.common.Custom
 
 import kotlin.test.Test
 
diff --git a/src/integration-test/kotlin/postgresql/DefinitionIT.kt b/src/test/kotlin/integration/postgresql/DefinitionIT.kt
similarity index 87%
rename from src/integration-test/kotlin/postgresql/DefinitionIT.kt
rename to src/test/kotlin/integration/postgresql/DefinitionIT.kt
index 2533fdc..363c92d 100644
--- a/src/integration-test/kotlin/postgresql/DefinitionIT.kt
+++ b/src/test/kotlin/integration/postgresql/DefinitionIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Definition
+import solutions.bitbadger.documents.integration.common.Definition
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/postgresql/DeleteIT.kt b/src/test/kotlin/integration/postgresql/DeleteIT.kt
similarity index 91%
rename from src/integration-test/kotlin/postgresql/DeleteIT.kt
rename to src/test/kotlin/integration/postgresql/DeleteIT.kt
index 0c62efe..707be57 100644
--- a/src/integration-test/kotlin/postgresql/DeleteIT.kt
+++ b/src/test/kotlin/integration/postgresql/DeleteIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Delete
+import solutions.bitbadger.documents.integration.common.Delete
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/postgresql/DocumentIT.kt b/src/test/kotlin/integration/postgresql/DocumentIT.kt
similarity index 92%
rename from src/integration-test/kotlin/postgresql/DocumentIT.kt
rename to src/test/kotlin/integration/postgresql/DocumentIT.kt
index df3ac17..36d15af 100644
--- a/src/integration-test/kotlin/postgresql/DocumentIT.kt
+++ b/src/test/kotlin/integration/postgresql/DocumentIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Document
+import solutions.bitbadger.documents.integration.common.Document
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/postgresql/ExistsIT.kt b/src/test/kotlin/integration/postgresql/ExistsIT.kt
similarity index 91%
rename from src/integration-test/kotlin/postgresql/ExistsIT.kt
rename to src/test/kotlin/integration/postgresql/ExistsIT.kt
index 3ce135d..be02740 100644
--- a/src/integration-test/kotlin/postgresql/ExistsIT.kt
+++ b/src/test/kotlin/integration/postgresql/ExistsIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Exists
+import solutions.bitbadger.documents.integration.common.Exists
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/postgresql/FindIT.kt b/src/test/kotlin/integration/postgresql/FindIT.kt
similarity index 97%
rename from src/integration-test/kotlin/postgresql/FindIT.kt
rename to src/test/kotlin/integration/postgresql/FindIT.kt
index ed72e80..6b00cc3 100644
--- a/src/integration-test/kotlin/postgresql/FindIT.kt
+++ b/src/test/kotlin/integration/postgresql/FindIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Find
+import solutions.bitbadger.documents.integration.common.Find
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/postgresql/PatchIT.kt b/src/test/kotlin/integration/postgresql/PatchIT.kt
similarity index 91%
rename from src/integration-test/kotlin/postgresql/PatchIT.kt
rename to src/test/kotlin/integration/postgresql/PatchIT.kt
index 225e8f9..df1c79d 100644
--- a/src/integration-test/kotlin/postgresql/PatchIT.kt
+++ b/src/test/kotlin/integration/postgresql/PatchIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Patch
+import solutions.bitbadger.documents.integration.common.Patch
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/postgresql/PgDB.kt b/src/test/kotlin/integration/postgresql/PgDB.kt
similarity index 88%
rename from src/integration-test/kotlin/postgresql/PgDB.kt
rename to src/test/kotlin/integration/postgresql/PgDB.kt
index d4cd76e..ae517d3 100644
--- a/src/integration-test/kotlin/postgresql/PgDB.kt
+++ b/src/test/kotlin/integration/postgresql/PgDB.kt
@@ -1,6 +1,8 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 
 /**
  * A wrapper for a throwaway PostgreSQL database
diff --git a/src/integration-test/kotlin/postgresql/RemoveFieldsIT.kt b/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt
similarity index 94%
rename from src/integration-test/kotlin/postgresql/RemoveFieldsIT.kt
rename to src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt
index d7beb63..9719447 100644
--- a/src/integration-test/kotlin/postgresql/RemoveFieldsIT.kt
+++ b/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.postgresql
+package solutions.bitbadger.documents.integration.postgresql
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.RemoveFields
+import solutions.bitbadger.documents.integration.common.RemoveFields
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/CountIT.kt b/src/test/kotlin/integration/sqlite/CountIT.kt
similarity index 89%
rename from src/integration-test/kotlin/sqlite/CountIT.kt
rename to src/test/kotlin/integration/sqlite/CountIT.kt
index 969b534..0ebdeb7 100644
--- a/src/integration-test/kotlin/sqlite/CountIT.kt
+++ b/src/test/kotlin/integration/sqlite/CountIT.kt
@@ -1,9 +1,9 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows
 import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Count
+import solutions.bitbadger.documents.integration.common.Count
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/CustomIT.kt b/src/test/kotlin/integration/sqlite/CustomIT.kt
similarity index 90%
rename from src/integration-test/kotlin/sqlite/CustomIT.kt
rename to src/test/kotlin/integration/sqlite/CustomIT.kt
index 7b8dbd5..ab37b5f 100644
--- a/src/integration-test/kotlin/sqlite/CustomIT.kt
+++ b/src/test/kotlin/integration/sqlite/CustomIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Custom
+import solutions.bitbadger.documents.integration.common.Custom
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/DefinitionIT.kt b/src/test/kotlin/integration/sqlite/DefinitionIT.kt
similarity index 89%
rename from src/integration-test/kotlin/sqlite/DefinitionIT.kt
rename to src/test/kotlin/integration/sqlite/DefinitionIT.kt
index 8866751..8e1a6cd 100644
--- a/src/integration-test/kotlin/sqlite/DefinitionIT.kt
+++ b/src/test/kotlin/integration/sqlite/DefinitionIT.kt
@@ -1,9 +1,9 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows
 import solutions.bitbadger.documents.*
-import solutions.bitbadger.documents.common.Definition
+import solutions.bitbadger.documents.integration.common.Definition
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/DeleteIT.kt b/src/test/kotlin/integration/sqlite/DeleteIT.kt
similarity index 90%
rename from src/integration-test/kotlin/sqlite/DeleteIT.kt
rename to src/test/kotlin/integration/sqlite/DeleteIT.kt
index 68649b9..b623e24 100644
--- a/src/integration-test/kotlin/sqlite/DeleteIT.kt
+++ b/src/test/kotlin/integration/sqlite/DeleteIT.kt
@@ -1,9 +1,9 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows
 import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Delete
+import solutions.bitbadger.documents.integration.common.Delete
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/DocumentIT.kt b/src/test/kotlin/integration/sqlite/DocumentIT.kt
similarity index 92%
rename from src/integration-test/kotlin/sqlite/DocumentIT.kt
rename to src/test/kotlin/integration/sqlite/DocumentIT.kt
index edb1dfb..402cd6e 100644
--- a/src/integration-test/kotlin/sqlite/DocumentIT.kt
+++ b/src/test/kotlin/integration/sqlite/DocumentIT.kt
@@ -1,7 +1,7 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
-import solutions.bitbadger.documents.common.Document
+import solutions.bitbadger.documents.integration.common.Document
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/ExistsIT.kt b/src/test/kotlin/integration/sqlite/ExistsIT.kt
similarity index 91%
rename from src/integration-test/kotlin/sqlite/ExistsIT.kt
rename to src/test/kotlin/integration/sqlite/ExistsIT.kt
index 87c56c7..d9c0c6d 100644
--- a/src/integration-test/kotlin/sqlite/ExistsIT.kt
+++ b/src/test/kotlin/integration/sqlite/ExistsIT.kt
@@ -1,9 +1,9 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows
 import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Exists
+import solutions.bitbadger.documents.integration.common.Exists
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/FindIT.kt b/src/test/kotlin/integration/sqlite/FindIT.kt
similarity index 96%
rename from src/integration-test/kotlin/sqlite/FindIT.kt
rename to src/test/kotlin/integration/sqlite/FindIT.kt
index fbb40b1..f0f05bd 100644
--- a/src/integration-test/kotlin/sqlite/FindIT.kt
+++ b/src/test/kotlin/integration/sqlite/FindIT.kt
@@ -1,9 +1,9 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows
 import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Find
+import solutions.bitbadger.documents.integration.common.Find
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/PatchIT.kt b/src/test/kotlin/integration/sqlite/PatchIT.kt
similarity index 90%
rename from src/integration-test/kotlin/sqlite/PatchIT.kt
rename to src/test/kotlin/integration/sqlite/PatchIT.kt
index b6a905f..7878bdf 100644
--- a/src/integration-test/kotlin/sqlite/PatchIT.kt
+++ b/src/test/kotlin/integration/sqlite/PatchIT.kt
@@ -1,9 +1,9 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows
 import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Patch
+import solutions.bitbadger.documents.integration.common.Patch
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/RemoveFieldsIT.kt b/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt
similarity index 93%
rename from src/integration-test/kotlin/sqlite/RemoveFieldsIT.kt
rename to src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt
index 149b66d..bbc26a3 100644
--- a/src/integration-test/kotlin/sqlite/RemoveFieldsIT.kt
+++ b/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt
@@ -1,9 +1,9 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows
 import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.RemoveFields
+import solutions.bitbadger.documents.integration.common.RemoveFields
 import kotlin.test.Test
 
 /**
diff --git a/src/integration-test/kotlin/sqlite/SQLiteDB.kt b/src/test/kotlin/integration/sqlite/SQLiteDB.kt
similarity index 80%
rename from src/integration-test/kotlin/sqlite/SQLiteDB.kt
rename to src/test/kotlin/integration/sqlite/SQLiteDB.kt
index 1724e34..55504a0 100644
--- a/src/integration-test/kotlin/sqlite/SQLiteDB.kt
+++ b/src/test/kotlin/integration/sqlite/SQLiteDB.kt
@@ -1,6 +1,8 @@
-package solutions.bitbadger.documents.sqlite
+package solutions.bitbadger.documents.integration.sqlite
 
 import solutions.bitbadger.documents.*
+import solutions.bitbadger.documents.integration.TEST_TABLE
+import solutions.bitbadger.documents.integration.ThrowawayDatabase
 import java.io.File
 
 /**