diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ca3012f..1106a32 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,10 +6,11 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="common" />
+        <module name="documents" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="common" target="1.8" />
       <module name="sqlite" target="1.8" />
     </bytecodeTargetLevel>
   </component>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index e98b3a0..e48c513 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/common/src/main/kotlin" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/kotlin" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/sqlite/src/main/kotlin" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/sqlite/src/main/resources" charset="UTF-8" />
   </component>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index c22b6fa..bb44937 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.1.10" />
+    <option name="version" value="2.1.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba84d0a..9959fd1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,6 +10,7 @@
     </option>
     <option name="ignoredFiles">
       <set>
+        <option value="$PROJECT_DIR$/src/common/pom.xml" />
         <option value="$PROJECT_DIR$/src/sqlite/pom.xml" />
       </set>
     </option>
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index cf07591..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/solutions.bitbadger.documents.iml" filepath="$PROJECT_DIR$/.idea/solutions.bitbadger.documents.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/solutions.bitbadger.documents.iml b/.idea/solutions.bitbadger.documents.iml
index 6ec89fa..cd2501b 100644
--- a/.idea/solutions.bitbadger.documents.iml
+++ b/.idea/solutions.bitbadger.documents.iml
@@ -2,7 +2,10 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
diff --git a/src/common/pom.xml b/pom.xml
similarity index 97%
rename from src/common/pom.xml
rename to pom.xml
index 4b91d63..cab9d3e 100644
--- a/src/common/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>solutions.bitbadger.documents</groupId>
-    <artifactId>common</artifactId>
+    <groupId>solutions.bitbadger</groupId>
+    <artifactId>documents</artifactId>
     <version>4.0-ALPHA</version>
 
     <properties>
diff --git a/src/common/src/main/kotlin/AutoId.kt b/src/main/kotlin/AutoId.kt
similarity index 98%
rename from src/common/src/main/kotlin/AutoId.kt
rename to src/main/kotlin/AutoId.kt
index e77d78f..1d8da22 100644
--- a/src/common/src/main/kotlin/AutoId.kt
+++ b/src/main/kotlin/AutoId.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import kotlin.reflect.full.*
 
diff --git a/src/common/src/main/kotlin/Comparison.kt b/src/main/kotlin/Comparison.kt
similarity index 94%
rename from src/common/src/main/kotlin/Comparison.kt
rename to src/main/kotlin/Comparison.kt
index 01710b5..bcb4226 100644
--- a/src/common/src/main/kotlin/Comparison.kt
+++ b/src/main/kotlin/Comparison.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A comparison against a field in a JSON document
diff --git a/src/common/src/main/kotlin/Configuration.kt b/src/main/kotlin/Configuration.kt
similarity index 97%
rename from src/common/src/main/kotlin/Configuration.kt
rename to src/main/kotlin/Configuration.kt
index d71d43a..069f9a4 100644
--- a/src/common/src/main/kotlin/Configuration.kt
+++ b/src/main/kotlin/Configuration.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import kotlinx.serialization.json.Json
 import java.sql.Connection
diff --git a/src/common/src/main/kotlin/ConnectionExtensions.kt b/src/main/kotlin/ConnectionExtensions.kt
similarity index 97%
rename from src/common/src/main/kotlin/ConnectionExtensions.kt
rename to src/main/kotlin/ConnectionExtensions.kt
index e18a7f4..51f7f93 100644
--- a/src/common/src/main/kotlin/ConnectionExtensions.kt
+++ b/src/main/kotlin/ConnectionExtensions.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.Connection
 import java.sql.ResultSet
