diff --git a/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java b/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
index 41324a9..71f1750 100644
--- a/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
+++ b/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
@@ -27,6 +27,7 @@
 import javax.servlet.http.HttpSessionListener;
 
 import org.apache.felix.http.base.internal.dispatch.Dispatcher;
+import org.apache.felix.http.base.internal.dispatch.DispatcherServlet;
 import org.apache.felix.http.base.internal.handler.HttpSessionWrapper;
 import org.apache.felix.http.base.internal.registry.HandlerRegistry;
 import org.apache.felix.http.base.internal.service.HttpServiceFactory;
diff --git a/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java b/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java
similarity index 93%
rename from src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
rename to src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java
index 2f83593..47544bf 100644
--- a/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
+++ b/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.http.base.internal;
+package org.apache.felix.http.base.internal.dispatch;
 
 import java.io.IOException;
 
@@ -23,7 +23,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.felix.http.base.internal.dispatch.Dispatcher;
+import org.apache.felix.http.base.internal.HttpServiceController;
 
 /**
  * The dispatcher servlet is registered in the container.