diff --git a/app/Http/Controllers/Admin/ApiController.php b/app/Http/Controllers/Dashboard/ApiController.php
similarity index 97%
rename from app/Http/Controllers/Admin/ApiController.php
rename to app/Http/Controllers/Dashboard/ApiController.php
index 39ad28cc..da0faca6 100644
--- a/app/Http/Controllers/Admin/ApiController.php
+++ b/app/Http/Controllers/Dashboard/ApiController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
diff --git a/app/Http/Controllers/Admin/ComponentController.php b/app/Http/Controllers/Dashboard/ComponentController.php
similarity index 99%
rename from app/Http/Controllers/Admin/ComponentController.php
rename to app/Http/Controllers/Dashboard/ComponentController.php
index 4bf07874..8af44d95 100644
--- a/app/Http/Controllers/Admin/ComponentController.php
+++ b/app/Http/Controllers/Dashboard/ComponentController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Models\Component;
diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Dashboard/DashboardController.php
similarity index 98%
rename from app/Http/Controllers/Admin/DashboardController.php
rename to app/Http/Controllers/Dashboard/DashboardController.php
index 716e7a5a..ee841f8d 100644
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Dashboard/DashboardController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use CachetHQ\Cachet\Facades\Setting;
 use CachetHQ\Cachet\Models\Component;
diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php
similarity index 99%
rename from app/Http/Controllers/Admin/IncidentController.php
rename to app/Http/Controllers/Dashboard/IncidentController.php
index 52f5b217..cdb68d93 100644
--- a/app/Http/Controllers/Admin/IncidentController.php
+++ b/app/Http/Controllers/Dashboard/IncidentController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Events\IncidentHasReportedEvent;
diff --git a/app/Http/Controllers/Admin/MetricController.php b/app/Http/Controllers/Dashboard/MetricController.php
similarity index 98%
rename from app/Http/Controllers/Admin/MetricController.php
rename to app/Http/Controllers/Dashboard/MetricController.php
index 89533060..21b6f785 100644
--- a/app/Http/Controllers/Admin/MetricController.php
+++ b/app/Http/Controllers/Dashboard/MetricController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Models\Metric;
diff --git a/app/Http/Controllers/Admin/ScheduleController.php b/app/Http/Controllers/Dashboard/ScheduleController.php
similarity index 99%
rename from app/Http/Controllers/Admin/ScheduleController.php
rename to app/Http/Controllers/Dashboard/ScheduleController.php
index 195348b2..9cdc8e9c 100644
--- a/app/Http/Controllers/Admin/ScheduleController.php
+++ b/app/Http/Controllers/Dashboard/ScheduleController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent;
diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php
similarity index 99%
rename from app/Http/Controllers/Admin/SettingsController.php
rename to app/Http/Controllers/Dashboard/SettingsController.php
index 07199ead..c92ef89e 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Dashboard/SettingsController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use CachetHQ\Cachet\Models\Setting;
 use CachetHQ\Cachet\Models\User;
diff --git a/app/Http/Controllers/Admin/SubscriberController.php b/app/Http/Controllers/Dashboard/SubscriberController.php
similarity index 97%
rename from app/Http/Controllers/Admin/SubscriberController.php
rename to app/Http/Controllers/Dashboard/SubscriberController.php
index e876e416..ad3e5cd0 100644
--- a/app/Http/Controllers/Admin/SubscriberController.php
+++ b/app/Http/Controllers/Dashboard/SubscriberController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Events\CustomerHasSubscribedEvent;
diff --git a/app/Http/Controllers/Admin/TeamController.php b/app/Http/Controllers/Dashboard/TeamController.php
similarity index 98%
rename from app/Http/Controllers/Admin/TeamController.php
rename to app/Http/Controllers/Dashboard/TeamController.php
index 3940a7d1..15783969 100644
--- a/app/Http/Controllers/Admin/TeamController.php
+++ b/app/Http/Controllers/Dashboard/TeamController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Models\User;
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Dashboard/UserController.php
similarity index 97%
rename from app/Http/Controllers/Admin/UserController.php
rename to app/Http/Controllers/Dashboard/UserController.php
index c953cdbc..611be7a7 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Dashboard/UserController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Http\Controllers\Admin;
+namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
 use CachetHQ\Cachet\Models\User;
diff --git a/app/Http/Routes/DashboardRoutes.php b/app/Http/Routes/DashboardRoutes.php
index 75408353..6cd756e3 100644
--- a/app/Http/Routes/DashboardRoutes.php
+++ b/app/Http/Routes/DashboardRoutes.php
@@ -30,7 +30,7 @@ class DashboardRoutes
         $router->group([
             'middleware' => 'auth',
             'prefix'     => 'dashboard',
-            'namespace'  => 'Admin',
+            'namespace'  => 'Dashboard',
             'as'         => 'dashboard.',
         ], function ($router) {
             // Dashboard