diff --git a/src/common/src/main/kotlin/Dialect.kt b/src/main/kotlin/Dialect.kt
similarity index 94%
rename from src/common/src/main/kotlin/Dialect.kt
rename to src/main/kotlin/Dialect.kt
index 9d4535f..e19807d 100644
--- a/src/common/src/main/kotlin/Dialect.kt
+++ b/src/main/kotlin/Dialect.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The SQL dialect to use when building queries
diff --git a/src/common/src/main/kotlin/DocumentException.kt b/src/main/kotlin/DocumentException.kt
similarity index 85%
rename from src/common/src/main/kotlin/DocumentException.kt
rename to src/main/kotlin/DocumentException.kt
index 6901d2b..bb0e0ff 100644
--- a/src/common/src/main/kotlin/DocumentException.kt
+++ b/src/main/kotlin/DocumentException.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * An exception caused by invalid operations in the document library
diff --git a/src/common/src/main/kotlin/Field.kt b/src/main/kotlin/Field.kt
similarity index 99%
rename from src/common/src/main/kotlin/Field.kt
rename to src/main/kotlin/Field.kt
index 6f45ee3..1c8102d 100644
--- a/src/common/src/main/kotlin/Field.kt
+++ b/src/main/kotlin/Field.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A field and its comparison
diff --git a/src/common/src/main/kotlin/FieldFormat.kt b/src/main/kotlin/FieldFormat.kt
similarity index 84%
rename from src/common/src/main/kotlin/FieldFormat.kt
rename to src/main/kotlin/FieldFormat.kt
index 02d4c20..c804a87 100644
--- a/src/common/src/main/kotlin/FieldFormat.kt
+++ b/src/main/kotlin/FieldFormat.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The data format for a document field retrieval
diff --git a/src/common/src/main/kotlin/FieldMatch.kt b/src/main/kotlin/FieldMatch.kt
similarity index 83%
rename from src/common/src/main/kotlin/FieldMatch.kt
rename to src/main/kotlin/FieldMatch.kt
index e621dba..3b1d3ff 100644
--- a/src/common/src/main/kotlin/FieldMatch.kt
+++ b/src/main/kotlin/FieldMatch.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * How fields should be matched in by-field queries
diff --git a/src/common/src/main/kotlin/Op.kt b/src/main/kotlin/Op.kt
similarity index 94%
rename from src/common/src/main/kotlin/Op.kt
rename to src/main/kotlin/Op.kt
index 89f6139..0566f06 100644
--- a/src/common/src/main/kotlin/Op.kt
+++ b/src/main/kotlin/Op.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A comparison operator used for fields
diff --git a/src/common/src/main/kotlin/Parameter.kt b/src/main/kotlin/Parameter.kt
similarity index 90%
rename from src/common/src/main/kotlin/Parameter.kt
rename to src/main/kotlin/Parameter.kt
index eca25b7..97fe766 100644
--- a/src/common/src/main/kotlin/Parameter.kt
+++ b/src/main/kotlin/Parameter.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A parameter to use for a query
diff --git a/src/common/src/main/kotlin/ParameterName.kt b/src/main/kotlin/ParameterName.kt
similarity index 91%
rename from src/common/src/main/kotlin/ParameterName.kt
rename to src/main/kotlin/ParameterName.kt
index 566dca0..a090db0 100644
--- a/src/common/src/main/kotlin/ParameterName.kt
+++ b/src/main/kotlin/ParameterName.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * Derive parameter names; each instance wraps a counter to provide names for anonymous fields
diff --git a/src/common/src/main/kotlin/ParameterType.kt b/src/main/kotlin/ParameterType.kt
similarity index 87%
rename from src/common/src/main/kotlin/ParameterType.kt
rename to src/main/kotlin/ParameterType.kt
index 53d6e1b..77a88da 100644
--- a/src/common/src/main/kotlin/ParameterType.kt
+++ b/src/main/kotlin/ParameterType.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The types of parameters supported by the document library
diff --git a/src/common/src/main/kotlin/Parameters.kt b/src/main/kotlin/Parameters.kt
similarity index 98%
rename from src/common/src/main/kotlin/Parameters.kt
rename to src/main/kotlin/Parameters.kt
index f43a711..550ecf0 100644
--- a/src/common/src/main/kotlin/Parameters.kt
+++ b/src/main/kotlin/Parameters.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.Connection
 import java.sql.PreparedStatement
