diff --git a/app/routes/api.php b/app/routes/api.php
index c2c7b272..3e04d802 100644
--- a/app/routes/api.php
+++ b/app/routes/api.php
@@ -1,10 +1,6 @@
 <?php
 
-Route::api([
-    'version'   => 'v1',
-    'namespace' => 'CachetHQ\Cachet\Controllers\Api',
-    'after'     => 'allowed_domains',
-], function () {
+Route::api(['after' => 'allowed_domains', 'namespace' => 'CachetHQ\Cachet\Controllers\Api', 'version' => 'v1'], function () {
     Route::get('components', 'ComponentController@getComponents');
     Route::get('components/{id}', 'ComponentController@getComponent');
     Route::get('components/{id}/incidents', 'ComponentController@getComponentIncidents');
diff --git a/app/routes/app.php b/app/routes/app.php
index 943edb1e..8ca87ef8 100644
--- a/app/routes/app.php
+++ b/app/routes/app.php
@@ -1,7 +1,7 @@
 <?php
 
 // Prevent access until the app is setup.
-Route::group(['before' => 'has_setting:app_name'], function () {
+Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
     Route::get('/', ['as' => 'status-page', 'uses' => 'HomeController@showIndex']);
     Route::get('/incident/{incident}', 'HomeController@showIncident');
 });
@@ -11,4 +11,4 @@ Route::group(['before' => 'is_setup'], function () {
     Route::controller('/setup', 'SetupController');
 });
 
-Route::get('/rss', 'RSSController@feedAction');
+Route::get('/rss', 'RssController@feedAction');
diff --git a/app/routes/auth.php b/app/routes/auth.php
index 520a0d28..c4abf3c6 100644
--- a/app/routes/auth.php
+++ b/app/routes/auth.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['before' => 'has_setting:app_name'], function () {
+Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
     Route::get('/auth/login', ['before' => 'guest', 'as' => 'login', 'uses' => 'AuthController@showLogin']);
     Route::post('/auth/login', ['before' => 'guest|csrf|login_throttling', 'as' => 'logout', 'uses' => 'AuthController@postLogin']);
 });
diff --git a/app/routes/dashboard.php b/app/routes/dashboard.php
index ce1061a1..96c8dc46 100644
--- a/app/routes/dashboard.php
+++ b/app/routes/dashboard.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['before' => 'auth', 'prefix' => 'dashboard'], function () {
+Route::group(['before' => 'auth', 'prefix' => 'dashboard', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
     // Dashboard
     Route::get('/', ['as' => 'dashboard', 'uses' => 'DashboardController@showDashboard']);
 
diff --git a/app/controllers/AuthController.php b/src/Controllers/AuthController.php
similarity index 60%
rename from app/controllers/AuthController.php
rename to src/Controllers/AuthController.php
index 688b4ccb..f6850893 100644
--- a/app/controllers/AuthController.php
+++ b/src/Controllers/AuthController.php
@@ -1,5 +1,15 @@
 <?php
 
+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\View;
+
 /**
  * Logs users into their account.
  */
@@ -24,13 +34,13 @@ class AuthController extends Controller
     {
         if (Auth::attempt(Input::only(['email', 'password']))) {
             return Redirect::intended('dashboard');
-        } else {
-            Throttle::hit(Request::instance(), 10, 10);
-
-            return Redirect::back()
-                           ->withInput(Input::except('password'))
-                           ->with('error', 'Invalid email or password');
         }
+
+        Throttle::hit(Request::instance(), 10, 10);
+
+        return Redirect::back()
+            ->withInput(Input::except('password'))
+            ->with('error', 'Invalid email or password');
     }
 
     /**
diff --git a/app/controllers/DashAPIController.php b/src/Controllers/DashAPIController.php
similarity index 58%
rename from app/controllers/DashAPIController.php
rename to src/Controllers/DashAPIController.php
index 39d5b1cb..f72ad5b5 100644
--- a/app/controllers/DashAPIController.php
+++ b/src/Controllers/DashAPIController.php
@@ -1,23 +1,30 @@
 <?php
 
+namespace CachetHQ\Cachet\Controllers
+
+use Exception;
+use Component;
+use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Input;
+
 class DashAPIController extends Controller
 {
     /**
      * Updates a component with the entered info.
      *
-     * @param Component $component
+     * @param \Component $component
      *
-     * @return array
+     * @throws \Exception
+     *
+     * @return \Component
      */
     public function postUpdateComponent(Component $component)
     {
-        $componentData = Input::all();
-        unset($componentData['_token']);
-        if ($component->update($componentData)) {
-            return $component;
-        } else {
-            App::abort(500);
+        if (!$component->update(Input::except(['_token']))) {
+            throw new Exception('Failed to update the component.');
         }
+
+        return $component;
     }
 
     /**
@@ -32,9 +39,7 @@ class DashAPIController extends Controller
 
         foreach ($componentData['component'] as $componentId => $order) {
             $component = Component::find($componentId);
-            $component->update([
-                'order' => $order,
-            ]);
+            $component->update(['order' => $order]);
         }
 
         return $componentData;
diff --git a/app/controllers/DashComponentController.php b/src/Controllers/DashComponentController.php
similarity index 91%
rename from app/controllers/DashComponentController.php
rename to src/Controllers/DashComponentController.php
index 4ff98b75..d47ca7e1 100644
--- a/app/controllers/DashComponentController.php
+++ b/src/Controllers/DashComponentController.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace CachetHQ\Cachet\Controllers
+
+use Component;
+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/app/controllers/DashIncidentController.php b/src/Controllers/DashIncidentController.php
similarity index 89%
rename from app/controllers/DashIncidentController.php
rename to src/Controllers/DashIncidentController.php
index 7fa55bf9..48a6c280 100644
--- a/app/controllers/DashIncidentController.php
+++ b/src/Controllers/DashIncidentController.php
@@ -1,5 +1,14 @@
 <?php
 
+namespace CachetHQ\Cachet\Controllers
+
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\View;
+use Illuminate\Routing\Controller;
+use Incident;
+use IncidentTemplate;
+
 class DashIncidentController extends Controller
 {
     /**
diff --git a/app/controllers/DashSettingsController.php b/src/Controllers/DashSettingsController.php
similarity index 90%
rename from app/controllers/DashSettingsController.php
rename to src/Controllers/DashSettingsController.php
index 60c43b42..a1258902 100644
--- a/app/controllers/DashSettingsController.php
+++ b/src/Controllers/DashSettingsController.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace CachetHQ\Cachet\Controllers
+
+use Exception;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\View;
+use Illuminate\Routing\Controller;
+use Setting;
+
 class DashSettingsController extends Controller
 {
     protected $subMenu = [];
@@ -105,27 +113,27 @@ class DashSettingsController extends Controller
      */
     public function postSettings()
     {
-        // Fetch all of the settings we've been POSTed.
-        $settings = Input::all();
-
-        if ($settings['remove_banner'] == "1") {
+        if (Input::get('remove_banner') == "1") {
             $setting = Setting::where('name', 'app_banner');
             $setting->delete();
         }
 
-        unset($settings['remove-banner']);
-
         if (Input::hasFile('app_banner')) {
             $file = Input::file('app_banner');
 
             // Image Validation.
             // Image size in bytes.
             $maxSize = $file->getMaxFilesize();
+
             if ($file->getSize() > $maxSize) {
                 return Redirect::back()->withErrorMessage('You need to upload an image that is less than '.$maxSize.'.');
-            } elseif (!$file->isValid() || $file->getError()) {
+            }
+
+            if (!$file->isValid() || $file->getError()) {
                 return Redirect::back()->withErrorMessage($file->getErrorMessage());
-            } elseif (strpos($file->getMimeType(), 'image/') !== 0) {
+            }
+
+            if (strpos($file->getMimeType(), 'image/') !== 0) {
                 return Redirect::back()->withErrorMessage('Only images may be uploaded.');
             }
 
@@ -144,10 +152,8 @@ class DashSettingsController extends Controller
             ]);
         }
 
-        unset($settings['app_banner']);
-
         try {
-            foreach ($settings as $settingName => $settingValue) {
+            foreach (Input::except(['app_banner', 'remove-banner']) as $settingName => $settingValue) {
                 $setting = Setting::firstOrCreate([
                     'name' => $settingName,
                 ])->update([
diff --git a/app/controllers/DashUserController.php b/src/Controllers/DashUserController.php
similarity index 71%
rename from app/controllers/DashUserController.php
rename to src/Controllers/DashUserController.php
index 0c09ca8a..ad4c30c8 100644
--- a/app/controllers/DashUserController.php
+++ b/src/Controllers/DashUserController.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace CachetHQ\Cachet\Controllers
+
+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/app/controllers/DashboardController.php b/src/Controllers/DashboardController.php
similarity index 88%
rename from app/controllers/DashboardController.php
rename to src/Controllers/DashboardController.php
index ef1fc4f1..5c093407 100644
--- a/app/controllers/DashboardController.php
+++ b/src/Controllers/DashboardController.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace CachetHQ\Cachet\Controllers
+
+use Component;
+use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\View;
+
 class DashboardController extends Controller
 {
     /**
diff --git a/app/controllers/HomeController.php b/src/Controllers/HomeController.php
similarity index 55%
rename from app/controllers/HomeController.php
rename to src/Controllers/HomeController.php
index 4774bcd4..756b7d3c 100644
--- a/app/controllers/HomeController.php
+++ b/src/Controllers/HomeController.php
@@ -1,26 +1,14 @@
 <?php
 
+namespace CachetHQ\Cachet\Controllers
+
+use Component;
+use Illuminate\Support\Facades\View;
+use Illuminate\Routing\Controller;
+use Setting;
+
 class HomeController extends Controller
 {
-    /**
-     * The component instance.
-     *
-     * @var \Component
-     */
-    protected $component;
-
-    /**
-     * Create a new home controller instance.
-     *
-     * @param \Component $component
-     *
-     * @return void
-     */
-    public function __construct(Component $component)
-    {
-        $this->component = $component;
-    }
-
     /**
      * Returns the rendered Blade templates.
      *
diff --git a/app/controllers/RSSController.php b/src/Controllers/RssController.php
similarity index 72%
rename from app/controllers/RSSController.php
rename to src/Controllers/RssController.php
index 83188dc4..a6c99fe3 100644
--- a/app/controllers/RSSController.php
+++ b/src/Controllers/RssController.php
@@ -1,6 +1,14 @@
 <?php
 
-class RSSController extends Controller
+namespace CachetHQ\Cachet\Controllers
+
+use Illuminate\Support\Facades\Response;
+use Illuminate\Routing\Controller;
+use Incident;
+use Setting;
+use Thujohn\Rss\RssFacade;
+
+class RssController extends Controller
 {
     /**
      * Generates an RSS feed of all incidents.
@@ -9,11 +17,11 @@ class RSSController extends Controller
      */
     public function feedAction()
     {
-        $feed = RSS::feed('2.0', 'UTF-8');
+        $feed = RssFacade::feed('2.0', 'UTF-8');
         $feed->channel([
-            'title'       => Setting::get('app_name'),
+            'title' => Setting::get('app_name'),
             'description' => 'Status Feed',
-            'link'        => Setting::get('app_domain'),
+            'link' => Setting::get('app_domain'),
         ]);
 
         Incident::get()->map(function ($incident) use ($feed) {
diff --git a/app/controllers/SetupController.php b/src/Controllers/SetupController.php
similarity index 80%
rename from app/controllers/SetupController.php
rename to src/Controllers/SetupController.php
index a1d8b0a7..bc355e76 100644
--- a/app/controllers/SetupController.php
+++ b/src/Controllers/SetupController.php
@@ -1,5 +1,16 @@
 <?php
 
+namespace CachetHQ\Cachet\Controllers
+
+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;
+
 class SetupController extends Controller
 {
     /**
@@ -46,7 +57,7 @@ class SetupController extends Controller
             // Pull the user details out.
             $userDetails = array_pull($postData, 'user');
 
-            // TODO: Do we want to just use Eloquent::unguard() here?
+            // TODO: Do we want to just use Model::unguard() here?
             $user = User::create([
                 'username' => $userDetails['username'],
                 'email'    => $userDetails['email'],
@@ -59,8 +70,8 @@ class SetupController extends Controller
             $settings = array_get($postData, 'settings');
 
             foreach ($settings as $settingName => $settingValue) {
-                $setting        = new Setting();
-                $setting->name  = $settingName;
+                $setting = new Setting();
+                $setting->name = $settingName;
                 $setting->value = $settingValue;
                 $setting->save();
             }