diff --git a/lib/SimpleSAML/Router.php b/lib/SimpleSAML/HTTP/Router.php
similarity index 93%
rename from lib/SimpleSAML/Router.php
rename to lib/SimpleSAML/HTTP/Router.php
index fe6e568836847d621f6e108273a8d914ef8ec1fa..e537092a9e62352497e49233f610a9e4a3a93a13 100644
--- a/lib/SimpleSAML/Router.php
+++ b/lib/SimpleSAML/HTTP/Router.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace SimpleSAML;
+namespace SimpleSAML\HTTP;
+
+use SimpleSAML\Configuration;
+use SimpleSAML\Session;
 
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
@@ -32,7 +35,7 @@ class Router
     /** @var Request */
     protected $request;
 
-    /** @var \SimpleSAML\ModuleControllerResolver */
+    /** @var \SimpleSAML\Module\ControllerResolver */
     protected $resolver;
 
     /** @var \SimpleSAML\Session */
@@ -51,7 +54,7 @@ class Router
     {
         $this->arguments = new ArgumentResolver();
         $this->context = new RequestContext();
-        $this->resolver = new ModuleControllerResolver($module);
+        $this->resolver = new \SimpleSAML\Module\ControllerResolver($module);
         $this->dispatcher = new EventDispatcher();
     }
 
diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php
index 744dea83f85acc845d9c7bd75ee2f4f598ddd51c..775a585cf0cfbce13a3309888cc6ed1180d8953e 100644
--- a/lib/SimpleSAML/Module.php
+++ b/lib/SimpleSAML/Module.php
@@ -166,7 +166,7 @@ class Module
 
         $config = Configuration::getInstance();
         if ($config->getBoolean('usenewui', false) === true) {
-            $router = new Router($module);
+            $router = new HTTP\Router($module);
             try {
                 return $router->process();
             } catch (\Symfony\Component\Config\Exception\FileLocatorFileNotFoundException $e) {