diff --git a/public/index.php b/public/index.php
index e3d175eb..5cc31efc 100644
--- a/public/index.php
+++ b/public/index.php
@@ -138,14 +138,16 @@
 // --------------------------------------------------------------
 // Execute the global "before" filter.
 // --------------------------------------------------------------
-$response = System\Route_Filter::call('before', array(), true);
+$response = System\Routing\Filter::call('before', array(), true);
 
 // ----------------------------------------------------------
 // Execute the route function.
 // ----------------------------------------------------------
 if (is_null($response))
 {
-	$route = System\Router::make(System\Request::method(), System\Request::uri())->route();
+	list($method, $uri) = array(System\Request::method(), System\Request::uri());
+
+	$route = System\Routing\Router::make($method, $uri, System\Routing\Loader::load($uri))->route();
 
 	$response = (is_null($route)) ? System\Response::make(System\View::make('error/404'), 404) : $route->call();
 }
@@ -157,7 +159,7 @@
 // ----------------------------------------------------------
 // Execute the global "after" filter.
 // ----------------------------------------------------------
-System\Route_Filter::call('after', array($response));
+System\Routing\Filter::call('after', array($response));
 
 // ----------------------------------------------------------
 // Stringify the response.
diff --git a/system/error.php b/system/error.php
index 4bf65a54..f6196723 100644
--- a/system/error.php
+++ b/system/error.php
@@ -62,7 +62,7 @@ private static function show($e, $severity, $message)
 	{
 		if (Config::get('error.detail'))
 		{
-			$view = View::make('exception')
+			$view = View::make('error/exception')
                                    ->bind('severity', $severity)
                                    ->bind('message', $message)
                                    ->bind('file', $e->getFile())
diff --git a/system/route_filter.php b/system/routing/filter.php
similarity index 94%
rename from system/route_filter.php
rename to system/routing/filter.php
index 5fd9e10c..2286bd42 100644
--- a/system/route_filter.php
+++ b/system/routing/filter.php
@@ -1,6 +1,6 @@
-<?php namespace System;
+<?php namespace System\Routing;
 
-class Route_Filter {
+class Filter {
 
 	/**
 	 * The loaded route filters.
diff --git a/system/route_finder.php b/system/routing/finder.php
similarity index 97%
rename from system/route_finder.php
rename to system/routing/finder.php
index 75a54e39..0cb7eb4f 100644
--- a/system/route_finder.php
+++ b/system/routing/finder.php
@@ -1,6 +1,6 @@
-<?php namespace System;
+<?php namespace System\Routing;
 
-class Route_Finder {
+class Finder {
 
 	/**
 	 * All of the loaded routes.
diff --git a/system/routing/loader.php b/system/routing/loader.php
new file mode 100644
index 00000000..ac271810
--- /dev/null
+++ b/system/routing/loader.php
@@ -0,0 +1,33 @@
+<?php namespace System\Routing;
+
+class Loader {
+
+	/**
+	 * Load the appropriate routes for the request URI.
+	 *
+	 * @param  string
+	 * @return array
+	 */
+	public static function load($uri)
+	{
+		$base = require APP_PATH.'routes'.EXT;
+
+		if ( ! is_dir(APP_PATH.'routes') or $uri == '')
+		{
+			return $base;
+		}
+
+		list($routes, $segments) = array(array(), explode('/', $uri));
+
+		foreach (array_reverse($segments, true) as $key => $value)
+		{
+			if (file_exists($path = ROUTE_PATH.implode('/', array_slice($segments, 0, $key + 1)).EXT))
+			{
+				$routes = require $path;
+			}
+		}
+
+		return array_merge($routes, $base);
+	}	
+
+}
\ No newline at end of file
diff --git a/system/route.php b/system/routing/route.php
similarity index 84%
rename from system/route.php
rename to system/routing/route.php
index f078e848..97710159 100644
--- a/system/route.php
+++ b/system/routing/route.php
@@ -1,4 +1,6 @@
-<?php namespace System;
+<?php namespace System\Routing;
+
+use System\Response;
 
 class Route {
 
@@ -55,7 +57,7 @@ public function call()
 		}
 		elseif (is_array($this->callback))
 		{
-			$response = isset($this->callback['before']) ? Route_Filter::call($this->callback['before'], array(), true) : null;
+			$response = isset($this->callback['before']) ? Filter::call($this->callback['before'], array(), true) : null;
 
 			if (is_null($response) and isset($this->callback['do']))
 			{
@@ -67,7 +69,7 @@ public function call()
 
 		if (is_array($this->callback) and isset($this->callback['after']))
 		{
-			Route_Filter::call($this->callback['after'], array($response));
+			Filter::call($this->callback['after'], array($response));
 		}
 
 		return $response;
diff --git a/system/router.php b/system/routing/router.php
similarity index 78%
rename from system/router.php
rename to system/routing/router.php
index 6103995a..29f83d93 100644
--- a/system/router.php
+++ b/system/routing/router.php
@@ -1,4 +1,6 @@
-<?php namespace System;
+<?php namespace System\Routing;
+
+use System\Request;
 
 class Router {
 
@@ -24,13 +26,12 @@ class Router {
 	 * @param  array   $routes
 	 * @return void
 	 */
-	public function __construct($method, $uri, $routes = null)
+	public function __construct($method, $uri, $routes)
 	{
 		// Put the request method and URI in route form. Routes begin with
 		// the request method and a forward slash.
 		$this->request = $method.' /'.trim($uri, '/');
-
-		$this->routes = (is_array($routes)) ? $routes : $this->load($uri);
+		$this->routes = $routes;
 	}
 
 	/**
@@ -46,34 +47,6 @@ public static function make($method, $uri, $routes = null)
 		return new static($method, $uri, $routes);
 	}
 
-	/**
-	 * Load the appropriate routes for the request URI.
-	 *
-	 * @param  string  $uri
-	 * @return array
-	 */
-	public function load($uri)
-	{
-		$base = require APP_PATH.'routes'.EXT;
-
-		if ( ! is_dir(APP_PATH.'routes') or $uri == '')
-		{
-			return $base;
-		}
-
-		list($routes, $segments) = array(array(), explode('/', $uri));
-
-		foreach (array_reverse($segments, true) as $key => $value)
-		{
-			if (file_exists($path = ROUTE_PATH.implode('/', array_slice($segments, 0, $key + 1)).EXT))
-			{
-				$routes = require $path;
-			}
-		}
-
-		return array_merge($routes, $base);
-	}
-
 	/**
 	 * Search a set of routes for the route matching a method and URI.
 	 *