diff --git a/src/common/src/main/kotlin/Query.kt b/src/main/kotlin/Query.kt
similarity index 99%
rename from src/common/src/main/kotlin/Query.kt
rename to src/main/kotlin/Query.kt
index b5485fe..8348c35 100644
--- a/src/common/src/main/kotlin/Query.kt
+++ b/src/main/kotlin/Query.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 object Query {
 
diff --git a/src/common/src/main/kotlin/Results.kt b/src/main/kotlin/Results.kt
similarity index 98%
rename from src/common/src/main/kotlin/Results.kt
rename to src/main/kotlin/Results.kt
index 2f67413..f35b483 100644
--- a/src/common/src/main/kotlin/Results.kt
+++ b/src/main/kotlin/Results.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.PreparedStatement
 import java.sql.ResultSet
diff --git a/src/common/src/test/kotlin/AutoIdTest.kt b/src/test/kotlin/AutoIdTest.kt
similarity index 99%
rename from src/common/src/test/kotlin/AutoIdTest.kt
rename to src/test/kotlin/AutoIdTest.kt
index 038d322..1098e1d 100644
--- a/src/common/src/test/kotlin/AutoIdTest.kt
+++ b/src/test/kotlin/AutoIdTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
diff --git a/src/common/src/test/kotlin/ConfigurationTest.kt b/src/test/kotlin/ConfigurationTest.kt
similarity index 94%
rename from src/common/src/test/kotlin/ConfigurationTest.kt
rename to src/test/kotlin/ConfigurationTest.kt
index 29a2a61..8dc67d1 100644
--- a/src/common/src/test/kotlin/ConfigurationTest.kt
+++ b/src/test/kotlin/ConfigurationTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
diff --git a/src/common/src/test/kotlin/FieldMatchTest.kt b/src/test/kotlin/FieldMatchTest.kt
similarity index 90%
rename from src/common/src/test/kotlin/FieldMatchTest.kt
rename to src/test/kotlin/FieldMatchTest.kt
index f73e99f..cbb01bb 100644
--- a/src/common/src/test/kotlin/FieldMatchTest.kt
+++ b/src/test/kotlin/FieldMatchTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
diff --git a/src/common/src/test/kotlin/FieldTest.kt b/src/test/kotlin/FieldTest.kt
similarity index 99%
rename from src/common/src/test/kotlin/FieldTest.kt
rename to src/test/kotlin/FieldTest.kt
index 7c32a0d..1114e0b 100644
--- a/src/common/src/test/kotlin/FieldTest.kt
+++ b/src/test/kotlin/FieldTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
diff --git a/src/common/src/test/kotlin/OpTest.kt b/src/test/kotlin/OpTest.kt
similarity index 97%
rename from src/common/src/test/kotlin/OpTest.kt
rename to src/test/kotlin/OpTest.kt
index 6656928..b69b386 100644
--- a/src/common/src/test/kotlin/OpTest.kt
+++ b/src/test/kotlin/OpTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
diff --git a/src/common/src/test/kotlin/ParameterNameTest.kt b/src/test/kotlin/ParameterNameTest.kt
similarity index 95%
rename from src/common/src/test/kotlin/ParameterNameTest.kt
rename to src/test/kotlin/ParameterNameTest.kt
index 4c435aa..e63162e 100644
--- a/src/common/src/test/kotlin/ParameterNameTest.kt
+++ b/src/test/kotlin/ParameterNameTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
diff --git a/src/common/src/test/kotlin/ParameterTest.kt b/src/test/kotlin/ParameterTest.kt
similarity index 96%
rename from src/common/src/test/kotlin/ParameterTest.kt
rename to src/test/kotlin/ParameterTest.kt
index 7cc17e3..d9d0b2f 100644
--- a/src/common/src/test/kotlin/ParameterTest.kt
+++ b/src/test/kotlin/ParameterTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows
diff --git a/src/common/src/test/kotlin/ParametersTest.kt b/src/test/kotlin/ParametersTest.kt
similarity index 93%
rename from src/common/src/test/kotlin/ParametersTest.kt
rename to src/test/kotlin/ParametersTest.kt
index 0394a12..d5a6592 100644
--- a/src/common/src/test/kotlin/ParametersTest.kt
+++ b/src/test/kotlin/ParametersTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import kotlin.test.Test
diff --git a/src/common/src/test/kotlin/QueryTest.kt b/src/test/kotlin/QueryTest.kt
similarity index 99%
rename from src/common/src/test/kotlin/QueryTest.kt
rename to src/test/kotlin/QueryTest.kt
index 73248a2..3799154 100644
--- a/src/common/src/test/kotlin/QueryTest.kt
+++ b/src/test/kotlin/QueryTest.kt
@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test