diff --git a/avaje-jex/src/main/java/io/avaje/jex/DJex.java b/avaje-jex/src/main/java/io/avaje/jex/DJex.java
index a5bf11dc..af6c52d6 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/DJex.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/DJex.java
@@ -2,9 +2,8 @@
 
 import io.avaje.inject.BeanScope;
 import io.avaje.jex.core.CoreServiceLoader;
-import io.avaje.jex.core.CoreServiceManager;
 import io.avaje.jex.core.HealthPlugin;
-import io.avaje.jex.jdk.JdkServerStart;
+import io.avaje.jex.core.JdkServerStart;
 import io.avaje.jex.routes.RoutesBuilder;
 import io.avaje.jex.routes.SpiRoutes;
 import io.avaje.jex.spi.*;
@@ -121,6 +120,6 @@ public Server start() {
         new RoutesBuilder(routing, config.ignoreTrailingSlashes())
             .build();
 
-    return new JdkServerStart().start(this, routes, CoreServiceManager.create(this));
+    return new JdkServerStart().start(this, routes);
   }
 }
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/BaseFilterChain.java b/avaje-jex/src/main/java/io/avaje/jex/core/BaseFilterChain.java
similarity index 96%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/BaseFilterChain.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/BaseFilterChain.java
index 88efe66f..d023b8cc 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/BaseFilterChain.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/BaseFilterChain.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/BufferedOutStream.java b/avaje-jex/src/main/java/io/avaje/jex/core/BufferedOutStream.java
similarity index 98%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/BufferedOutStream.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/BufferedOutStream.java
index 47b1c601..3d0482eb 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/BufferedOutStream.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/BufferedOutStream.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/CookieParser.java b/avaje-jex/src/main/java/io/avaje/jex/core/CookieParser.java
similarity index 99%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/CookieParser.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/CookieParser.java
index aa2e3bdd..861654bf 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/CookieParser.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/CookieParser.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceManager.java b/avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceManager.java
index 1ef59b1d..db25a195 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceManager.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceManager.java
@@ -20,24 +20,23 @@
 import io.avaje.jex.Routing;
 import io.avaje.jex.core.json.JacksonJsonService;
 import io.avaje.jex.core.json.JsonbJsonService;
-import io.avaje.jex.jdk.JdkContext;
 import io.avaje.jex.spi.JsonService;
 import io.avaje.jex.spi.TemplateRender;
 
 /**
  * Core implementation of SpiServiceManager provided to specific implementations like jetty etc.
  */
