diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index f6117551..3b87f0d8 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -6,7 +6,7 @@
 class Kernel extends HttpKernel {
 
 	/**
-	 * The application's HTTP middleware stack.
+	 * The application's global HTTP middleware stack.
 	 *
 	 * @var array
 	 */
@@ -19,4 +19,15 @@ class Kernel extends HttpKernel {
 		'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken',
 	];
 
+	/**
+	 * The application's route middleware.
+	 *
+	 * @var array
+	 */
+	protected $routeMiddleware = [
+		'auth' => 'App\Http\Middleware\Authenticate',
+		'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
+		'guest' => 'App\Http\Middleware\RedirectIfAuthenticated',
+	];
+
 }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index ba56a12c..7bffce69 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,48 +1,40 @@
 <?php namespace App\Providers;
 
 use Illuminate\Routing\Router;
-use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
 class RouteServiceProvider extends ServiceProvider {
 
 	/**
-	 * All of the application's route middleware keys.
+	 * This namespace is applied to the controller routes in your routes file.
 	 *
-	 * @var array
+	 * In addition, this is set as the URL generator's root namespace.
+	 *
+	 * @var string
 	 */
-	protected $middleware = [
-		'auth' => 'App\Http\Middleware\Authenticate',
-		'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
-		'guest' => 'App\Http\Middleware\RedirectIfAuthenticated',
-	];
+	protected $namespace = 'App\Http\Controllers';
 
 	/**
-	 * Called before routes are registered.
-	 *
-	 * Register any model bindings or pattern based filters.
+	 * Bootstrap any application services.
 	 *
 	 * @param  \Illuminate\Routing\Router  $router
-	 * @param  \Illuminate\Contracts\Routing\UrlGenerator  $url
 	 * @return void
 	 */
-	public function before(Router $router, UrlGenerator $url)
+	public function boot(Router $router)
 	{
-		$url->setRootControllerNamespace('App\Http\Controllers');
+		parent::boot($router);
+
+		//
 	}
 
 	/**
 	 * Define the routes for the application.
 	 *
-	 * @param  \Illuminate\Routing\Router  $router
 	 * @return void
 	 */
-	public function map(Router $router)
+	public function map()
 	{
-		$router->group(['namespace' => 'App\Http\Controllers'], function($router)
-		{
-			require app_path('Http/routes.php');
-		});
+		$this->loadRoutesFrom(app_path('Http/routes.php'));
 	}
 
 }