diff --git a/webserver/http-webserver/src/test/devServerTest/controllerChange/DevController.java b/webserver/http-webserver/src/test/devServerTest/controllerChange/DevController.java
index fd4ec982d..4ec60dfc1 100644
--- a/webserver/http-webserver/src/test/devServerTest/controllerChange/DevController.java
+++ b/webserver/http-webserver/src/test/devServerTest/controllerChange/DevController.java
@@ -2,8 +2,10 @@
 
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
+import javax.inject.Singleton;
+
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
 
 @Singleton
 public class DevController {
diff --git a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevController.java b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevController.java
index e3ba4decb..7a370aff7 100644
--- a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevController.java
+++ b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevController.java
@@ -2,8 +2,8 @@
 
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
 
 @Singleton
 public class DevController {
diff --git a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevMeta.java b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevMeta.java
index 0c035aba4..417a0bfd8 100644
--- a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevMeta.java
+++ b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevMeta.java
@@ -3,9 +3,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.api.routing.WebAppMeta;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
+import org.webpieces.router.api.routes.WebAppMeta;
 import org.webpieces.webserver.EmptyModule;
 
 import com.google.common.collect.Lists;
diff --git a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevRouteId.java b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevRouteId.java
index c68b09819..ee022da38 100644
--- a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevRouteId.java
+++ b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevRouteId.java
@@ -1,6 +1,6 @@
 package org.webpieces.webserver.dev.app;
 
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.routes.RouteId;
 
 public enum DevRouteId implements RouteId {
 	HOME, CAUSE_ERROR, FILTER_ROUTE,
diff --git a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevRoutes.java b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevRoutes.java
index 35f91ef16..4eda72db2 100644
--- a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevRoutes.java
+++ b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/DevRoutes.java
@@ -1,12 +1,12 @@
 package org.webpieces.webserver.dev.app;
 
 import static org.webpieces.ctx.api.HttpMethod.GET;
-import static org.webpieces.router.api.routing.Port.BOTH;
+import static org.webpieces.router.api.routes.Port.BOTH;
 
-import org.webpieces.router.api.routing.PortType;
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.impl.model.bldr.DomainRouteBuilder;
-import org.webpieces.router.impl.model.bldr.RouteBuilder;
+import org.webpieces.router.api.routebldr.DomainRouteBuilder;
+import org.webpieces.router.api.routebldr.RouteBuilder;
+import org.webpieces.router.api.routes.FilterPortType;
+import org.webpieces.router.api.routes.Routes;
 
 public class DevRoutes implements Routes {
 
@@ -20,9 +20,9 @@ public void configure(DomainRouteBuilder domainBldr) {
 
 		router.addRoute(BOTH, GET , "/filter",             "DevController.filter", DevRouteId.FILTER_ROUTE);
 		
-		router.addFilter("/filter", MyFilter.class, null, PortType.ALL_FILTER);
+		router.addFilter("/filter", MyFilter.class, null, FilterPortType.ALL_FILTER);
 		
-		router.addNotFoundFilter(NotFoundFilter.class, null, PortType.ALL_FILTER);
+		router.addNotFoundFilter(NotFoundFilter.class, null, FilterPortType.ALL_FILTER);
 		
 		router.setPageNotFoundRoute("DevController.notFound");
 		router.setInternalErrorRoute("DevController.internalError");
diff --git a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/MyFilter.java b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/MyFilter.java
index 71bdecada..700677c23 100644
--- a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/MyFilter.java
+++ b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/MyFilter.java
@@ -4,10 +4,10 @@
 
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.dto.MethodMeta;
-import org.webpieces.router.api.routing.RouteFilter;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.routes.RouteFilter;
+import org.webpieces.router.impl.dto.MethodMeta;
 import org.webpieces.util.filters.Service;
 
 @Singleton
diff --git a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/NotFoundFilter.java b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/NotFoundFilter.java
index 0e1c3f8c4..fe6a73a89 100644
--- a/webserver/http-webserver/src/test/devServerTest/devServerOriginal/NotFoundFilter.java
+++ b/webserver/http-webserver/src/test/devServerTest/devServerOriginal/NotFoundFilter.java
@@ -4,10 +4,10 @@
 
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.dto.MethodMeta;
-import org.webpieces.router.api.routing.RouteFilter;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.routes.RouteFilter;
+import org.webpieces.router.impl.dto.MethodMeta;
 import org.webpieces.util.filters.Service;
 
 @Singleton
diff --git a/webserver/http-webserver/src/test/devServerTest/filterChange/MyFilter.java b/webserver/http-webserver/src/test/devServerTest/filterChange/MyFilter.java
index 4b4d6ab55..aa2954865 100644
--- a/webserver/http-webserver/src/test/devServerTest/filterChange/MyFilter.java
+++ b/webserver/http-webserver/src/test/devServerTest/filterChange/MyFilter.java
@@ -4,10 +4,10 @@
 
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.dto.MethodMeta;
-import org.webpieces.router.api.routing.RouteFilter;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.routes.RouteFilter;
+import org.webpieces.router.impl.dto.MethodMeta;
 import org.webpieces.util.filters.Service;
 
 @Singleton
diff --git a/webserver/http-webserver/src/test/devServerTest/guiceModule/DevController.java b/webserver/http-webserver/src/test/devServerTest/guiceModule/DevController.java
index 96dab674c..83b6bfd40 100644
--- a/webserver/http-webserver/src/test/devServerTest/guiceModule/DevController.java
+++ b/webserver/http-webserver/src/test/devServerTest/guiceModule/DevController.java
@@ -3,8 +3,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
 
 @Singleton
 public class DevController {
diff --git a/webserver/http-webserver/src/test/devServerTest/guiceModule/DevMeta.java b/webserver/http-webserver/src/test/devServerTest/guiceModule/DevMeta.java
index b4e9f671b..3d31c9e71 100644
--- a/webserver/http-webserver/src/test/devServerTest/guiceModule/DevMeta.java
+++ b/webserver/http-webserver/src/test/devServerTest/guiceModule/DevMeta.java
@@ -3,9 +3,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.webpieces.router.api.routing.Plugin;
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.api.routing.WebAppMeta;
+import org.webpieces.router.api.plugins.Plugin;
+import org.webpieces.router.api.routes.Routes;
+import org.webpieces.router.api.routes.WebAppMeta;
 import org.webpieces.webserver.EmptyModule;
 
 import com.google.common.collect.Lists;
diff --git a/webserver/http-webserver/src/test/devServerTest/guiceModule/DevRouteId.java b/webserver/http-webserver/src/test/devServerTest/guiceModule/DevRouteId.java
index e27d64988..247f97c3c 100644
--- a/webserver/http-webserver/src/test/devServerTest/guiceModule/DevRouteId.java
+++ b/webserver/http-webserver/src/test/devServerTest/guiceModule/DevRouteId.java
@@ -1,6 +1,6 @@
 package org.webpieces.webserver.dev.app;
 
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.routes.RouteId;
 
 public enum DevRouteId implements RouteId {
 	HOME, CAUSE_ERROR,
diff --git a/webserver/http-webserver/src/test/devServerTest/guiceModule/DevRoutes.java b/webserver/http-webserver/src/test/devServerTest/guiceModule/DevRoutes.java
index 8712e9a4f..d2adb15e0 100644
--- a/webserver/http-webserver/src/test/devServerTest/guiceModule/DevRoutes.java
+++ b/webserver/http-webserver/src/test/devServerTest/guiceModule/DevRoutes.java
@@ -1,12 +1,12 @@
 package org.webpieces.webserver.dev.app;
 
 import static org.webpieces.ctx.api.HttpMethod.GET;
+import static org.webpieces.router.api.routes.Port.BOTH;
 
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.impl.model.bldr.DomainRouteBuilder;
-import org.webpieces.router.impl.model.bldr.RouteBuilder;
-
-import static org.webpieces.router.api.routing.Port.BOTH;
+import org.webpieces.router.api.routebldr.DomainRouteBuilder;
+import org.webpieces.router.api.routebldr.RouteBuilder;
+import org.webpieces.router.api.routes.FilterPortType;
+import org.webpieces.router.api.routes.Routes;
 
 public class DevRoutes implements Routes {
 
diff --git a/webserver/http-webserver/src/test/devServerTest/internalError/DevController.java b/webserver/http-webserver/src/test/devServerTest/internalError/DevController.java
index 7953ae3cd..ca2ffdbba 100644
--- a/webserver/http-webserver/src/test/devServerTest/internalError/DevController.java
+++ b/webserver/http-webserver/src/test/devServerTest/internalError/DevController.java
@@ -2,8 +2,8 @@
 
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
 
 @Singleton
 public class DevController {
diff --git a/webserver/http-webserver/src/test/devServerTest/notFound/DevController.java b/webserver/http-webserver/src/test/devServerTest/notFound/DevController.java
index 1873079e9..a675568ba 100644
--- a/webserver/http-webserver/src/test/devServerTest/notFound/DevController.java
+++ b/webserver/http-webserver/src/test/devServerTest/notFound/DevController.java
@@ -2,8 +2,8 @@
 
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
 
 @Singleton
 public class DevController {
diff --git a/webserver/http-webserver/src/test/devServerTest/notFound/NotFoundFilter.java b/webserver/http-webserver/src/test/devServerTest/notFound/NotFoundFilter.java
index 7329233f0..0e599d2c8 100644
--- a/webserver/http-webserver/src/test/devServerTest/notFound/NotFoundFilter.java
+++ b/webserver/http-webserver/src/test/devServerTest/notFound/NotFoundFilter.java
@@ -4,10 +4,10 @@
 
 import javax.inject.Singleton;
 
-import org.webpieces.router.api.actions.Action;
-import org.webpieces.router.api.actions.Actions;
-import org.webpieces.router.api.dto.MethodMeta;
-import org.webpieces.router.api.routing.RouteFilter;
+import org.webpieces.router.api.controller.actions.Action;
+import org.webpieces.router.api.controller.actions.Actions;
+import org.webpieces.router.api.routes.RouteFilter;
+import org.webpieces.router.impl.dto.MethodMeta;
 import org.webpieces.util.filters.Service;
 
 @Singleton
diff --git a/webserver/http-webserver/src/test/devServerTest/routeChange/DevRouteId.java b/webserver/http-webserver/src/test/devServerTest/routeChange/DevRouteId.java
index ce2496743..e3d367cbe 100644
--- a/webserver/http-webserver/src/test/devServerTest/routeChange/DevRouteId.java
+++ b/webserver/http-webserver/src/test/devServerTest/routeChange/DevRouteId.java
@@ -1,6 +1,6 @@
 package org.webpieces.webserver.dev.app;
 
-import org.webpieces.router.api.routing.RouteId;
+import org.webpieces.router.api.routes.RouteId;
 
 public enum DevRouteId implements RouteId {
 	HOME, EXISTING,
diff --git a/webserver/http-webserver/src/test/devServerTest/routeChange/DevRoutes.java b/webserver/http-webserver/src/test/devServerTest/routeChange/DevRoutes.java
index d5740fe9b..301a39140 100644
--- a/webserver/http-webserver/src/test/devServerTest/routeChange/DevRoutes.java
+++ b/webserver/http-webserver/src/test/devServerTest/routeChange/DevRoutes.java
@@ -1,12 +1,12 @@
 package org.webpieces.webserver.dev.app;
 
 import static org.webpieces.ctx.api.HttpMethod.GET;
+import static org.webpieces.router.api.routes.Port.BOTH;
 
-import org.webpieces.router.api.routing.Routes;
-import org.webpieces.router.impl.model.bldr.DomainRouteBuilder;
-import org.webpieces.router.impl.model.bldr.RouteBuilder;
-
-import static org.webpieces.router.api.routing.Port.BOTH;
+import org.webpieces.router.api.routebldr.DomainRouteBuilder;
+import org.webpieces.router.api.routebldr.RouteBuilder;
+import org.webpieces.router.api.routes.FilterPortType;
+import org.webpieces.router.api.routes.Routes;
 
 public class DevRoutes implements Routes {