diff --git a/app/routes/api.php b/app/routes/api.php
index 7d2749d6..e2baef3d 100644
--- a/app/routes/api.php
+++ b/app/routes/api.php
@@ -1,19 +1,21 @@
 <?php
 
-Route::api([
-    'after' => 'allowed_domains',
-    'namespace' => 'CachetHQ\Cachet\Http\Controllers\Api',
-    'version' => 'v1',
-    ], function () {
+Route::api(['after' => 'allowed_domains', 'namespace' => 'CachetHQ\Cachet\Http\Controllers\Api', 'version' => 'v1'], function () {
+    // Components
     Route::get('components', 'ComponentController@getComponents');
     Route::get('components/{id}', 'ComponentController@getComponent');
     Route::get('components/{id}/incidents', 'ComponentController@getComponentIncidents');
+
+    // Incidents
     Route::get('incidents', 'IncidentController@getIncidents');
     Route::get('incidents/{id}', 'IncidentController@getIncident');
+
+    // Metrics
     Route::get('metrics', 'MetricController@getMetrics');
     Route::get('metrics/{id}', 'MetricController@getMetric');
     Route::get('metrics/points/{id}', 'MetricPointController@getMetricPoint');
 
+    // Api protected
     Route::group(['protected' => true], function () {
         Route::post('components', 'ComponentController@postComponents');
         Route::post('incidents', 'IncidentController@postIncidents');
diff --git a/app/routes/app.php b/app/routes/app.php
index ff5404e9..831c7b51 100644
--- a/app/routes/app.php
+++ b/app/routes/app.php
@@ -1,25 +1,14 @@
 <?php
 
 // Prevent access until the app is setup.
-Route::group([
-    'before' => 'has_setting:app_name',
-    'namespace' => 'CachetHQ\Cachet\Http\Controllers',
-    ], function () {
+Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     Route::get('/', [
-        'as' => 'status-page',
+        'as'   => 'status-page',
         'uses' => 'HomeController@showIndex',
     ]);
     Route::get('/incident/{incident}', 'HomeController@showIncident');
 });
 
-// Setup route.
-Route::group([
-    'before' => 'is_setup',
-    'namespace' => 'CachetHQ\Cachet\Http\Controllers',
-    ], function () {
-    Route::controller('/setup', 'SetupController');
-});
-
 Route::group(['namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     Route::get('/atom', 'AtomController@feedAction');
     Route::get('/rss', 'RssController@feedAction');
diff --git a/app/routes/auth.php b/app/routes/auth.php
index d6a63d07..1eeef9f1 100644
--- a/app/routes/auth.php
+++ b/app/routes/auth.php
@@ -1,27 +1,22 @@
 <?php
 
-Route::group([
-    'before' => 'has_setting:app_name',
-    'namespace' => 'CachetHQ\Cachet\Http\Controllers',
-    ], function () {
+Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
+    // Login routes
     Route::get('/auth/login', [
         'before' => 'guest',
-        'as' => 'login',
-        'uses' => 'AuthController@showLogin',
+        'as'     => 'login',
+        'uses'   => 'AuthController@showLogin',
     ]);
     Route::post('/auth/login', [
         'before' => 'guest|csrf|login_throttling',
-        'as' => 'logout',
-        'uses' => 'AuthController@postLogin',
+        'as'     => 'logout',
+        'uses'   => 'AuthController@postLogin',
     ]);
 });
 
-Route::group([
-    'before' => 'auth',
-    'namespace' => 'CachetHQ\Cachet\Http\Controllers',
-    ], function () {
+Route::group(['before' => 'auth', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     Route::get('/auth/logout', [
-        'as' => 'logout',
+        'as'   => 'logout',
         'uses' => 'AuthController@logoutAction',
     ]);
 });
diff --git a/app/routes/dashboard.php b/app/routes/dashboard.php
index 8b95f532..bb89e5a2 100644
--- a/app/routes/dashboard.php
+++ b/app/routes/dashboard.php
@@ -1,32 +1,28 @@
 <?php
 
-Route::group([
-    'before' => 'auth',
-    'prefix' => 'dashboard',
-    'namespace' => 'CachetHQ\Cachet\Http\Controllers',
-    ], function () {
+Route::group(['before' => 'auth', 'prefix' => 'dashboard', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     // Dashboard
     Route::get('/', [
-        'as' => 'dashboard',
+        'as'   => 'dashboard',
         'uses' => 'DashboardController@showDashboard',
     ]);
 
     // Components
     Route::get('components', [
-        'as' => 'dashboard.components',
+        'as'   => 'dashboard.components',
         'uses' => 'DashComponentController@showComponents',
     ]);
     Route::get('components/add', [
-        'as' => 'dashboard.components.add',
+        'as'   => 'dashboard.components.add',
         'uses' => 'DashComponentController@showAddComponent',
     ]);
     Route::post('components/add', 'DashComponentController@createComponentAction');
     Route::get('components/groups', [
-        'as' => 'dashboard.components.groups',
+        'as'   => 'dashboard.components.groups',
         'uses' => 'DashComponentController@showComponentGroups',
     ]);
     Route::get('components/groups/add', [
-        'as' => 'dashboard.components.groups.add',
+        'as'   => 'dashboard.components.groups.add',
         'uses' => 'DashComponentController@showAddComponentGroup',
     ]);
     Route::post('components/groups/add', 'DashComponentController@postAddComponentGroup');
@@ -36,11 +32,11 @@ Route::group([
 
     // Incidents
     Route::get('incidents', [
-        'as' => 'dashboard.incidents',
+        'as'   => 'dashboard.incidents',
         'uses' => 'DashIncidentController@showIncidents',
     ]);
     Route::get('incidents/add', [
-        'as' => 'dashboard.incidents.add',
+        'as'   => 'dashboard.incidents.add',
         'uses' => 'DashIncidentController@showAddIncident',
     ]);
     Route::post('incidents/add', 'DashIncidentController@createIncidentAction');
@@ -48,30 +44,30 @@ Route::group([
     Route::get('incidents/{incident}/edit', 'DashIncidentController@showEditIncidentAction');
     Route::post('incidents/{incident}/edit', 'DashIncidentController@editIncidentAction');
     Route::get('incidents/template', [
-        'as' => 'dashboard.incidents.template',
+        'as'   => 'dashboard.incidents.template',
         'uses' => 'DashIncidentController@showAddIncidentTemplate',
     ]);
     Route::post('incidents/template', 'DashIncidentController@createIncidentTemplateAction');
 
     // Metrics
     Route::get('metrics', [
-        'as' => 'dashboard.metrics',
+        'as'   => 'dashboard.metrics',
         'uses' => 'DashboardController@showMetrics',
     ]);
 
     // Notifications
     Route::get('notifications', [
-        'as' => 'dashboard.notifications',
+        'as'   => 'dashboard.notifications',
         'uses' => 'DashboardController@showNotifications',
     ]);
 
     // Team Members
     Route::get('team', [
-        'as' => 'dashboard.team',
+        'as'   => 'dashboard.team',
         'uses' => 'DashboardController@showTeamView',
     ]);
     Route::get('team/add', [
-        'as' => 'dashboard.team.add',
+        'as'   => 'dashboard.team.add',
         'uses' => 'DashboardController@showAddTeamMemberView'
     ]);
     Route::get('team/{user}', 'DashboardController@showTeamMemberView');
@@ -80,26 +76,26 @@ Route::group([
 
     // Settings
     Route::get('settings/setup', [
-        'as' => 'dashboard.settings.setup',
+        'as'   => 'dashboard.settings.setup',
         'uses' => 'DashSettingsController@showSetupView',
     ]);
     Route::get('settings/security', [
-        'as' => 'dashboard.settings.security',
+        'as'   => 'dashboard.settings.security',
         'uses' => 'DashSettingsController@showSecurityView',
     ]);
     Route::get('settings/theme', [
-        'as' => 'dashboard.settings.theme',
+        'as'   => 'dashboard.settings.theme',
         'uses' => 'DashSettingsController@showThemeView',
     ]);
     Route::get('settings/stylesheet', [
-        'as' => 'dashboard.settings.stylesheet',
+        'as'   => 'dashboard.settings.stylesheet',
         'uses' => 'DashSettingsController@showStylesheetView',
     ]);
     Route::post('settings', 'DashSettingsController@postSettings');
 
     // User Settings
     Route::get('user', [
-        'as' => 'dashboard.user',
+        'as'   => 'dashboard.user',
         'uses' => 'DashUserController@showUser',
     ]);
     Route::get('user/{user}/api/regen', 'DashUserController@regenerateApiKey');
diff --git a/app/routes/setup.php b/app/routes/setup.php
new file mode 100644
index 00000000..d820e722
--- /dev/null
+++ b/app/routes/setup.php
@@ -0,0 +1,6 @@
+<?php
+
+// Setup route.
+Route::group(['before' => 'is_setup', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
+    Route::controller('/setup', 'SetupController');
+});