diff --git a/build.gradle b/build.gradle
index 6639dc6..64a0095 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,75 +4,79 @@
 //
 // History:
 //   10 Jun 2016  Matthew Giannini  Creation
+//   24 Mar 2020  Matthew Giannini  multi-project build
 //
 plugins {
-    id 'java-library'
-    id 'maven-publish'
-    id 'war'
     id 'com.jfrog.bintray' version '1.8.4'
-    id 'idea'
+    id 'maven-publish'
 }
 
-group = "org.projecthaystack"
-version = "3.0.4"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+group   = 'org.projecthaystack'
+version = '3.1.0'
 
-    withJavadocJar()
-    withSourcesJar()
+allprojects {
+    apply plugin: 'idea'
 }
 
+subprojects {
+    apply plugin: 'java-library'
 
-repositories {
-    jcenter()
-}
+    repositories {
+        jcenter()
+    }
 
-dependencies {
-    providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_7
+        targetCompatibility = JavaVersion.VERSION_1_7
 
-    // Use TestNG framework, also requires calling test.useTestNG() below
-    testImplementation 'org.testng:testng:7.1.0'
-}
+        withJavadocJar()
+        withSourcesJar()
+    }
 
-test {
-    useTestNG() {
-        outputDirectory = file("$project.buildDir/reports/testng")
-        useDefaultListeners = true
+    dependencies {
+        // Use TestNG framework, also requires calling test.useTestNG() below
+        testImplementation 'org.testng:testng:7.1.0'
     }
 
-    testLogging.showStandardStreams = true;
+    test {
+        useTestNG() {
+            outputDirectory = file("$project.buildDir/reports/testng")
+            useDefaultListeners = true
+        }
+
+        testLogging.showStandardStreams = true;
 
-    testLogging {
-        afterSuite { desc, result ->
-            if (!desc.parent) { // will match the outermost suite
-                println "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)"
+        testLogging {
+            afterSuite { desc, result ->
+                if (!desc.parent) { // will match the outermost suite
+                    println "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)"
+                }
             }
         }
     }
-}
 
-// Stupid war plugin disable jar for some reason. Force jar creation
-assemble.dependsOn(jar)
+    javadoc {
+        if(JavaVersion.current().isJava9Compatible()) {
+            options.addBooleanOption('html5', true)
+        }
+    }
+}
 
 publishing {
     publications {
-        create("haystack-java", MavenPublication) {
-            artifactId = 'haystack-java'
-
-            from components.java
+        core(MavenPublication) {
+            def project = project(':haystack-core')
+            from project.components.java
+            artifactId project.name
         }
     }
 }
 
-String findProperty(String s) { project.findProperty(s) }
-
 bintray {
-    user = findProperty("bintrayUser")
-    key  = findProperty("bintrayApiKey")
+    user = project.findProperty("bintrayUser")
+    key  = project.findProperty("bintrayApiKey")
     publish = true
-    setPublications("haystack-java")
+    publications = ['core']
     pkg {
         repo    = 'maven'
         name    = 'haystack-java'
@@ -80,14 +84,33 @@ bintray {
         vcsUrl  = 'https://github.com/skyfoundry/haystack-java'
     }
 }
-
-javadoc {
-    if(JavaVersion.current().isJava9Compatible()) {
-        options.addBooleanOption('html5', true)
+/*
+project(':haystack-core') {
+    bintray {
+        user = project.findProperty("bintrayUser")
+        key  = project.findProperty("bintrayApiKey")
+        publish = true
+        setPublications("haystack-core")
+        pkg {
+            repo    = 'maven'
+            name    = 'haystack-core'
+            userOrg = 'skyfoundry'
+            vcsUrl  = 'https://github.com/skyfoundry/haystack-java'
+        }
     }
 }
+*/
 
-//gradle.taskGraph.whenReady {taskGraph ->
-//    if (!taskGraph.hasTask(release)) version += "-SNAPSHOT"
-//}
+project(':haystack-server') {
+    apply plugin: 'war'
+
+    dependencies {
+        providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
+
+        implementation project(':haystack-core')
+    }
+
+    // Stupid war plugin disable jar for some reason. Force jar creation
+    assemble.dependsOn(jar)
+}
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4a6ebce..ba53392 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Mar 24 15:16:49 EDT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/org/projecthaystack/HBin.java b/haystack-core/src/main/java/org/projecthaystack/HBin.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HBin.java
rename to haystack-core/src/main/java/org/projecthaystack/HBin.java
diff --git a/src/main/java/org/projecthaystack/HBool.java b/haystack-core/src/main/java/org/projecthaystack/HBool.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HBool.java
rename to haystack-core/src/main/java/org/projecthaystack/HBool.java
diff --git a/src/main/java/org/projecthaystack/HCol.java b/haystack-core/src/main/java/org/projecthaystack/HCol.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HCol.java
rename to haystack-core/src/main/java/org/projecthaystack/HCol.java
diff --git a/src/main/java/org/projecthaystack/HCoord.java b/haystack-core/src/main/java/org/projecthaystack/HCoord.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HCoord.java
rename to haystack-core/src/main/java/org/projecthaystack/HCoord.java
diff --git a/src/main/java/org/projecthaystack/HDate.java b/haystack-core/src/main/java/org/projecthaystack/HDate.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HDate.java
rename to haystack-core/src/main/java/org/projecthaystack/HDate.java
diff --git a/src/main/java/org/projecthaystack/HDateTime.java b/haystack-core/src/main/java/org/projecthaystack/HDateTime.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HDateTime.java
rename to haystack-core/src/main/java/org/projecthaystack/HDateTime.java
diff --git a/src/main/java/org/projecthaystack/HDateTimeRange.java b/haystack-core/src/main/java/org/projecthaystack/HDateTimeRange.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HDateTimeRange.java
rename to haystack-core/src/main/java/org/projecthaystack/HDateTimeRange.java
diff --git a/src/main/java/org/projecthaystack/HDict.java b/haystack-core/src/main/java/org/projecthaystack/HDict.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HDict.java
rename to haystack-core/src/main/java/org/projecthaystack/HDict.java
diff --git a/src/main/java/org/projecthaystack/HDictBuilder.java b/haystack-core/src/main/java/org/projecthaystack/HDictBuilder.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HDictBuilder.java
rename to haystack-core/src/main/java/org/projecthaystack/HDictBuilder.java
diff --git a/src/main/java/org/projecthaystack/HFilter.java b/haystack-core/src/main/java/org/projecthaystack/HFilter.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HFilter.java
rename to haystack-core/src/main/java/org/projecthaystack/HFilter.java
diff --git a/src/main/java/org/projecthaystack/HGrid.java b/haystack-core/src/main/java/org/projecthaystack/HGrid.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HGrid.java
rename to haystack-core/src/main/java/org/projecthaystack/HGrid.java
diff --git a/src/main/java/org/projecthaystack/HGridBuilder.java b/haystack-core/src/main/java/org/projecthaystack/HGridBuilder.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HGridBuilder.java
rename to haystack-core/src/main/java/org/projecthaystack/HGridBuilder.java
diff --git a/src/main/java/org/projecthaystack/HHisItem.java b/haystack-core/src/main/java/org/projecthaystack/HHisItem.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HHisItem.java
rename to haystack-core/src/main/java/org/projecthaystack/HHisItem.java
diff --git a/src/main/java/org/projecthaystack/HList.java b/haystack-core/src/main/java/org/projecthaystack/HList.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HList.java
rename to haystack-core/src/main/java/org/projecthaystack/HList.java
diff --git a/src/main/java/org/projecthaystack/HMarker.java b/haystack-core/src/main/java/org/projecthaystack/HMarker.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HMarker.java
rename to haystack-core/src/main/java/org/projecthaystack/HMarker.java
diff --git a/src/main/java/org/projecthaystack/HNA.java b/haystack-core/src/main/java/org/projecthaystack/HNA.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HNA.java
rename to haystack-core/src/main/java/org/projecthaystack/HNA.java
diff --git a/src/main/java/org/projecthaystack/HNum.java b/haystack-core/src/main/java/org/projecthaystack/HNum.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HNum.java
rename to haystack-core/src/main/java/org/projecthaystack/HNum.java
diff --git a/src/main/java/org/projecthaystack/HProj.java b/haystack-core/src/main/java/org/projecthaystack/HProj.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HProj.java
rename to haystack-core/src/main/java/org/projecthaystack/HProj.java
diff --git a/src/main/java/org/projecthaystack/HRef.java b/haystack-core/src/main/java/org/projecthaystack/HRef.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HRef.java
rename to haystack-core/src/main/java/org/projecthaystack/HRef.java
diff --git a/src/main/java/org/projecthaystack/HRemove.java b/haystack-core/src/main/java/org/projecthaystack/HRemove.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HRemove.java
rename to haystack-core/src/main/java/org/projecthaystack/HRemove.java
diff --git a/src/main/java/org/projecthaystack/HRow.java b/haystack-core/src/main/java/org/projecthaystack/HRow.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HRow.java
rename to haystack-core/src/main/java/org/projecthaystack/HRow.java
diff --git a/src/main/java/org/projecthaystack/HStr.java b/haystack-core/src/main/java/org/projecthaystack/HStr.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HStr.java
rename to haystack-core/src/main/java/org/projecthaystack/HStr.java
diff --git a/src/main/java/org/projecthaystack/HTime.java b/haystack-core/src/main/java/org/projecthaystack/HTime.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HTime.java
rename to haystack-core/src/main/java/org/projecthaystack/HTime.java
diff --git a/src/main/java/org/projecthaystack/HTimeZone.java b/haystack-core/src/main/java/org/projecthaystack/HTimeZone.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HTimeZone.java
rename to haystack-core/src/main/java/org/projecthaystack/HTimeZone.java
diff --git a/src/main/java/org/projecthaystack/HUri.java b/haystack-core/src/main/java/org/projecthaystack/HUri.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HUri.java
rename to haystack-core/src/main/java/org/projecthaystack/HUri.java
diff --git a/src/main/java/org/projecthaystack/HVal.java b/haystack-core/src/main/java/org/projecthaystack/HVal.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HVal.java
rename to haystack-core/src/main/java/org/projecthaystack/HVal.java
diff --git a/src/main/java/org/projecthaystack/HWatch.java b/haystack-core/src/main/java/org/projecthaystack/HWatch.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HWatch.java
rename to haystack-core/src/main/java/org/projecthaystack/HWatch.java
diff --git a/src/main/java/org/projecthaystack/HXStr.java b/haystack-core/src/main/java/org/projecthaystack/HXStr.java
similarity index 100%
rename from src/main/java/org/projecthaystack/HXStr.java
rename to haystack-core/src/main/java/org/projecthaystack/HXStr.java
diff --git a/src/main/java/org/projecthaystack/ParseException.java b/haystack-core/src/main/java/org/projecthaystack/ParseException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/ParseException.java
rename to haystack-core/src/main/java/org/projecthaystack/ParseException.java
diff --git a/src/main/java/org/projecthaystack/UnknownNameException.java b/haystack-core/src/main/java/org/projecthaystack/UnknownNameException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/UnknownNameException.java
rename to haystack-core/src/main/java/org/projecthaystack/UnknownNameException.java
diff --git a/src/main/java/org/projecthaystack/UnknownRecException.java b/haystack-core/src/main/java/org/projecthaystack/UnknownRecException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/UnknownRecException.java
rename to haystack-core/src/main/java/org/projecthaystack/UnknownRecException.java
diff --git a/src/main/java/org/projecthaystack/UnknownWatchException.java b/haystack-core/src/main/java/org/projecthaystack/UnknownWatchException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/UnknownWatchException.java
rename to haystack-core/src/main/java/org/projecthaystack/UnknownWatchException.java
diff --git a/src/main/java/org/projecthaystack/auth/AuthClientContext.java b/haystack-core/src/main/java/org/projecthaystack/auth/AuthClientContext.java
similarity index 100%
rename from src/main/java/org/projecthaystack/auth/AuthClientContext.java
rename to haystack-core/src/main/java/org/projecthaystack/auth/AuthClientContext.java
diff --git a/src/main/java/org/projecthaystack/auth/AuthException.java b/haystack-core/src/main/java/org/projecthaystack/auth/AuthException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/auth/AuthException.java
rename to haystack-core/src/main/java/org/projecthaystack/auth/AuthException.java
diff --git a/src/main/java/org/projecthaystack/auth/AuthMsg.java b/haystack-core/src/main/java/org/projecthaystack/auth/AuthMsg.java
similarity index 100%
rename from src/main/java/org/projecthaystack/auth/AuthMsg.java
rename to haystack-core/src/main/java/org/projecthaystack/auth/AuthMsg.java
diff --git a/src/main/java/org/projecthaystack/auth/AuthScheme.java b/haystack-core/src/main/java/org/projecthaystack/auth/AuthScheme.java
similarity index 100%
rename from src/main/java/org/projecthaystack/auth/AuthScheme.java
rename to haystack-core/src/main/java/org/projecthaystack/auth/AuthScheme.java
diff --git a/src/main/java/org/projecthaystack/auth/BasicScheme.java b/haystack-core/src/main/java/org/projecthaystack/auth/BasicScheme.java
similarity index 100%
rename from src/main/java/org/projecthaystack/auth/BasicScheme.java
rename to haystack-core/src/main/java/org/projecthaystack/auth/BasicScheme.java
diff --git a/src/main/java/org/projecthaystack/auth/Folio2Scheme.java b/haystack-core/src/main/java/org/projecthaystack/auth/Folio2Scheme.java
similarity index 100%
rename from src/main/java/org/projecthaystack/auth/Folio2Scheme.java
rename to haystack-core/src/main/java/org/projecthaystack/auth/Folio2Scheme.java
diff --git a/src/main/java/org/projecthaystack/auth/HmacScheme.java b/haystack-core/src/main/java/org/projecthaystack/auth/HmacScheme.java
similarity index 100%
rename from src/main/java/org/projecthaystack/auth/HmacScheme.java
rename to haystack-core/src/main/java/org/projecthaystack/auth/HmacScheme.java
diff --git a/src/main/java/org/projecthaystack/auth/ScramScheme.java b/haystack-core/src/main/java/org/projecthaystack/auth/ScramScheme.java
similarity index 100%
rename from src/main/java/org/projecthaystack/auth/ScramScheme.java
rename to haystack-core/src/main/java/org/projecthaystack/auth/ScramScheme.java
diff --git a/src/main/java/org/projecthaystack/client/CallErrException.java b/haystack-core/src/main/java/org/projecthaystack/client/CallErrException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/client/CallErrException.java
rename to haystack-core/src/main/java/org/projecthaystack/client/CallErrException.java
diff --git a/src/main/java/org/projecthaystack/client/CallException.java b/haystack-core/src/main/java/org/projecthaystack/client/CallException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/client/CallException.java
rename to haystack-core/src/main/java/org/projecthaystack/client/CallException.java
diff --git a/src/main/java/org/projecthaystack/client/CallHttpException.java b/haystack-core/src/main/java/org/projecthaystack/client/CallHttpException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/client/CallHttpException.java
rename to haystack-core/src/main/java/org/projecthaystack/client/CallHttpException.java
diff --git a/src/main/java/org/projecthaystack/client/CallNetworkException.java b/haystack-core/src/main/java/org/projecthaystack/client/CallNetworkException.java
similarity index 100%
rename from src/main/java/org/projecthaystack/client/CallNetworkException.java
rename to haystack-core/src/main/java/org/projecthaystack/client/CallNetworkException.java
diff --git a/src/main/java/org/projecthaystack/client/HClient.java b/haystack-core/src/main/java/org/projecthaystack/client/HClient.java
similarity index 100%
rename from src/main/java/org/projecthaystack/client/HClient.java
rename to haystack-core/src/main/java/org/projecthaystack/client/HClient.java
diff --git a/src/main/java/org/projecthaystack/io/HCsvWriter.java b/haystack-core/src/main/java/org/projecthaystack/io/HCsvWriter.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HCsvWriter.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HCsvWriter.java
diff --git a/src/main/java/org/projecthaystack/io/HGridFormat.java b/haystack-core/src/main/java/org/projecthaystack/io/HGridFormat.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HGridFormat.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HGridFormat.java
diff --git a/src/main/java/org/projecthaystack/io/HGridReader.java b/haystack-core/src/main/java/org/projecthaystack/io/HGridReader.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HGridReader.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HGridReader.java
diff --git a/src/main/java/org/projecthaystack/io/HGridWriter.java b/haystack-core/src/main/java/org/projecthaystack/io/HGridWriter.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HGridWriter.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HGridWriter.java
diff --git a/src/main/java/org/projecthaystack/io/HJsonWriter.java b/haystack-core/src/main/java/org/projecthaystack/io/HJsonWriter.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HJsonWriter.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HJsonWriter.java
diff --git a/src/main/java/org/projecthaystack/io/HZincReader.java b/haystack-core/src/main/java/org/projecthaystack/io/HZincReader.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HZincReader.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HZincReader.java
diff --git a/src/main/java/org/projecthaystack/io/HZincWriter.java b/haystack-core/src/main/java/org/projecthaystack/io/HZincWriter.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HZincWriter.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HZincWriter.java
diff --git a/src/main/java/org/projecthaystack/io/HaystackToken.java b/haystack-core/src/main/java/org/projecthaystack/io/HaystackToken.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HaystackToken.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HaystackToken.java
diff --git a/src/main/java/org/projecthaystack/io/HaystackTokenizer.java b/haystack-core/src/main/java/org/projecthaystack/io/HaystackTokenizer.java
similarity index 100%
rename from src/main/java/org/projecthaystack/io/HaystackTokenizer.java
rename to haystack-core/src/main/java/org/projecthaystack/io/HaystackTokenizer.java
diff --git a/src/main/java/org/projecthaystack/util/Base64.java b/haystack-core/src/main/java/org/projecthaystack/util/Base64.java
similarity index 100%
rename from src/main/java/org/projecthaystack/util/Base64.java
rename to haystack-core/src/main/java/org/projecthaystack/util/Base64.java
diff --git a/src/main/java/org/projecthaystack/util/CryptoUtil.java b/haystack-core/src/main/java/org/projecthaystack/util/CryptoUtil.java
similarity index 100%
rename from src/main/java/org/projecthaystack/util/CryptoUtil.java
rename to haystack-core/src/main/java/org/projecthaystack/util/CryptoUtil.java
diff --git a/src/main/java/org/projecthaystack/util/WebUtil.java b/haystack-core/src/main/java/org/projecthaystack/util/WebUtil.java
similarity index 100%
rename from src/main/java/org/projecthaystack/util/WebUtil.java
rename to haystack-core/src/main/java/org/projecthaystack/util/WebUtil.java
diff --git a/src/test/java/org/projecthaystack/HBinTest.java b/haystack-core/src/test/java/org/projecthaystack/HBinTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HBinTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HBinTest.java
diff --git a/src/test/java/org/projecthaystack/HBoolTest.java b/haystack-core/src/test/java/org/projecthaystack/HBoolTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HBoolTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HBoolTest.java
diff --git a/src/test/java/org/projecthaystack/HCoordTest.java b/haystack-core/src/test/java/org/projecthaystack/HCoordTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HCoordTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HCoordTest.java
diff --git a/src/test/java/org/projecthaystack/HDateTest.java b/haystack-core/src/test/java/org/projecthaystack/HDateTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HDateTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HDateTest.java
diff --git a/src/test/java/org/projecthaystack/HDateTimeRangeTest.java b/haystack-core/src/test/java/org/projecthaystack/HDateTimeRangeTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HDateTimeRangeTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HDateTimeRangeTest.java
diff --git a/src/test/java/org/projecthaystack/HDateTimeTest.java b/haystack-core/src/test/java/org/projecthaystack/HDateTimeTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HDateTimeTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HDateTimeTest.java
diff --git a/src/test/java/org/projecthaystack/HDictTest.java b/haystack-core/src/test/java/org/projecthaystack/HDictTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HDictTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HDictTest.java
diff --git a/src/test/java/org/projecthaystack/HFilterTest.java b/haystack-core/src/test/java/org/projecthaystack/HFilterTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HFilterTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HFilterTest.java
diff --git a/src/test/java/org/projecthaystack/HGridTest.java b/haystack-core/src/test/java/org/projecthaystack/HGridTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HGridTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HGridTest.java
diff --git a/src/test/java/org/projecthaystack/HListTest.java b/haystack-core/src/test/java/org/projecthaystack/HListTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HListTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HListTest.java
diff --git a/src/test/java/org/projecthaystack/HMarkerTest.java b/haystack-core/src/test/java/org/projecthaystack/HMarkerTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HMarkerTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HMarkerTest.java
diff --git a/src/test/java/org/projecthaystack/HNumTest.java b/haystack-core/src/test/java/org/projecthaystack/HNumTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HNumTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HNumTest.java
diff --git a/src/test/java/org/projecthaystack/HRefTest.java b/haystack-core/src/test/java/org/projecthaystack/HRefTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HRefTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HRefTest.java
diff --git a/src/test/java/org/projecthaystack/HStrTest.java b/haystack-core/src/test/java/org/projecthaystack/HStrTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HStrTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HStrTest.java
diff --git a/src/test/java/org/projecthaystack/HTimeTest.java b/haystack-core/src/test/java/org/projecthaystack/HTimeTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HTimeTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HTimeTest.java
diff --git a/src/test/java/org/projecthaystack/HTzTest.java b/haystack-core/src/test/java/org/projecthaystack/HTzTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HTzTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HTzTest.java
diff --git a/src/test/java/org/projecthaystack/HUriTest.java b/haystack-core/src/test/java/org/projecthaystack/HUriTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HUriTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HUriTest.java
diff --git a/src/test/java/org/projecthaystack/HValTest.java b/haystack-core/src/test/java/org/projecthaystack/HValTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HValTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HValTest.java
diff --git a/src/test/java/org/projecthaystack/HaystackTest.java b/haystack-core/src/test/java/org/projecthaystack/HaystackTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/HaystackTest.java
rename to haystack-core/src/test/java/org/projecthaystack/HaystackTest.java
diff --git a/src/test/java/org/projecthaystack/auth/AuthMsgTest.java b/haystack-core/src/test/java/org/projecthaystack/auth/AuthMsgTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/auth/AuthMsgTest.java
rename to haystack-core/src/test/java/org/projecthaystack/auth/AuthMsgTest.java
diff --git a/src/test/java/org/projecthaystack/client/ClientTest.java b/haystack-core/src/test/java/org/projecthaystack/client/ClientTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/client/ClientTest.java
rename to haystack-core/src/test/java/org/projecthaystack/client/ClientTest.java
diff --git a/src/test/java/org/projecthaystack/io/JsonTest.java b/haystack-core/src/test/java/org/projecthaystack/io/JsonTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/io/JsonTest.java
rename to haystack-core/src/test/java/org/projecthaystack/io/JsonTest.java
diff --git a/src/test/java/org/projecthaystack/io/TokenizerTest.java b/haystack-core/src/test/java/org/projecthaystack/io/TokenizerTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/io/TokenizerTest.java
rename to haystack-core/src/test/java/org/projecthaystack/io/TokenizerTest.java
diff --git a/src/test/java/org/projecthaystack/io/ZincGridTest.java b/haystack-core/src/test/java/org/projecthaystack/io/ZincGridTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/io/ZincGridTest.java
rename to haystack-core/src/test/java/org/projecthaystack/io/ZincGridTest.java
diff --git a/src/test/java/org/projecthaystack/util/UtilTest.java b/haystack-core/src/test/java/org/projecthaystack/util/UtilTest.java
similarity index 100%
rename from src/test/java/org/projecthaystack/util/UtilTest.java
rename to haystack-core/src/test/java/org/projecthaystack/util/UtilTest.java
diff --git a/src/main/java/org/projecthaystack/server/HOp.java b/haystack-server/src/main/java/org/projecthaystack/server/HOp.java
similarity index 100%
rename from src/main/java/org/projecthaystack/server/HOp.java
rename to haystack-server/src/main/java/org/projecthaystack/server/HOp.java
diff --git a/src/main/java/org/projecthaystack/server/HServer.java b/haystack-server/src/main/java/org/projecthaystack/server/HServer.java
similarity index 100%
rename from src/main/java/org/projecthaystack/server/HServer.java
rename to haystack-server/src/main/java/org/projecthaystack/server/HServer.java
diff --git a/src/main/java/org/projecthaystack/server/HServlet.java b/haystack-server/src/main/java/org/projecthaystack/server/HServlet.java
similarity index 100%
rename from src/main/java/org/projecthaystack/server/HServlet.java
rename to haystack-server/src/main/java/org/projecthaystack/server/HServlet.java
diff --git a/src/main/java/org/projecthaystack/server/HStdOps.java b/haystack-server/src/main/java/org/projecthaystack/server/HStdOps.java
similarity index 100%
rename from src/main/java/org/projecthaystack/server/HStdOps.java
rename to haystack-server/src/main/java/org/projecthaystack/server/HStdOps.java
diff --git a/src/main/java/org/projecthaystack/server/TestDatabase.java b/haystack-server/src/main/java/org/projecthaystack/server/TestDatabase.java
similarity index 100%
rename from src/main/java/org/projecthaystack/server/TestDatabase.java
rename to haystack-server/src/main/java/org/projecthaystack/server/TestDatabase.java
diff --git a/settings.gradle b/settings.gradle
index adb1723..9bc3d0d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,11 +9,6 @@
  * in the user guide at https://docs.gradle.org/2.13/userguide/multi_project_builds.html
  */
 
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
 rootProject.name = 'haystack-java'
+include 'haystack-core'
+include 'haystack-server'
diff --git a/src/build.fan b/src/build.fan
deleted file mode 100755
index 5ed7322..0000000
--- a/src/build.fan
+++ /dev/null
@@ -1,124 +0,0 @@
-#! /usr/bin/env fansubstitute
-
-using build
-using fandoc
-
-
-**
-** Fantom build script for "haystack.jar"
-** See `http://fantom.org/`
-**
-class Build : BuildJava
-{
-
-  new make()
-  {
-    baseDir = scriptDir.parent
-    jar = baseDir.uri + `haystack.jar`
-    cp  = [baseDir.uri + `lib/servlet.jar`]
-    mainClass = "org.projecthaystack.test.Test"
-    packages = ["org.projecthaystack",
-                "org.projecthaystack.io",
-                "org.projecthaystack.client",
-                "org.projecthaystack.server",
-                "org.projecthaystack.test",
-                "org.projecthaystack.util"]
-  }
-
-  const File baseDir
-
-  @Target { help = "clean up files we don't want to zip" }
-  Void cleanup()
-  {
-    Delete(this, baseDir +`haystack.jar`).run
-    Delete(this, scriptDir +`temp/`).run
-  }
-
-  @Target { help = "compile index.fandoc into index.html" }
-  Void doc()
-  {
-    inFile  := baseDir + `index.fandoc`
-    outFile := baseDir + `index.html`
-    doc := FandocParser().parse("index.fandoc", inFile.in)
-    w := HtmlDocWriter(outFile.out)
-
-    // header
-    w.out.print(
-     Str<|<html>
-          <head>
-          <title>Haystack Java Toolkit</title>
-          <style type="text/css">
-          <!--
-          body {
-            background: #ffffff;
-          }
-
-          h1 {
-            color: #000;
-            background: #eee;
-            border-bottom: 1px solid black;
-            padding-left: 5px;
-            font-size: 18pt;
-          }
-
-          h1.title {
-            color: #144b7a;
-            background: none;
-            font-size: 24pt;
-            border: none;
-          }
-
-          h2 {
-            font-size: 16pt;
-            padding-left: 0.5em;
-            width: 40%;
-          }
-
-          h3, h4, h5, h6
-          {
-            font-size: 14pt;
-            padding-left: 0.5em;
-          }
-
-          p {
-            padding-left: 10px;
-            padding-right: 10px;
-          }
-
-          pre {
-            font-family: monospace;
-            padding-left: 4em;
-            color: #008000;
-          }
-
-          ul { padding-left: 2em; }
-          ol {   padding-left: 2em; }
-          li {   margin: 0.3em; }
-          table { padding-left: 3em; }
-          -->
-          </style>
-          </head>
-          <body>
-
-          <!-- Title Block -->
-          <h1 class='title'>Haystack Java Toolkit</h1>|>)
-
-    // body
-    doc.children.each |elem| { elem.write(w) }
-
-    // footer
-    w.out.print("</body></html>")
-    w.out.close
-  }
-
-  @Target { help = "generate javadoc" }
-  Void javadoc()
-  {
-    exe := configDir("jdkHome") + `bin/javadoc`
-    cmd := [Exec.exePath(exe), "-d", "doc", "-classpath", scriptDir.osPath]
-    docPackages := packages.dup { remove("org.projecthaystack.test") }
-    cmd.addAll(docPackages)
-    Exec(this, cmd, baseDir).run
-  }
-
-}
\ No newline at end of file