diff --git a/docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java b/docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java
index 3f5c22728..b3e388d7f 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.docsys;
 
-import io.nosqlbench.docsys.api.Docs;
-import io.nosqlbench.docsys.api.DocsBinder;
+import io.nosqlbench.docapi.Docs;
+import io.nosqlbench.docapi.DocsBinder;
 import io.nosqlbench.docsys.api.DocsysStaticManifest;
 
 //@Service(DocsysStaticManifest.class)
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java b/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
index 8278054bf..d70a7cd65 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
@@ -1,5 +1,6 @@
 package io.nosqlbench.docsys.api;
 
+import io.nosqlbench.docapi.DocsBinder;
 import io.nosqlbench.docsys.endpoints.DocsysMarkdownEndpoint;
 
 /**
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java b/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java
index e85b6b29e..a24be8600 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java
@@ -1,5 +1,7 @@
 package io.nosqlbench.docsys.api;
 
+import io.nosqlbench.docapi.DocsBinder;
+
 /**
  * At runtime, any instances of this service will be used to find
  * paths to be hosted as static content.
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java b/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java
index bdac0b685..2aef8d1e7 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java
@@ -1,6 +1,8 @@
 package io.nosqlbench.docsys.core;
 
-import io.nosqlbench.docsys.api.*;
+import io.nosqlbench.docapi.*;
+import io.nosqlbench.docsys.api.DocsysDynamicManifest;
+import io.nosqlbench.docsys.api.DocsysStaticManifest;
 
 import java.util.ServiceLoader;
 
@@ -29,4 +31,6 @@ public class DocsysPathLoader {
         }
         return docs;
     }
+
+
 }
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java b/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java
index f3d49e4e4..f2e11e17a 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.docsys.core;
 
 import io.nosqlbench.docsys.DocsysDefaultAppPath;
-import io.nosqlbench.docsys.api.Docs;
+import io.nosqlbench.docapi.Docs;
 import io.nosqlbench.docsys.api.WebServiceObject;
 import io.nosqlbench.docsys.handlers.FavIconHandler;
 import io.nosqlbench.nb.annotations.Maturity;
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java
index 3efb87d4b..a432062b2 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java
@@ -1,8 +1,8 @@
 package io.nosqlbench.docsys.endpoints;
 
-import io.nosqlbench.docsys.api.Docs;
-import io.nosqlbench.docsys.api.DocsBinder;
-import io.nosqlbench.docsys.api.DocsNameSpace;
+import io.nosqlbench.docapi.Docs;
+import io.nosqlbench.docapi.DocsBinder;
+import io.nosqlbench.docapi.DocsNameSpace;
 import io.nosqlbench.docsys.api.WebServiceObject;
 import io.nosqlbench.docsys.core.DocsysPathLoader;
 import io.nosqlbench.docsys.core.PathWalker;
diff --git a/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java b/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java
index 716144c30..9dccc3fd5 100644
--- a/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java
+++ b/engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.engine.docs;
 
-import io.nosqlbench.docsys.api.Docs;
-import io.nosqlbench.docsys.api.DocsBinder;
+import io.nosqlbench.docapi.Docs;
+import io.nosqlbench.docapi.DocsBinder;
 import io.nosqlbench.docsys.api.DocsysDynamicManifest;
 import io.nosqlbench.nb.annotations.Service;
 
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsBinder.java b/nb-api/src/main/java/io/nosqlbench/docapi/DocsBinder.java
similarity index 98%
rename from docsys/src/main/java/io/nosqlbench/docsys/api/DocsBinder.java
rename to nb-api/src/main/java/io/nosqlbench/docapi/DocsBinder.java
index 7b57d15a7..9b32c7d69 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsBinder.java
+++ b/nb-api/src/main/java/io/nosqlbench/docapi/DocsBinder.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.docsys.api;
+package io.nosqlbench.docapi;
 
 import java.nio.file.Path;
 import java.util.List;
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsNameSpace.java b/nb-api/src/main/java/io/nosqlbench/docapi/DocsNameSpace.java
similarity index 96%
rename from docsys/src/main/java/io/nosqlbench/docsys/api/DocsNameSpace.java
rename to nb-api/src/main/java/io/nosqlbench/docapi/DocsNameSpace.java
index 86bdcf7d0..33174bed9 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsNameSpace.java
+++ b/nb-api/src/main/java/io/nosqlbench/docapi/DocsNameSpace.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.docsys.api;
+package io.nosqlbench.docapi;
 
 import java.nio.file.Path;
 import java.util.List;
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsNameSpaceImpl.java b/nb-api/src/main/java/io/nosqlbench/docapi/DocsNameSpaceImpl.java
similarity index 94%
rename from docsys/src/main/java/io/nosqlbench/docsys/api/DocsNameSpaceImpl.java
rename to nb-api/src/main/java/io/nosqlbench/docapi/DocsNameSpaceImpl.java
index 6f499fbe4..c477ba4c6 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsNameSpaceImpl.java
+++ b/nb-api/src/main/java/io/nosqlbench/docapi/DocsNameSpaceImpl.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.docsys.api;
+package io.nosqlbench.docapi;
 
 import java.nio.file.Path;
 import java.util.*;
@@ -42,7 +42,7 @@ public class DocsNameSpaceImpl implements DocsNameSpace {
     public String toString() {
         return "DocPath{" +
                 "namespace='" + namespace + '\'' +
-                ",paths=" + paths.toString() +
+                ",paths=" + paths +
                 '}';
     }
 
diff --git a/docsys/src/test/resources/testsite1/basic1.md b/nb-api/src/test/resources/testsite1/basic1.md
similarity index 100%
rename from docsys/src/test/resources/testsite1/basic1.md
rename to nb-api/src/test/resources/testsite1/basic1.md
diff --git a/docsys/src/test/resources/testsite1/basics/section1/topic1.md b/nb-api/src/test/resources/testsite1/basics/section1/topic1.md
similarity index 100%
rename from docsys/src/test/resources/testsite1/basics/section1/topic1.md
rename to nb-api/src/test/resources/testsite1/basics/section1/topic1.md
diff --git a/docsys/src/test/resources/testsite1/basics/section2/section2topic1.md b/nb-api/src/test/resources/testsite1/basics/section2/section2topic1.md
similarity index 100%
rename from docsys/src/test/resources/testsite1/basics/section2/section2topic1.md
rename to nb-api/src/test/resources/testsite1/basics/section2/section2topic1.md
diff --git a/docsys/src/test/resources/testsite1/favicon.ico b/nb-api/src/test/resources/testsite1/favicon.ico
similarity index 100%
rename from docsys/src/test/resources/testsite1/favicon.ico
rename to nb-api/src/test/resources/testsite1/favicon.ico
diff --git a/docsys/src/test/resources/testsite1/simple.html b/nb-api/src/test/resources/testsite1/simple.html
similarity index 100%
rename from docsys/src/test/resources/testsite1/simple.html
rename to nb-api/src/test/resources/testsite1/simple.html
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java
index 3df10068f..d43af1395 100644
--- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java
+++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java
@@ -1,7 +1,7 @@
 package io.nosqlbench.virtdata.userlibs.docinfo;
 
-import io.nosqlbench.docsys.api.Docs;
-import io.nosqlbench.docsys.api.DocsBinder;
+import io.nosqlbench.docapi.Docs;
+import io.nosqlbench.docapi.DocsBinder;
 import io.nosqlbench.docsys.api.DocsysDynamicManifest;
 import io.nosqlbench.nb.annotations.Service;