-public final class CoreServiceManager implements SpiServiceManager {
+final class CoreServiceManager implements SpiServiceManager {
 
   private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
-  public static final String UTF_8 = "UTF-8";
+  static final String UTF_8 = "UTF-8";
 
   private final HttpMethodMap methodMap = new HttpMethodMap();
   private final JsonService jsonService;
   private final ExceptionManager exceptionHandler;
   private final TemplateManager templateManager;
 
-  public static SpiServiceManager create(Jex jex) {
+  static SpiServiceManager create(Jex jex) {
     return new Builder(jex).build();
   }
 
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/CtxServiceManager.java b/avaje-jex/src/main/java/io/avaje/jex/core/CtxServiceManager.java
similarity index 93%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/CtxServiceManager.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/CtxServiceManager.java
index ce74f049..1f9666d5 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/CtxServiceManager.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/CtxServiceManager.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -9,9 +9,8 @@
 
 import io.avaje.jex.Context;
 import io.avaje.jex.Routing;
-import io.avaje.jex.core.SpiServiceManager;
 
-public final class CtxServiceManager implements SpiServiceManager {
+final class CtxServiceManager implements SpiServiceManager {
 
   private final String scheme;
   private final String contextPath;
diff --git a/avaje-jex/src/main/java/io/avaje/jex/core/ExceptionManager.java b/avaje-jex/src/main/java/io/avaje/jex/core/ExceptionManager.java
index fa956fe7..cf2ba174 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/core/ExceptionManager.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/ExceptionManager.java
@@ -10,7 +10,6 @@
 import io.avaje.jex.http.ErrorCode;
 import io.avaje.jex.http.HttpResponseException;
 import io.avaje.jex.http.InternalServerErrorException;
-import io.avaje.jex.jdk.JdkContext;
 
 public final class ExceptionManager {
 
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/JdkContext.java b/avaje-jex/src/main/java/io/avaje/jex/core/JdkContext.java
similarity index 99%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/JdkContext.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/JdkContext.java
index c0ffe37d..e8e185d0 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/JdkContext.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/JdkContext.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import static io.avaje.jex.core.Constants.APPLICATION_JSON;
 import static io.avaje.jex.core.Constants.APPLICATION_X_JSON_STREAM;
@@ -31,13 +31,12 @@
 import io.avaje.jex.Context;
 import io.avaje.jex.compression.CompressedOutputStream;
 import io.avaje.jex.compression.CompressionConfig;
-import io.avaje.jex.core.Constants;
 import io.avaje.jex.http.ErrorCode;
 import io.avaje.jex.http.RedirectException;
 import io.avaje.jex.security.BasicAuthCredentials;
 import io.avaje.jex.security.Role;
 
-public final class JdkContext implements Context {
+final class JdkContext implements Context {
 
   private static final String UTF8 = "UTF8";
   private static final int SC_MOVED_TEMPORARILY = 302;
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/JdkJexServer.java b/avaje-jex/src/main/java/io/avaje/jex/core/JdkJexServer.java
similarity index 97%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/JdkJexServer.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/JdkJexServer.java
index 32de4f62..03f01c9c 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/JdkJexServer.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/JdkJexServer.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import com.sun.net.httpserver.HttpServer;
 import io.avaje.applog.AppLog;
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/JdkServerStart.java b/avaje-jex/src/main/java/io/avaje/jex/core/JdkServerStart.java
similarity index 92%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/JdkServerStart.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/JdkServerStart.java
index 9af850fd..3f9cf92e 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/JdkServerStart.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/JdkServerStart.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -13,7 +13,6 @@
 import io.avaje.jex.AppLifecycle;
 import io.avaje.jex.Jex;
 import io.avaje.jex.JexConfig;
-import io.avaje.jex.core.SpiServiceManager;
 import io.avaje.jex.routes.SpiRoutes;
 
 import static java.lang.System.Logger.Level.INFO;
@@ -22,7 +21,8 @@ public final class JdkServerStart {
 
   private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
 
-  public Jex.Server start(Jex jex, SpiRoutes routes, SpiServiceManager serviceManager) {
+  public Jex.Server start(Jex jex, SpiRoutes routes) {
+    SpiServiceManager serviceManager = CoreServiceManager.create(jex);
     try {
       final var config = jex.config();
       final var socketAddress = createSocketAddress(config);
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/Mode.java b/avaje-jex/src/main/java/io/avaje/jex/core/Mode.java
similarity index 73%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/Mode.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/Mode.java
index bd0e6fd5..1b242a40 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/Mode.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/Mode.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 /** status of the request */
 enum Mode {
diff --git a/avaje-jex/src/main/java/io/avaje/jex/jdk/RoutingHandler.java b/avaje-jex/src/main/java/io/avaje/jex/core/RoutingHandler.java
similarity index 96%
rename from avaje-jex/src/main/java/io/avaje/jex/jdk/RoutingHandler.java
rename to avaje-jex/src/main/java/io/avaje/jex/core/RoutingHandler.java
index ce48e1e3..17f0c447 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/jdk/RoutingHandler.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/RoutingHandler.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.IOException;
 import java.util.List;
@@ -14,7 +14,7 @@
 import io.avaje.jex.http.NotFoundException;
 import io.avaje.jex.routes.SpiRoutes;
 
-public final class RoutingHandler implements HttpHandler {
+final class RoutingHandler implements HttpHandler {
 
   private final SpiRoutes routes;
   private final CtxServiceManager mgr;
diff --git a/avaje-jex/src/main/java/io/avaje/jex/core/SpiServiceManager.java b/avaje-jex/src/main/java/io/avaje/jex/core/SpiServiceManager.java
index ab60303b..c244adaf 100644
--- a/avaje-jex/src/main/java/io/avaje/jex/core/SpiServiceManager.java
+++ b/avaje-jex/src/main/java/io/avaje/jex/core/SpiServiceManager.java
@@ -9,8 +9,6 @@
 
 import io.avaje.jex.Context;
 import io.avaje.jex.Routing;
-import io.avaje.jex.jdk.CtxServiceManager;
-import io.avaje.jex.jdk.JdkContext;
 
 /**
  * Core service methods available to Context implementations.
diff --git a/avaje-jex/src/test/java/io/avaje/jex/StaticFileTest.java b/avaje-jex/src/test/java/io/avaje/jex/StaticFileTest.java
index e470ad66..08c9918d 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/StaticFileTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/StaticFileTest.java
@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.avaje.jex.StaticContentConfig.ResourceLocation;
-import io.avaje.jex.jdk.TestPair;
+import io.avaje.jex.core.TestPair;
 
 class StaticFileTest {
 
diff --git a/avaje-jex/src/test/java/io/avaje/jex/compression/CompressionTest.java b/avaje-jex/src/test/java/io/avaje/jex/compression/CompressionTest.java
index ac9ab042..fb6b3c1b 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/compression/CompressionTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/compression/CompressionTest.java
@@ -10,7 +10,7 @@
 import io.avaje.jex.Jex;
 import io.avaje.jex.StaticContentConfig.ResourceLocation;
 import io.avaje.jex.core.Constants;
-import io.avaje.jex.jdk.TestPair;
+import io.avaje.jex.core.TestPair;
 
 class CompressionTest {
 
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/AutoCloseIterator.java b/avaje-jex/src/test/java/io/avaje/jex/core/AutoCloseIterator.java
similarity index 95%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/AutoCloseIterator.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/AutoCloseIterator.java
index 74541670..6df2bd9e 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/AutoCloseIterator.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/AutoCloseIterator.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/CharacterEncodingTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/CharacterEncodingTest.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/CharacterEncodingTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/CharacterEncodingTest.java
index 3d0f7dcb..5ed62058 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/CharacterEncodingTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/CharacterEncodingTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/ContextAttributeTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/ContextAttributeTest.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/ContextAttributeTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/ContextAttributeTest.java
index aad420d9..899c9f02 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/ContextAttributeTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/ContextAttributeTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/ContextFormParamTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/ContextFormParamTest.java
similarity index 99%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/ContextFormParamTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/ContextFormParamTest.java
index 6ca5e2c0..c438ddaa 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/ContextFormParamTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/ContextFormParamTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/ContextLengthTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/ContextLengthTest.java
similarity index 99%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/ContextLengthTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/ContextLengthTest.java
index 3aa92d11..a12b0998 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/ContextLengthTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/ContextLengthTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/ContextTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/ContextTest.java
similarity index 99%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/ContextTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/ContextTest.java
index a1619978..35912af2 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/ContextTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/ContextTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/CookieParserTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/CookieParserTest.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/CookieParserTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/CookieParserTest.java
index 46649180..a63c57ef 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/CookieParserTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/CookieParserTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/CookieServerTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/CookieServerTest.java
similarity index 99%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/CookieServerTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/CookieServerTest.java
index 20a4610f..b81746c1 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/CookieServerTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/CookieServerTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Context;
 import io.avaje.jex.Jex;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/ExceptionManagerTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/ExceptionManagerTest.java
similarity index 99%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/ExceptionManagerTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/ExceptionManagerTest.java
index e2a2a08c..e555fe6e 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/ExceptionManagerTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/ExceptionManagerTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import io.avaje.jex.http.ErrorCode;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/FilterTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/FilterTest.java
similarity index 99%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/FilterTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/FilterTest.java
index 5d7823fc..95826c40 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/FilterTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/FilterTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/HeadersTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/HeadersTest.java
similarity index 97%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/HeadersTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/HeadersTest.java
index 263452e9..2fb8e75d 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/HeadersTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/HeadersTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.http.client.HttpClient;
 import io.avaje.http.client.JacksonBodyAdapter;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/HealthPluginOffTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/HealthPluginOffTest.java
similarity index 97%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/HealthPluginOffTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/HealthPluginOffTest.java
index 2b1612aa..e8c51345 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/HealthPluginOffTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/HealthPluginOffTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/HealthPluginTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/HealthPluginTest.java
similarity index 99%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/HealthPluginTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/HealthPluginTest.java
index 4dcbb4d5..fb0438e4 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/HealthPluginTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/HealthPluginTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.http.client.HttpClient;
 import io.avaje.http.client.JacksonBodyAdapter;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/HelloBean.java b/avaje-jex/src/test/java/io/avaje/jex/core/HelloBean.java
similarity index 87%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/HelloBean.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/HelloBean.java
index a89d5f57..327263c2 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/HelloBean.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/HelloBean.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 public class HelloBean {
 
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/HelloDto.java b/avaje-jex/src/test/java/io/avaje/jex/core/HelloDto.java
similarity index 94%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/HelloDto.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/HelloDto.java
index a352e742..5cc0ea98 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/HelloDto.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/HelloDto.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jsonb.Json;
 
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/JdkJexServerTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/JdkJexServerTest.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/JdkJexServerTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/JdkJexServerTest.java
index d13b5401..9910e196 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/JdkJexServerTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/JdkJexServerTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/JsonTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/JsonTest.java
similarity index 99%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/JsonTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/JsonTest.java
index a7fc591a..c3a88646 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/JsonTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/JsonTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/Main.java b/avaje-jex/src/test/java/io/avaje/jex/core/Main.java
similarity index 78%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/Main.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/Main.java
index dbdb29b3..62c8da9a 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/Main.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/Main.java
@@ -1,7 +1,6 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
-import io.avaje.jex.core.HealthPlugin;
 
 public class Main {
 
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/MultiHandlerTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/MultiHandlerTest.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/MultiHandlerTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/MultiHandlerTest.java
index 3ac050e0..a5d627bd 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/MultiHandlerTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/MultiHandlerTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/NestedRoutesTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/NestedRoutesTest.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/NestedRoutesTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/NestedRoutesTest.java
index 84630d92..b234a350 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/NestedRoutesTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/NestedRoutesTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/QueryParamTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/QueryParamTest.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/QueryParamTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/QueryParamTest.java
index 64e7ed13..442d09a7 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/QueryParamTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/QueryParamTest.java
@@ -1,12 +1,10 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 
 import java.net.http.HttpResponse;
-import java.util.Map;
-import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/RedirectTest.java b/avaje-jex/src/test/java/io/avaje/jex/core/RedirectTest.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/RedirectTest.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/RedirectTest.java
index 0ad09b81..dc5756ad 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/RedirectTest.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/RedirectTest.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
diff --git a/avaje-jex/src/test/java/io/avaje/jex/jdk/TestPair.java b/avaje-jex/src/test/java/io/avaje/jex/core/TestPair.java
similarity index 98%
rename from avaje-jex/src/test/java/io/avaje/jex/jdk/TestPair.java
rename to avaje-jex/src/test/java/io/avaje/jex/core/TestPair.java
index 3b9171f4..b53288c0 100644
--- a/avaje-jex/src/test/java/io/avaje/jex/jdk/TestPair.java
+++ b/avaje-jex/src/test/java/io/avaje/jex/core/TestPair.java
@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.http.client.HttpClient;
 import io.avaje.http.client.HttpClientRequest;
diff --git a/examples/example-jdk-jsonb/README.md b/examples/example-jdk-jsonb/README.md
index fe4f1219..ba42f2ea 100644
--- a/examples/example-jdk-jsonb/README.md
+++ b/examples/example-jdk-jsonb/README.md
@@ -15,7 +15,7 @@ To Run:
 ./target/mytest
 
 # produces
-# Oct 21, 2022 1:39:36 PM io.avaje.jex.jdk.JdkServerStart start
+# Oct 21, 2022 1:39:36 PM io.avaje.jex.core.JdkServerStart start
 # INFO: started server on port 7003 version 2.5-SNAPSHOT
 ```