diff --git a/README.md b/README.md
index dc02aa4..3f1807b 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ syntax by passing using a different route parser.
 
 ```php
 
-$router = new Phroute\Router\RouteCollector();
+$router = new Phroute\Phroute\RouteCollector();
 
 
 $router->any('/example', function(){
@@ -97,7 +97,7 @@ $router->addRoute('GET', '/user/{id}?', function($id = null) {
 });
 
 # NB. You can cache the return value from $router->getData() so you don't have to create the routes each request - massive speed gains
-$dispatcher = new Phroute\Router\Dispatcher($router->getData());
+$dispatcher = new Phroute\Phroute\Dispatcher($router->getData());
 
 $response = $dispatcher->dispatch($_SERVER['REQUEST_METHOD'], parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
     
@@ -241,16 +241,16 @@ A URI is dispatched by calling the `dispatch()` method of the created dispatcher
 accepts the HTTP method and a URI. Getting those two bits of information (and normalizing them
 appropriately) is your job - this library is not bound to the PHP web SAPIs.
 
-$response = (new Phroute\Router\Dispatcher($router))
+$response = (new Phroute\Phroute\Dispatcher($router))
             ->dispatch($_SERVER['REQUEST_METHOD'], $_SERVER['REQUEST_URI']);
 
 The `dispatch()` method will call the matched route, or if no matches, throw one of the exceptions below:
 
     # Route not found
-    Phroute\Router\Exception\HttpRouteNotFoundException;
+    Phroute\Phroute\Exception\HttpRouteNotFoundException;
     
     # Route found, but method not allowed
-    Phroute\Router\Exception\HttpMethodNotAllowedException;
+    Phroute\Phroute\Exception\HttpMethodNotAllowedException;
 
 > **NOTE:** The HTTP specification requires that a `405 Method Not Allowed` response include the
 `Allow:` header to detail available methods for the requested resource. 
@@ -270,7 +270,7 @@ but pimple/pimple or others will work just as well.
 ~~~PHP
 
 use Orno\Di\Container;
-use Phroute\Router\HandlerResolverInterface;
+use Phroute\Phroute\HandlerResolverInterface;
 
 class RouterResolver implements HandlerResolverInterface
 {
@@ -311,7 +311,7 @@ $appContainer = new Orno\Di;
 
 
 $resolver = new RouterResolver($appContainer);
-$response = (new Phroute\Router\Dispatcher($router, $resolver))->dispatch($requestMethod, $requestUri);
+$response = (new Phroute\Phroute\Dispatcher($router, $resolver))->dispatch($requestMethod, $requestUri);
 
 ~~~
 
diff --git a/composer.json b/composer.json
index 5d97e8e..5c42513 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
   ],
   "autoload": {
         "psr-4": {
-            "Phroute\\Router\\": "src/Phroute"
+            "Phroute\\Phroute\\": "src/Phroute"
          }
     },
   "require": {
diff --git a/src/Phroute/Dispatcher.php b/src/Phroute/Dispatcher.php
index b0fcdf1..6e637e5 100644
--- a/src/Phroute/Dispatcher.php
+++ b/src/Phroute/Dispatcher.php
@@ -1,7 +1,7 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
-use Phroute\Router\Exception\HttpMethodNotAllowedException;
-use Phroute\Router\Exception\HttpRouteNotFoundException;
+use Phroute\Phroute\Exception\HttpMethodNotAllowedException;
+use Phroute\Phroute\Exception\HttpRouteNotFoundException;
 
 class Dispatcher {
 
diff --git a/src/Phroute/Exception/BadRouteException.php b/src/Phroute/Exception/BadRouteException.php
index 9bea066..96049b9 100644
--- a/src/Phroute/Exception/BadRouteException.php
+++ b/src/Phroute/Exception/BadRouteException.php
@@ -1,4 +1,4 @@
-<?php namespace Phroute\Router\Exception;
+<?php namespace Phroute\Phroute\Exception;
 
 class BadRouteException extends \LogicException {
 }
diff --git a/src/Phroute/Exception/HttpException.php b/src/Phroute/Exception/HttpException.php
index 9b102ef..62c2ae5 100644
--- a/src/Phroute/Exception/HttpException.php
+++ b/src/Phroute/Exception/HttpException.php
@@ -1,3 +1,3 @@
-<?php namespace Phroute\Router\Exception;
+<?php namespace Phroute\Phroute\Exception;
 
 class HttpException extends \Exception {}
diff --git a/src/Phroute/Exception/HttpMethodNotAllowedException.php b/src/Phroute/Exception/HttpMethodNotAllowedException.php
index e00cf00..b8cd0f7 100644
--- a/src/Phroute/Exception/HttpMethodNotAllowedException.php
+++ b/src/Phroute/Exception/HttpMethodNotAllowedException.php
@@ -1,3 +1,3 @@
-<?php namespace Phroute\Router\Exception;
+<?php namespace Phroute\Phroute\Exception;
 
 class HttpMethodNotAllowedException extends HttpException {}
diff --git a/src/Phroute/Exception/HttpRouteNotFoundException.php b/src/Phroute/Exception/HttpRouteNotFoundException.php
index 30d2eb1..27ef308 100644
--- a/src/Phroute/Exception/HttpRouteNotFoundException.php
+++ b/src/Phroute/Exception/HttpRouteNotFoundException.php
@@ -1,4 +1,4 @@
-<?php namespace Phroute\Router\Exception;
+<?php namespace Phroute\Phroute\Exception;
 
 class HttpRouteNotFoundException extends HttpException {}
 
diff --git a/src/Phroute/HandlerResolver.php b/src/Phroute/HandlerResolver.php
index 6ffdafe..1496861 100644
--- a/src/Phroute/HandlerResolver.php
+++ b/src/Phroute/HandlerResolver.php
@@ -1,4 +1,4 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
 class HandlerResolver implements HandlerResolverInterface {
 	
diff --git a/src/Phroute/HandlerResolverInterface.php b/src/Phroute/HandlerResolverInterface.php
index 3e01a1d..2cf5f53 100644
--- a/src/Phroute/HandlerResolverInterface.php
+++ b/src/Phroute/HandlerResolverInterface.php
@@ -1,4 +1,4 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
 interface HandlerResolverInterface {
 	
diff --git a/src/Phroute/Route.php b/src/Phroute/Route.php
index 96da426..b531f51 100644
--- a/src/Phroute/Route.php
+++ b/src/Phroute/Route.php
@@ -1,4 +1,4 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
 class Route {
 
diff --git a/src/Phroute/RouteCollector.php b/src/Phroute/RouteCollector.php
index f68f9f6..59fbe88 100644
--- a/src/Phroute/RouteCollector.php
+++ b/src/Phroute/RouteCollector.php
@@ -1,13 +1,13 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
 use ReflectionClass;
 use ReflectionMethod;
 
-use Phroute\Router\Exception\BadRouteException;
+use Phroute\Phroute\Exception\BadRouteException;
 
 /**
  * Class RouteCollector
- * @package Phroute\Router
+ * @package Phroute\Phroute
  */
 class RouteCollector implements RouteDataProviderInterface {
 
diff --git a/src/Phroute/RouteDataArray.php b/src/Phroute/RouteDataArray.php
index 1f58762..91c773a 100644
--- a/src/Phroute/RouteDataArray.php
+++ b/src/Phroute/RouteDataArray.php
@@ -1,4 +1,4 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
 class RouteDataArray implements RouteDataInterface {
 
diff --git a/src/Phroute/RouteDataInterface.php b/src/Phroute/RouteDataInterface.php
index fda3d84..a5fdfb5 100644
--- a/src/Phroute/RouteDataInterface.php
+++ b/src/Phroute/RouteDataInterface.php
@@ -1,9 +1,9 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
 
 /**
  * Interface RouteDataInterface
- * @package Phroute\Router
+ * @package Phroute\Phroute
  */
 interface RouteDataInterface {
 
diff --git a/src/Phroute/RouteDataProviderInterface.php b/src/Phroute/RouteDataProviderInterface.php
index e692594..29dfd9b 100644
--- a/src/Phroute/RouteDataProviderInterface.php
+++ b/src/Phroute/RouteDataProviderInterface.php
@@ -1,9 +1,9 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
 
 /**
  * Interface RouteDataProviderInterface
- * @package Phroute\Router
+ * @package Phroute\Phroute
  */
 interface RouteDataProviderInterface {
 
diff --git a/src/Phroute/RouteParser.php b/src/Phroute/RouteParser.php
index 0ecc4a4..0f25274 100644
--- a/src/Phroute/RouteParser.php
+++ b/src/Phroute/RouteParser.php
@@ -1,6 +1,6 @@
-<?php namespace Phroute\Router;
+<?php namespace Phroute\Phroute;
 
-use Phroute\Router\Exception\BadRouteException;
+use Phroute\Phroute\Exception\BadRouteException;
 /**
  * Parses routes of the following form:
  *
diff --git a/test/Dispatcher/DispatcherTest.php b/test/Dispatcher/DispatcherTest.php
index fdc874a..42bd858 100644
--- a/test/Dispatcher/DispatcherTest.php
+++ b/test/Dispatcher/DispatcherTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Phroute\Router\Dispatcher;
+namespace Phroute\Phroute\Dispatcher;
 
-use Phroute\Router\RouteCollector;
-use Phroute\Router\RouteParser;
-use Phroute\Router\Dispatcher;
-use Phroute\Router\Route;
+use Phroute\Phroute\RouteCollector;
+use Phroute\Phroute\RouteParser;
+use Phroute\Phroute\Dispatcher;
+use Phroute\Phroute\Route;
 
 class Test {
     
@@ -113,7 +113,7 @@ public function testFoundDispatches($method, $uri, $callback, $expected)
 
     /**
      * @dataProvider provideNotFoundDispatchCases
-     * @expectedException \Phroute\Router\Exception\HttpRouteNotFoundException
+     * @expectedException \Phroute\Phroute\Exception\HttpRouteNotFoundException
      * @expectedExceptionMessage does not exist
      */
     public function testNotFoundDispatches($method, $uri, $callback)
@@ -128,7 +128,7 @@ public function testNotFoundDispatches($method, $uri, $callback)
      */
     public function testMethodNotAllowedDispatches($method, $uri, $callback, $allowed)
     {
-        $this->setExpectedException('\Phroute\Router\Exception\HttpMethodNotAllowedException',"Allow: " . implode(', ', $allowed));
+        $this->setExpectedException('\Phroute\Phroute\Exception\HttpMethodNotAllowedException',"Allow: " . implode(', ', $allowed));
 
         $r = $this->router();
         $callback($r);
@@ -180,7 +180,7 @@ public function testReverseRouteWithDashes()
     }
 
     /**
-     * @expectedException \Phroute\Router\Exception\BadRouteException
+     * @expectedException \Phroute\Phroute\Exception\BadRouteException
      * @expectedExceptionMessage Expecting route variable 'store'
      */
     public function testMissingParameterReverseRoute()
@@ -193,7 +193,7 @@ public function testMissingParameterReverseRoute()
     }
 
     /**
-     * @expectedException \Phroute\Router\Exception\BadRouteException
+     * @expectedException \Phroute\Phroute\Exception\BadRouteException
      * @expectedExceptionMessage Cannot use the same placeholder 'test' twice
      */
     public function testDuplicateVariableNameError()
@@ -204,7 +204,7 @@ public function testDuplicateVariableNameError()
     }
 
     /**
-     * @expectedException \Phroute\Router\Exception\BadRouteException
+     * @expectedException \Phroute\Phroute\Exception\BadRouteException
      * @expectedExceptionMessage Cannot register two routes matching 'user/([^/]+)' for method 'GET'
      */
     public function testDuplicateVariableRoute()
@@ -219,7 +219,7 @@ public function testDuplicateVariableRoute()
     }
 
     /**
-     * @expectedException \Phroute\Router\Exception\BadRouteException
+     * @expectedException \Phroute\Phroute\Exception\BadRouteException
      * @expectedExceptionMessage Cannot register two routes matching 'user' for method 'GET'
      */
     public function testDuplicateStaticRoute()
@@ -234,7 +234,7 @@ public function testDuplicateStaticRoute()
     }
 
     /**
-     * @expectedException \Phroute\Router\Exception\BadRouteException
+     * @expectedException \Phroute\Phroute\Exception\BadRouteException
      * @expectedExceptionMessage Static route 'user/nikic' is shadowed by previously defined variable route 'user/([^/]+)' for method 'GET'
      */
     public function testShadowedStaticRoute()
@@ -420,7 +420,7 @@ public function testRestfulControllerMethods()
 
 
     /**
-     * @expectedException \Phroute\Router\Exception\HttpRouteNotFoundException
+     * @expectedException \Phroute\Phroute\Exception\HttpRouteNotFoundException
      * @expectedExceptionMessage does not exist
      */
     public function testRestfulOptionalRequiredControllerMethodThrows()
@@ -433,7 +433,7 @@ public function testRestfulOptionalRequiredControllerMethodThrows()
     }
 
     /**
-     * @expectedException \Phroute\Router\Exception\HttpRouteNotFoundException
+     * @expectedException \Phroute\Phroute\Exception\HttpRouteNotFoundException
      * @expectedExceptionMessage does not exist
      */
     public function testRestfulRequiredControllerMethodThrows()
@@ -446,7 +446,7 @@ public function testRestfulRequiredControllerMethodThrows()
     }
 
     /**
-     * @expectedException \Phroute\Router\Exception\HttpRouteNotFoundException
+     * @expectedException \Phroute\Phroute\Exception\HttpRouteNotFoundException
      * @expectedExceptionMessage does not exist
      */
     public function testRestfulHyphenateControllerMethodThrows()