diff --git a/app/routes/app.php b/app/routes/app.php
index 8ca87ef8..0705560c 100644
--- a/app/routes/app.php
+++ b/app/routes/app.php
@@ -7,8 +7,10 @@ Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cache
 });
 
 // Setup route.
-Route::group(['before' => 'is_setup'], function () {
+Route::group(['before' => 'is_setup', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
     Route::controller('/setup', 'SetupController');
 });
 
-Route::get('/rss', 'RssController@feedAction');
+Route::group(['namespace' => 'CachetHQ\Cachet\Controllers'], function () {
+    Route::get('/rss', 'RssController@feedAction');
+});
diff --git a/app/routes/auth.php b/app/routes/auth.php
index c4abf3c6..bc5eb71e 100644
--- a/app/routes/auth.php
+++ b/app/routes/auth.php
@@ -5,4 +5,6 @@ Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cache
     Route::post('/auth/login', ['before' => 'guest|csrf|login_throttling', 'as' => 'logout', 'uses' => 'AuthController@postLogin']);
 });
 
-Route::get('/auth/logout', ['before' => 'auth', 'as' => 'logout', 'uses' => 'AuthController@logoutAction']);
+Route::group(['before' => 'auth', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
+    Route::get('/auth/logout', ['as' => 'logout', 'uses' => 'AuthController@logoutAction']);
+});
diff --git a/composer.lock b/composer.lock
index ebe05723..435b5478 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "44248db4d4bba4ff38d7f3aef78acc79",
+    "hash": "af0ee6e5bc07e350732bc7c907e3b2ae",
     "packages": [
         {
             "name": "classpreloader/classpreloader",
diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php
index f6850893..65b21848 100644
--- a/src/Controllers/AuthController.php
+++ b/src/Controllers/AuthController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
 use GrahamCampbell\Throttle\Facades\Throttle;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\View;
 
 /**
diff --git a/src/Controllers/DashAPIController.php b/src/Controllers/DashAPIController.php
index f72ad5b5..d254dd65 100644
--- a/src/Controllers/DashAPIController.php
+++ b/src/Controllers/DashAPIController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
-use Exception;
 use Component;
+use Exception;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Input;
 
diff --git a/src/Controllers/DashComponentController.php b/src/Controllers/DashComponentController.php
index d47ca7e1..5ec8d00b 100644
--- a/src/Controllers/DashComponentController.php
+++ b/src/Controllers/DashComponentController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
 use Component;
+use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
-use Illuminate\Routing\Controller;
 
 class DashComponentController extends Controller
 {
diff --git a/src/Controllers/DashIncidentController.php b/src/Controllers/DashIncidentController.php
index 48a6c280..906f2269 100644
--- a/src/Controllers/DashIncidentController.php
+++ b/src/Controllers/DashIncidentController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
+use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
-use Illuminate\Routing\Controller;
 use Incident;
 use IncidentTemplate;
 
diff --git a/src/Controllers/DashSettingsController.php b/src/Controllers/DashSettingsController.php
index a1258902..114afdd6 100644
--- a/src/Controllers/DashSettingsController.php
+++ b/src/Controllers/DashSettingsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
 use Exception;
+use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
-use Illuminate\Routing\Controller;
 use Setting;
 
 class DashSettingsController extends Controller
diff --git a/src/Controllers/DashUserController.php b/src/Controllers/DashUserController.php
index ad4c30c8..4c2d4c34 100644
--- a/src/Controllers/DashUserController.php
+++ b/src/Controllers/DashUserController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
+use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
-use Illuminate\Routing\Controller;
 
 class DashUserController extends Controller
 {
diff --git a/src/Controllers/DashboardController.php b/src/Controllers/DashboardController.php
index 5c093407..90d90eae 100644
--- a/src/Controllers/DashboardController.php
+++ b/src/Controllers/DashboardController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
 use Component;
 use Illuminate\Routing\Controller;
diff --git a/src/Controllers/HomeController.php b/src/Controllers/HomeController.php
index 756b7d3c..e2c3d28b 100644
--- a/src/Controllers/HomeController.php
+++ b/src/Controllers/HomeController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
 use Component;
-use Illuminate\Support\Facades\View;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\View;
 use Setting;
 
 class HomeController extends Controller
diff --git a/src/Controllers/RssController.php b/src/Controllers/RssController.php
index d96cbe03..1b914cbc 100644
--- a/src/Controllers/RssController.php
+++ b/src/Controllers/RssController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
-use Illuminate\Support\Facades\Response;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Response;
 use Incident;
 use Setting;
 use Thujohn\Rss\RssFacade;
diff --git a/src/Controllers/SetupController.php b/src/Controllers/SetupController.php
index bc355e76..1a6987d8 100644
--- a/src/Controllers/SetupController.php
+++ b/src/Controllers/SetupController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers
+namespace CachetHQ\Cachet\Controllers;
 
+use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\View;
-use Illuminate\Routing\Controller;
 use Setting;
 use User;