diff --git a/app/config/app.php b/app/config/app.php
index 3e08dfab..08a47e6f 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -157,17 +157,16 @@ return [
 
     'aliases' => [
 
-        'API'      => 'Dingo\Api\Facade\API',
         'App'      => 'Illuminate\Support\Facades\App',
         'Auth'     => 'Illuminate\Support\Facades\Auth',
         'Form'     => 'Illuminate\Support\Facades\Form',
-        'HTML'     => 'Illuminate\Support\Facades\HTML',
         'Input'    => 'Illuminate\Support\Facades\Input',
         'Redirect' => 'Illuminate\Support\Facades\Redirect',
         'Request'  => 'Illuminate\Support\Facades\Request',
         'Response' => 'Illuminate\Support\Facades\Response',
         'Route'    => 'Illuminate\Support\Facades\Route',
         'Session'  => 'Illuminate\Support\Facades\Session',
+        'Setting'  => 'CachetHQ\Cachet\Models\Setting',
         'Str'      => 'Illuminate\Support\Str',
 
     ],
diff --git a/app/database/seeds/ComponentTableSeeder.php b/app/database/seeds/ComponentTableSeeder.php
index d65eb63b..3bddf05e 100644
--- a/app/database/seeds/ComponentTableSeeder.php
+++ b/app/database/seeds/ComponentTableSeeder.php
@@ -1,5 +1,6 @@
 <?php
 
+use CachetHQ\Cachet\Models\Component;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
 
diff --git a/app/database/seeds/IncidentTableSeeder.php b/app/database/seeds/IncidentTableSeeder.php
index 33963d87..bd8f5daf 100644
--- a/app/database/seeds/IncidentTableSeeder.php
+++ b/app/database/seeds/IncidentTableSeeder.php
@@ -1,5 +1,6 @@
 <?php
 
+use CachetHQ\Cachet\Models\Incident;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
 
diff --git a/app/database/seeds/SettingsTableSeeder.php b/app/database/seeds/SettingsTableSeeder.php
index 27b458de..ef6c139c 100644
--- a/app/database/seeds/SettingsTableSeeder.php
+++ b/app/database/seeds/SettingsTableSeeder.php
@@ -1,5 +1,6 @@
 <?php
 
+use CachetHQ\Cachet\Models\Setting;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
 
diff --git a/app/database/seeds/UsersTableSeeder.php b/app/database/seeds/UsersTableSeeder.php
index 142a23dc..e5990e91 100644
--- a/app/database/seeds/UsersTableSeeder.php
+++ b/app/database/seeds/UsersTableSeeder.php
@@ -1,5 +1,6 @@
 <?php
 
+use CachetHQ\Cachet\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
 
diff --git a/app/filters.php b/app/filters.php
deleted file mode 100644
index 5092c7a6..00000000
--- a/app/filters.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-Route::filter('is_setup', 'IsSetupFilter');
-Route::filter('has_setting', 'HasSettingFilter');
-Route::filter('cors', 'CORSFilter');
-Route::filter('allowed_domains', 'AllowedDomainsFilter');
-Route::filter('login_throttling', 'LoginThrottlingFilter');
-
-/*
-|--------------------------------------------------------------------------
-| Authentication Filters
-|--------------------------------------------------------------------------
-|
-| The following filters are used to verify that the user of the current
-| session is logged into this application. The "basic" filter easily
-| integrates HTTP Basic authentication for quick, simple checking.
-|
-*/
-
-Route::filter('auth', function () {
-    if (Auth::guest()) {
-        if (Request::ajax()) {
-            return Response::make('Unauthorized', 401);
-        } else {
-            return Redirect::guest('auth/login');
-        }
-    }
-});
-
-Route::filter('auth.basic', function () {
-    return Auth::basic();
-});
-
-/*
-|--------------------------------------------------------------------------
-| Guest Filter
-|--------------------------------------------------------------------------
-|
-| The "guest" filter is the counterpart of the authentication filters as
-| it simply checks that the current user is not logged in. A redirect
-| response will be issued if they are, which you may freely change.
-|
-*/
-
-Route::filter('guest', function () {
-    if (Auth::check()) {
-        return Redirect::to('/');
-    }
-});
-
-/*
-|--------------------------------------------------------------------------
-| CSRF Protection Filter
-|--------------------------------------------------------------------------
-|
-| The CSRF filter is responsible for protecting your application against
-| cross-site request forgery attacks. If this special token in a user
-| session does not match the one given in this request, we'll bail.
-|
-*/
-
-Route::filter('csrf', function () {
-    if (Session::token() !== Input::get('_token')) {
-        throw new Illuminate\Session\TokenMismatchException();
-    }
-});
diff --git a/app/filters/CORSFilter.php b/app/filters/CORSFilter.php
deleted file mode 100644
index 3d44b467..00000000
--- a/app/filters/CORSFilter.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-class CORSFilter
-{
-    public function filter($route, $request, $response)
-    {
-        $response->headers->set('Access-Control-Allow-Origin', '*');
-
-        return $response;
-    }
-}
diff --git a/app/routes.php b/app/routes.php
deleted file mode 100644
index 7b941a91..00000000
--- a/app/routes.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-Route::model('component', 'Component');
-Route::model('incident', 'Incident');
-Route::model('incident_template', 'IncidentTemplate');
-Route::model('setting', 'Setting');
-// Route::model('webhook', 'WebHook');
-Route::model('user', 'User');
diff --git a/app/routes/api.php b/app/routes/api.php
index 3e04d802..0c28a59f 100644
--- a/app/routes/api.php
+++ b/app/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::api(['after' => 'allowed_domains', 'namespace' => 'CachetHQ\Cachet\Controllers\Api', 'version' => 'v1'], function () {
+Route::api(['after' => 'allowed_domains', 'namespace' => 'CachetHQ\Cachet\Http\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 0705560c..496cab35 100644
--- a/app/routes/app.php
+++ b/app/routes/app.php
@@ -1,16 +1,16 @@
 <?php
 
 // Prevent access until the app is setup.
-Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
+Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     Route::get('/', ['as' => 'status-page', 'uses' => 'HomeController@showIndex']);
     Route::get('/incident/{incident}', 'HomeController@showIncident');
 });
 
 // Setup route.
-Route::group(['before' => 'is_setup', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
+Route::group(['before' => 'is_setup', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     Route::controller('/setup', 'SetupController');
 });
 
-Route::group(['namespace' => 'CachetHQ\Cachet\Controllers'], function () {
+Route::group(['namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     Route::get('/rss', 'RssController@feedAction');
 });
diff --git a/app/routes/auth.php b/app/routes/auth.php
index bc5eb71e..768af167 100644
--- a/app/routes/auth.php
+++ b/app/routes/auth.php
@@ -1,10 +1,10 @@
 <?php
 
-Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
+Route::group(['before' => 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Http\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']);
 });
 
-Route::group(['before' => 'auth', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
+Route::group(['before' => 'auth', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     Route::get('/auth/logout', ['as' => 'logout', 'uses' => 'AuthController@logoutAction']);
 });
diff --git a/app/routes/dashboard.php b/app/routes/dashboard.php
index 96c8dc46..449730fe 100644
--- a/app/routes/dashboard.php
+++ b/app/routes/dashboard.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['before' => 'auth', 'prefix' => 'dashboard', 'namespace' => 'CachetHQ\Cachet\Controllers'], function () {
+Route::group(['before' => 'auth', 'prefix' => 'dashboard', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
     // Dashboard
     Route::get('/', ['as' => 'dashboard', 'uses' => 'DashboardController@showDashboard']);
 
diff --git a/app/start/global.php b/app/start/global.php
index 42b3e59e..2d046af7 100644
--- a/app/start/global.php
+++ b/app/start/global.php
@@ -1,5 +1,6 @@
 <?php
 
+use Dingo\Api\Facade\API;
 use Illuminate\Support\Facades\Log;
 
 /*
@@ -63,15 +64,11 @@ App::down(function () {
 
 /*
 |--------------------------------------------------------------------------
-| Require The Filters File
+| View Composers
 |--------------------------------------------------------------------------
 |
-| Next we will load the filters file for the application. This gives us
-| a nice separate location to store our route and application filter
-| definitions instead of putting them all in the main routes file.
+| Register Cachet's view composers.
 |
 */
 
-require app_path().'/filters.php';
-require app_path().'/view-composers.php';
-require app_path().'/helpers.php';
+require app_path('view-composers.php');
diff --git a/app/view-composers.php b/app/view-composers.php
index ead11ffc..747b953f 100644
--- a/app/view-composers.php
+++ b/app/view-composers.php
@@ -1,5 +1,7 @@
 <?php
 
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Incident;
 use Illuminate\Support\Facades\View;
 
 View::composer('index', function ($view) {
diff --git a/bootstrap/start.php b/bootstrap/start.php
index 465e5228..f2450be3 100644
--- a/bootstrap/start.php
+++ b/bootstrap/start.php
@@ -54,8 +54,7 @@ $app->bindInstallPaths(require __DIR__.'/paths.php');
 |
 */
 
-$framework = $app['path.base'].
-                 '/vendor/laravel/framework/src';
+$framework = $app['path.base'].'/vendor/laravel/framework/src';
 
 require $framework.'/Illuminate/Foundation/start.php';
 
diff --git a/composer.json b/composer.json
index b2a16a1a..cc0c4316 100644
--- a/composer.json
+++ b/composer.json
@@ -28,9 +28,10 @@
     "autoload": {
         "classmap": [
             "app/database/migrations",
-            "app/database/seeds",
-            "app/filters",
-            "app/models"
+            "app/database/seeds"
+        ],
+        "files": [
+            "src/helpers.php"
         ],
         "psr-4": {
             "CachetHQ\\Cachet\\": "src/"
@@ -38,7 +39,7 @@
     },
     "autoload-dev": {
         "classmap": [
-            "app/tests/TestCase.php"
+            "tests/TestCase.php"
         ]
     },
     "extra": {
diff --git a/composer.lock b/composer.lock
index 435b5478..11dc9fd5 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": "af0ee6e5bc07e350732bc7c907e3b2ae",
+    "hash": "bb692ec0057ca30fa36edd005963b3cb",
     "packages": [
         {
             "name": "classpreloader/classpreloader",
diff --git a/phpunit.xml b/phpunit.xml
index b60b43d4..0065cf7e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -15,14 +15,12 @@
 >
     <testsuites>
         <testsuite name="Cachet Test Suite">
-            <directory>./app/tests/</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>
-            <directory suffix=".php">./app/filters</directory>
-            <directory suffix=".php">./app/models</directory>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/src/Commands/OneClickDeployCommand.php b/src/Console/Commands/OneClickDeployCommand.php
similarity index 97%
rename from src/Commands/OneClickDeployCommand.php
rename to src/Console/Commands/OneClickDeployCommand.php
index 1621eb60..78a1dfc5 100644
--- a/src/Commands/OneClickDeployCommand.php
+++ b/src/Console/Commands/OneClickDeployCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Commands;
+namespace CachetHQ\Cachet\Console\Commands;
 
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/app/filters/AllowedDomainsFilter.php b/src/Http/After/AllowedDomainsFilter.php
similarity index 67%
rename from app/filters/AllowedDomainsFilter.php
rename to src/Http/After/AllowedDomainsFilter.php
index ec0aab74..497dddb9 100644
--- a/app/filters/AllowedDomainsFilter.php
+++ b/src/Http/After/AllowedDomainsFilter.php
@@ -1,8 +1,15 @@
 <?php
 
+namespace CachetHQ\Cachet\Http\After;
+
+use CachetHQ\Cachet\Models\Setting;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
+use Symfony\Component\HttpFoundation\Response;
+
 class AllowedDomainsFilter
 {
-    public function filter($route, $request, $response)
+    public function filter(Route $route, Request $request, Response $response)
     {
         // Always allow our own domain.
         $ourDomain = Setting::get('app_domain');
diff --git a/src/Http/After/CorsFilter.php b/src/Http/After/CorsFilter.php
new file mode 100644
index 00000000..0cd561d4
--- /dev/null
+++ b/src/Http/After/CorsFilter.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace CachetHQ\Cachet\Http\After;
+
+use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
+use Symfony\Component\HttpFoundation\Response;
+
+class CorsFilter
+{
+    public function filter(Route $route, Request $request, Response $response)
+    {
+        $response->headers->set('Access-Control-Allow-Origin', '*');
+
+        return $response;
+    }
+}
diff --git a/src/Http/Before/AuthBasicFilter.php b/src/Http/Before/AuthBasicFilter.php
new file mode 100644
index 00000000..599f6223
--- /dev/null
+++ b/src/Http/Before/AuthBasicFilter.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace CachetHQ\Cachet\Http\Before;
+
+use Illuminate\Support\Facades\Auth;
+
+class AuthBasicFilter
+{
+    public function filter()
+    {
+        return Auth::basic();
+    }
+}
diff --git a/src/Http/Before/AuthFilter.php b/src/Http/Before/AuthFilter.php
new file mode 100644
index 00000000..5524b33d
--- /dev/null
+++ b/src/Http/Before/AuthFilter.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace CachetHQ\Cachet\Http\Before;
+
+use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
+
+class AuthFilter
+{
+    public function filter(Route $route, Request $request)
+    {
+        if (Auth::guest()) {
+            if ($request->ajax()) {
+                return Response::make('Unauthorized', 401);
+            } else {
+                return Redirect::guest('auth/login');
+            }
+        }
+    }
+}
diff --git a/src/Http/Before/CsrfFilter.php b/src/Http/Before/CsrfFilter.php
new file mode 100644
index 00000000..50bfa83f
--- /dev/null
+++ b/src/Http/Before/CsrfFilter.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace CachetHQ\Cachet\Http\Before;
+
+use Illuminate\Session\TokenMismatchException;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Session;
+
+class CsrfFilter
+{
+    public function filter()
+    {
+        if (Session::token() !== Input::get('_token')) {
+            throw new TokenMismatchException();
+        }
+    }
+}
diff --git a/src/Http/Before/GuestFilter.php b/src/Http/Before/GuestFilter.php
new file mode 100644
index 00000000..b320abe8
--- /dev/null
+++ b/src/Http/Before/GuestFilter.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace CachetHQ\Cachet\Http\Before;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Redirect;
+
+class GuestFilter
+{
+    public function filter()
+    {
+        if (Auth::check()) {
+            return Redirect::to('/');
+        }
+    }
+}
diff --git a/app/filters/HasSettingFilter.php b/src/Http/Before/HasSettingFilter.php
similarity index 53%
rename from app/filters/HasSettingFilter.php
rename to src/Http/Before/HasSettingFilter.php
index 8a5eb4de..97302afe 100644
--- a/app/filters/HasSettingFilter.php
+++ b/src/Http/Before/HasSettingFilter.php
@@ -1,8 +1,16 @@
 <?php
 
+namespace CachetHQ\Cachet\Http\Before;
+
+use CachetHQ\Cachet\Models\Setting;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
+use Illuminate\Support\Facades\Redirect;
+
 class HasSettingFilter
 {
-    public function filter($route, $request, $settingName)
+    public function filter(Route $route, Request $request, $settingName)
     {
         try {
             $setting = Setting::where('name', $settingName)->first();
diff --git a/app/filters/IsSetupFilter.php b/src/Http/Before/IsSetupFilter.php
similarity index 53%
rename from app/filters/IsSetupFilter.php
rename to src/Http/Before/IsSetupFilter.php
index 3eb44886..b8f1a2a9 100644
--- a/app/filters/IsSetupFilter.php
+++ b/src/Http/Before/IsSetupFilter.php
@@ -1,8 +1,16 @@
 <?php
 
+namespace CachetHQ\Cachet\Http\Before;
+
+use CachetHQ\Cachet\Models\Setting;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
+use Illuminate\Support\Facades\Redirect;
+
 class IsSetupFilter
 {
-    public function filter($route, $request)
+    public function filter(Route $route, Request $request)
     {
         try {
             $setting = Setting::where('name', 'app_name')->first();
diff --git a/app/filters/LoginThrottlingFilter.php b/src/Http/Before/LoginThrottlingFilter.php
similarity index 67%
rename from app/filters/LoginThrottlingFilter.php
rename to src/Http/Before/LoginThrottlingFilter.php
index 80b3dc86..5b3a6e48 100644
--- a/app/filters/LoginThrottlingFilter.php
+++ b/src/Http/Before/LoginThrottlingFilter.php
@@ -1,10 +1,15 @@
 <?php
 
+namespace CachetHQ\Cachet\Http\Before;
+
 use GrahamCampbell\Throttle\Facades\Throttle;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
+use Illuminate\Support\Facades\Redirect;
 
 class LoginThrottlingFilter
 {
-    public function filter($route, $request)
+    public function filter(Route $route, Request $request)
     {
         // check if we've reached the rate limit, but don't hit the throttle yet
         // we can hit the throttle later on in the if validation passes
diff --git a/src/Controllers/Api/ComponentController.php b/src/Http/Controllers/Api/ComponentController.php
similarity index 87%
rename from src/Controllers/Api/ComponentController.php
rename to src/Http/Controllers/Api/ComponentController.php
index 7387e1a6..ee30b707 100644
--- a/src/Controllers/Api/ComponentController.php
+++ b/src/Http/Controllers/Api/ComponentController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers\Api;
+namespace CachetHQ\Cachet\Http\Controllers\Api;
 
 use CachetHQ\Cachet\Repositories\Component\ComponentRepository;
 use Dingo\Api\Routing\ControllerTrait;
@@ -45,7 +45,7 @@ class ComponentController extends Controller
      *
      * @param int $id
      *
-     * @return \Component
+     * @return \CachetHQ\Cachet\Models\Component
      */
     public function getComponent($id)
     {
@@ -55,9 +55,9 @@ class ComponentController extends Controller
     /**
      * Return a component with incidents.
      *
-     * @param int $id Component ID
+     * @param int $id
      *
-     * @return \Component
+     * @return \CachetHQ\Cachet\Models\Component
      */
     public function getComponentIncidents($id)
     {
@@ -67,7 +67,7 @@ class ComponentController extends Controller
     /**
      * Create a new component.
      *
-     * @return \Component
+     * @return \CachetHQ\Cachet\Models\Component
      */
     public function postComponents()
     {
diff --git a/src/Controllers/Api/IncidentController.php b/src/Http/Controllers/Api/IncidentController.php
similarity index 88%
rename from src/Controllers/Api/IncidentController.php
rename to src/Http/Controllers/Api/IncidentController.php
index 63b16e2e..85484e71 100644
--- a/src/Controllers/Api/IncidentController.php
+++ b/src/Http/Controllers/Api/IncidentController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers\Api;
+namespace CachetHQ\Cachet\Http\Controllers\Api;
 
 use CachetHQ\Cachet\Repositories\Incident\IncidentRepository;
 use Dingo\Api\Routing\ControllerTrait;
@@ -45,7 +45,7 @@ class IncidentController extends Controller
      *
      * @param int $id
      *
-     * @return \Incident
+     * @return \CachetHQ\Cachet\Models\Incident
      */
     public function getIncident($id)
     {
@@ -55,7 +55,7 @@ class IncidentController extends Controller
     /**
      * Create a new incident.
      *
-     * @return \Incident
+     * @return \CachetHQ\Cachet\Models\Incident
      */
     public function postIncidents()
     {
@@ -67,7 +67,7 @@ class IncidentController extends Controller
      *
      * @param int $id
      *
-     * @return \Incident
+     * @return \CachetHQ\Cachet\Models\Incident
      */
     public function putIncident($id)
     {
diff --git a/src/Controllers/Api/MetricController.php b/src/Http/Controllers/Api/MetricController.php
similarity index 88%
rename from src/Controllers/Api/MetricController.php
rename to src/Http/Controllers/Api/MetricController.php
index 0070a412..de07e9e7 100644
--- a/src/Controllers/Api/MetricController.php
+++ b/src/Http/Controllers/Api/MetricController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers\Api;
+namespace CachetHQ\Cachet\Http\Controllers\Api;
 
 use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
 use Dingo\Api\Routing\ControllerTrait;
@@ -44,7 +44,7 @@ class MetricController extends Controller
      *
      * @param int $id
      *
-     * @return \Metric
+     * @return \CachetHQ\Cachet\Models\Metric
      */
     public function getMetric($id)
     {
@@ -54,7 +54,7 @@ class MetricController extends Controller
     /**
      * Create a new metric.
      *
-     * @return \Metric
+     * @return \CachetHQ\Cachet\Models\Metric
      */
     public function postMetrics()
     {
@@ -66,7 +66,7 @@ class MetricController extends Controller
      *
      * @param int $id
      *
-     * @return \Metric
+     * @return \CachetHQ\Cachet\Models\Metric
      */
     public function putMetric($id)
     {
diff --git a/src/Controllers/Api/MetricPointController.php b/src/Http/Controllers/Api/MetricPointController.php
similarity index 89%
rename from src/Controllers/Api/MetricPointController.php
rename to src/Http/Controllers/Api/MetricPointController.php
index 996c194f..ffa9299b 100644
--- a/src/Controllers/Api/MetricPointController.php
+++ b/src/Http/Controllers/Api/MetricPointController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers\Api;
+namespace CachetHQ\Cachet\Http\Controllers\Api;
 
 use CachetHQ\Cachet\Repositories\MetricPoint\MetricPointRepository;
 use Dingo\Api\Routing\ControllerTrait;
@@ -44,7 +44,7 @@ class MetricPointController extends Controller
      *
      * @param int $id
      *
-     * @return \MetricPoint
+     * @return \CachetHQ\Cachet\Models\MetricPoint
      */
     public function getMetricPoint($id)
     {
@@ -54,7 +54,7 @@ class MetricPointController extends Controller
     /**
      * Create a new metric point.
      *
-     * @return \MetricPoint
+     * @return \CachetHQ\Cachet\Models\MetricPoint
      */
     public function postMetricPoints()
     {
diff --git a/src/Controllers/AuthController.php b/src/Http/Controllers/AuthController.php
similarity index 96%
rename from src/Controllers/AuthController.php
rename to src/Http/Controllers/AuthController.php
index 65b21848..5dee003d 100644
--- a/src/Controllers/AuthController.php
+++ b/src/Http/Controllers/AuthController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
 use GrahamCampbell\Throttle\Facades\Throttle;
 use Illuminate\Routing\Controller;
diff --git a/src/Controllers/DashAPIController.php b/src/Http/Controllers/DashAPIController.php
similarity index 83%
rename from src/Controllers/DashAPIController.php
rename to src/Http/Controllers/DashAPIController.php
index d254dd65..1c83afd4 100644
--- a/src/Controllers/DashAPIController.php
+++ b/src/Http/Controllers/DashAPIController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
-use Component;
+use CachetHQ\Cachet\Models\Component;
 use Exception;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Input;
@@ -12,11 +12,11 @@ class DashAPIController extends Controller
     /**
      * Updates a component with the entered info.
      *
-     * @param \Component $component
+     * @param \CachetHQ\Cachet\Models\Component $component
      *
      * @throws \Exception
      *
-     * @return \Component
+     * @return \CachetHQ\Cachet\Models\Component
      */
     public function postUpdateComponent(Component $component)
     {
diff --git a/src/Controllers/DashComponentController.php b/src/Http/Controllers/DashComponentController.php
similarity index 89%
rename from src/Controllers/DashComponentController.php
rename to src/Http/Controllers/DashComponentController.php
index 5ec8d00b..eaf856fe 100644
--- a/src/Controllers/DashComponentController.php
+++ b/src/Http/Controllers/DashComponentController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
-use Component;
+use CachetHQ\Cachet\Models\Component;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redirect;
@@ -28,7 +28,7 @@ class DashComponentController extends Controller
     /**
      * Shows the edit component view.
      *
-     * @param \Component $component
+     * @param \CachetHQ\Cachet\Models\Component $component
      *
      * @return \Illuminate\View\View
      */
@@ -43,7 +43,7 @@ class DashComponentController extends Controller
     /**
      * Updates a component.
      *
-     * @param \Component $component
+     * @param \CachetHQ\Cachet\Models\Component $component
      *
      * @return \Illuminate\Http\RedirectResponse
      */
@@ -83,7 +83,7 @@ class DashComponentController extends Controller
     /**
      * Deletes a given component.
      *
-     * @param \Component $component
+     * @param \CachetHQ\Cachet\Models\Component $component
      *
      * @return \Illuminate\Http\RedirectResponse
      */
diff --git a/src/Controllers/DashIncidentController.php b/src/Http/Controllers/DashIncidentController.php
similarity index 91%
rename from src/Controllers/DashIncidentController.php
rename to src/Http/Controllers/DashIncidentController.php
index 906f2269..1b75522a 100644
--- a/src/Controllers/DashIncidentController.php
+++ b/src/Http/Controllers/DashIncidentController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
+use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\IncidentTemplate;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
-use Incident;
-use IncidentTemplate;
 
 class DashIncidentController extends Controller
 {
@@ -79,7 +79,7 @@ class DashIncidentController extends Controller
     /**
      * Deletes a given incident.
      *
-     * @param \Incident $incident
+     * @param \CachetHQ\Cachet\Models\Incident $incident
      *
      * @return \Illuminate\Http\RedirectResponse
      */
diff --git a/src/Controllers/DashSettingsController.php b/src/Http/Controllers/DashSettingsController.php
similarity index 98%
rename from src/Controllers/DashSettingsController.php
rename to src/Http/Controllers/DashSettingsController.php
index 064fff79..ab1c7b27 100644
--- a/src/Controllers/DashSettingsController.php
+++ b/src/Http/Controllers/DashSettingsController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
+use CachetHQ\Cachet\Models\Setting;
 use Exception;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
-use Setting;
 
 class DashSettingsController extends Controller
 {
diff --git a/src/Controllers/DashUserController.php b/src/Http/Controllers/DashUserController.php
similarity index 94%
rename from src/Controllers/DashUserController.php
rename to src/Http/Controllers/DashUserController.php
index 4c2d4c34..47cadc3f 100644
--- a/src/Controllers/DashUserController.php
+++ b/src/Http/Controllers/DashUserController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
diff --git a/src/Controllers/DashboardController.php b/src/Http/Controllers/DashboardController.php
similarity index 92%
rename from src/Controllers/DashboardController.php
rename to src/Http/Controllers/DashboardController.php
index 90d90eae..488a21a3 100644
--- a/src/Controllers/DashboardController.php
+++ b/src/Http/Controllers/DashboardController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
-use Component;
+use CachetHQ\Cachet\Models\Component;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\View;
 
diff --git a/src/Controllers/HomeController.php b/src/Http/Controllers/HomeController.php
similarity index 87%
rename from src/Controllers/HomeController.php
rename to src/Http/Controllers/HomeController.php
index c1adafa6..5e54668d 100644
--- a/src/Controllers/HomeController.php
+++ b/src/Http/Controllers/HomeController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
+use CachetHQ\Cachet\Models\Component;
+use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\Setting;
 use Carbon\Carbon;
-use Component;
 use GrahamCampbell\Markdown\Facades\Markdown;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\View;
-use Incident;
-use Setting;
 
 class HomeController extends Controller
 {
diff --git a/src/Controllers/RssController.php b/src/Http/Controllers/RssController.php
similarity index 91%
rename from src/Controllers/RssController.php
rename to src/Http/Controllers/RssController.php
index 1b914cbc..652651c5 100644
--- a/src/Controllers/RssController.php
+++ b/src/Http/Controllers/RssController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
+use CachetHQ\Cachet\Models\Incident;
+use CachetHQ\Cachet\Models\Setting;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Response;
-use Incident;
-use Setting;
 use Thujohn\Rss\RssFacade;
 
 class RssController extends Controller
diff --git a/src/Controllers/SetupController.php b/src/Http/Controllers/SetupController.php
similarity index 95%
rename from src/Controllers/SetupController.php
rename to src/Http/Controllers/SetupController.php
index 1a6987d8..627d9721 100644
--- a/src/Controllers/SetupController.php
+++ b/src/Http/Controllers/SetupController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace CachetHQ\Cachet\Controllers;
+namespace CachetHQ\Cachet\Http\Controllers;
 
+use CachetHQ\Cachet\Models\Setting;
+use CachetHQ\Cachet\Models\User;
 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 Setting;
-use User;
 
 class SetupController extends Controller
 {
diff --git a/app/models/Component.php b/src/Models/Component.php
similarity index 94%
rename from app/models/Component.php
rename to src/Models/Component.php
index 26c9212b..5a2d71e3 100644
--- a/app/models/Component.php
+++ b/src/Models/Component.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use CachetHQ\Cachet\Transformers\ComponentTransformer;
 use Dingo\Api\Transformer\TransformableInterface;
 use Illuminate\Database\Eloquent\Builder;
@@ -37,7 +39,7 @@ class Component extends Model implements TransformableInterface
      */
     public function incidents()
     {
-        return $this->hasMany('Incident', 'component_id', 'id');
+        return $this->hasMany('CachetHQ\Cachet\Models\Incident', 'component_id', 'id');
     }
 
     /**
diff --git a/app/models/Incident.php b/src/Models/Incident.php
similarity index 95%
rename from app/models/Incident.php
rename to src/Models/Incident.php
index 8753f723..0c1996bc 100644
--- a/app/models/Incident.php
+++ b/src/Models/Incident.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use CachetHQ\Cachet\Transformers\IncidentTransformer;
 use Dingo\Api\Transformer\TransformableInterface;
 use GrahamCampbell\Markdown\Facades\Markdown;
@@ -45,7 +47,7 @@ class Incident extends Model implements TransformableInterface
      */
     public function component()
     {
-        return $this->belongsTo('Component', 'component_id', 'id');
+        return $this->belongsTo('CachetHQ\Cachet\Models\Component', 'component_id', 'id');
     }
 
     /**
diff --git a/app/models/IncidentTemplate.php b/src/Models/IncidentTemplate.php
similarity index 95%
rename from app/models/IncidentTemplate.php
rename to src/Models/IncidentTemplate.php
index 137b2f25..8aad1502 100644
--- a/app/models/IncidentTemplate.php
+++ b/src/Models/IncidentTemplate.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Str;
 use Watson\Validating\ValidatingTrait;
diff --git a/app/models/Metric.php b/src/Models/Metric.php
similarity index 91%
rename from app/models/Metric.php
rename to src/Models/Metric.php
index cd29c371..ba4abac0 100644
--- a/app/models/Metric.php
+++ b/src/Models/Metric.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use CachetHQ\Cachet\Transformers\MetricTransformer;
 use Dingo\Api\Transformer\TransformableInterface;
 use Illuminate\Database\Eloquent\Model;
@@ -34,7 +36,7 @@ class Metric extends Model implements TransformableInterface
      */
     public function points()
     {
-        return $this->hasMany('MetricPoint', 'metric_id', 'id');
+        return $this->hasMany('CachetHQ\Cachet\Models\MetricPoint', 'metric_id', 'id');
     }
 
     /**
diff --git a/app/models/MetricPoint.php b/src/Models/MetricPoint.php
similarity index 68%
rename from app/models/MetricPoint.php
rename to src/Models/MetricPoint.php
index 463f10e5..863ac57e 100644
--- a/app/models/MetricPoint.php
+++ b/src/Models/MetricPoint.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use Illuminate\Database\Eloquent\Model;
 
 class MetricPoint extends Model
@@ -11,6 +13,6 @@ class MetricPoint extends Model
      */
     public function metric()
     {
-        return $this->belongsTo('Metric', 'id', 'metric_id');
+        return $this->belongsTo('CachetHQ\Cachet\Models\Metric', 'id', 'metric_id');
     }
 }
diff --git a/app/models/Service.php b/src/Models/Service.php
similarity index 96%
rename from app/models/Service.php
rename to src/Models/Service.php
index dc58ba70..d3e233af 100644
--- a/app/models/Service.php
+++ b/src/Models/Service.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use Illuminate\Database\Eloquent\Model;
 use Watson\Validating\ValidatingTrait;
 
diff --git a/app/models/Setting.php b/src/Models/Setting.php
similarity index 95%
rename from app/models/Setting.php
rename to src/Models/Setting.php
index a2d46cba..ee9e9f4a 100644
--- a/app/models/Setting.php
+++ b/src/Models/Setting.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use Illuminate\Database\Eloquent\Model;
 
 class Setting extends Model
diff --git a/app/models/Subscriber.php b/src/Models/Subscriber.php
similarity index 93%
rename from app/models/Subscriber.php
rename to src/Models/Subscriber.php
index be66c440..85731427 100644
--- a/app/models/Subscriber.php
+++ b/src/Models/Subscriber.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletingTrait;
 use Watson\Validating\ValidatingTrait;
diff --git a/app/models/User.php b/src/Models/User.php
similarity index 97%
rename from app/models/User.php
rename to src/Models/User.php
index 5af4e37a..0b04b44f 100644
--- a/app/models/User.php
+++ b/src/Models/User.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use Illuminate\Auth\Reminders\RemindableInterface;
 use Illuminate\Auth\Reminders\RemindableTrait;
 use Illuminate\Auth\UserInterface;
diff --git a/app/models/WebHook.php b/src/Models/WebHook.php
similarity index 89%
rename from app/models/WebHook.php
rename to src/Models/WebHook.php
index 10f44c66..4b52bf66 100644
--- a/app/models/WebHook.php
+++ b/src/Models/WebHook.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use Illuminate\Database\Eloquent\Builder;
@@ -17,7 +19,7 @@ class WebHook extends Model
     /**
      * Returns all responses for a WebHook.
      *
-     * @return \Illuminate\Database\Eloquent\Builder
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function response()
     {
@@ -37,9 +39,9 @@ class WebHook extends Model
     }
 
     /**
-     * Setups a Ping event that is fired upon a web hook.
+     * Setups a ping event that is fired upon a web hook.
      *
-     * @return object
+     * @return \CachetHQ\Cachet\Models\WebHookResponse
      */
     public function ping()
     {
@@ -49,10 +51,10 @@ class WebHook extends Model
     /**
      * Fires the actual web hook event.
      *
-     * @param string $eventType the event to send X-Cachet-Event
+     * @param string $eventType The event to send X-Cachet-Event
      * @param mixed  $data      Data to send to the Web Hook
      *
-     * @return object
+     * @return \CachetHQ\Cachet\Models\WebHookResponse
      */
     public function fire($eventType, $data = null)
     {
diff --git a/app/models/WebHookResponse.php b/src/Models/WebHookResponse.php
similarity index 90%
rename from app/models/WebHookResponse.php
rename to src/Models/WebHookResponse.php
index e11e7f21..10a11ab8 100644
--- a/app/models/WebHookResponse.php
+++ b/src/Models/WebHookResponse.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace CachetHQ\Cachet\Models;
+
 use Illuminate\Database\Eloquent\Model;
 
 class WebHookResponse extends Model
diff --git a/src/Providers/ConsoleServiceProvider.php b/src/Providers/ConsoleServiceProvider.php
index 368c78a1..b383dcab 100644
--- a/src/Providers/ConsoleServiceProvider.php
+++ b/src/Providers/ConsoleServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace CachetHQ\Cachet\Providers;
 
-use CachetHQ\Cachet\Commands\OneClickDeployCommand;
+use CachetHQ\Cachet\Console\Commands\OneClickDeployCommand;
 use Illuminate\Support\ServiceProvider;
 
 class ConsoleServiceProvider extends ServiceProvider
@@ -14,7 +14,7 @@ class ConsoleServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->commands('CachetHQ\Cachet\Commands\OneClickDeployCommand');
+        $this->commands('CachetHQ\Cachet\Console\Commands\OneClickDeployCommand');
     }
 
     /**
@@ -24,7 +24,7 @@ class ConsoleServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('CachetHQ\Cachet\Commands\OneClickDeployCommand', function ($app) {
+        $this->app->singleton('CachetHQ\Cachet\Console\Commands\OneClickDeployCommand', function ($app) {
             return new OneClickDeployCommand($app->environment('heroku'));
         });
     }
diff --git a/src/Providers/RoutingServiceProvider.php b/src/Providers/RoutingServiceProvider.php
index 97011fd3..32219fb7 100644
--- a/src/Providers/RoutingServiceProvider.php
+++ b/src/Providers/RoutingServiceProvider.php
@@ -12,6 +12,40 @@ class RoutingServiceProvider extends ServiceProvider
      * @return void
      */
     public function boot()
+    {
+        $this->registerFilters();
+        $this->registerBindings();
+        $this->registerRoutes();
+    }
+
+    protected function registerFilters()
+    {
+        // Laravel's before filters
+        $this->app->router->filter('auth', 'CachetHQ\Cachet\Http\Before\AuthFilter');
+        $this->app->router->filter('auth.basic', 'CachetHQ\Cachet\Http\Before\AuthBasicFilter');
+        $this->app->router->filter('guest', 'CachetHQ\Cachet\Http\Before\GuestFilter');
+        $this->app->router->filter('csrf', 'CachetHQ\Cachet\Http\Before\CsrfFilter');
+
+        // Cachet's before filters
+        $this->app->router->filter('is_setup', 'CachetHQ\Cachet\Http\Before\IsSetupFilter');
+        $this->app->router->filter('has_setting', 'CachetHQ\Cachet\Http\Before\HasSettingFilter');
+        $this->app->router->filter('login_throttling', 'CachetHQ\Cachet\Http\Before\LoginThrottlingFilter');
+
+        // Cachet's after filters
+        $this->app->router->filter('allowed_domains', 'CachetHQ\Cachet\Http\After\AllowedDomainsFilter');
+        $this->app->router->filter('cors', 'CachetHQ\Cachet\Http\After\CorsFilter');
+    }
+
+    protected function registerBindings()
+    {
+        $this->app->router->model('component', 'CachetHQ\Cachet\Models\Component');
+        $this->app->router->model('incident', 'CachetHQ\Cachet\Models\Incident');
+        $this->app->router->model('incident_template', 'CachetHQ\Cachet\Models\IncidentTemplate');
+        $this->app->router->model('setting', 'CachetHQ\Cachet\Models\Setting');
+        $this->app->router->model('user', 'CachetHQ\Cachet\Models\User');
+    }
+
+    protected function registerRoutes()
     {
         $files = glob(app_path('routes').'/*.php');
 
diff --git a/src/Repositories/Component/EloquentComponentRepository.php b/src/Repositories/Component/EloquentComponentRepository.php
index e443f0e1..7420fff6 100644
--- a/src/Repositories/Component/EloquentComponentRepository.php
+++ b/src/Repositories/Component/EloquentComponentRepository.php
@@ -2,22 +2,22 @@
 
 namespace CachetHQ\Cachet\Repositories\Component;
 
+use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Repositories\EloquentRepository;
-use Component;
 
 class EloquentComponentRepository extends EloquentRepository implements ComponentRepository
 {
     /**
      * The eloquent model instance.
      *
-     * @var \Component
+     * @var \CachetHQ\Cachet\Models\Component
      */
     protected $model;
 
     /**
      * Create a new eloquent component repository instance.
      *
-     * @param \Component $model
+     * @param \CachetHQ\Cachet\Models\Component $model
      *
      * @return void
      */
diff --git a/src/Repositories/Incident/EloquentIncidentRepository.php b/src/Repositories/Incident/EloquentIncidentRepository.php
index 38b77120..f5bcf30a 100644
--- a/src/Repositories/Incident/EloquentIncidentRepository.php
+++ b/src/Repositories/Incident/EloquentIncidentRepository.php
@@ -2,22 +2,22 @@
 
 namespace CachetHQ\Cachet\Repositories\Incident;
 
+use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Repositories\EloquentRepository;
-use Incident;
 
 class EloquentIncidentRepository extends EloquentRepository implements IncidentRepository
 {
     /**
      * The eloquent model instance.
      *
-     * @var \Incident
+     * @var \CachetHQ\Cachet\Models\Incident
      */
     protected $model;
 
     /**
      * Create a new eloquent incident repository instance.
      *
-     * @param \Incident $model
+     * @param \CachetHQ\Cachet\Models\Incident $model
      *
      * @return void
      */
diff --git a/src/Repositories/Metric/EloquentMetricRepository.php b/src/Repositories/Metric/EloquentMetricRepository.php
index 961d5da2..c72ab0f5 100644
--- a/src/Repositories/Metric/EloquentMetricRepository.php
+++ b/src/Repositories/Metric/EloquentMetricRepository.php
@@ -2,22 +2,22 @@
 
 namespace CachetHQ\Cachet\Repositories\Metric;
 
+use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Repositories\EloquentRepository;
-use Metric;
 
 class EloquentMetricRepository extends EloquentRepository implements MetricRepository
 {
     /**
      * The eloquent model instance.
      *
-     * @var \Metric
+     * @var \CachetHQ\Cachet\Models\Metric
      */
     protected $model;
 
     /**
      * Create a new eloquent metric repository instance.
      *
-     * @param \Metric $model
+     * @param \CachetHQ\Cachet\Models\Metric $model
      *
      * @return void
      */
diff --git a/src/Repositories/MetricPoint/EloquentMetricPointRepository.php b/src/Repositories/MetricPoint/EloquentMetricPointRepository.php
index 17d54779..3118f9b6 100644
--- a/src/Repositories/MetricPoint/EloquentMetricPointRepository.php
+++ b/src/Repositories/MetricPoint/EloquentMetricPointRepository.php
@@ -2,22 +2,22 @@
 
 namespace CachetHQ\Cachet\Repositories\MetricPoint;
 
+use CachetHQ\Cachet\Models\MetricPoint;
 use CachetHQ\Cachet\Repositories\EloquentRepository;
-use MetricPoint;
 
 class EloquentMetricPointRepository extends EloquentRepository implements MetricPointRepository
 {
     /**
      * The eloquent model instance.
      *
-     * @var \MetricPoint
+     * @var \CachetHQ\Cachet\Models\MetricPoint
      */
     protected $model;
 
     /**
      * Create a new eloquent metric point repository instance.
      *
-     * @param \MetricPoint $model
+     * @param \CachetHQ\Cachet\Models\MetricPoint $model
      *
      * @return void
      */
diff --git a/src/Transformers/ComponentTransformer.php b/src/Transformers/ComponentTransformer.php
index b67984a6..4f18f93f 100644
--- a/src/Transformers/ComponentTransformer.php
+++ b/src/Transformers/ComponentTransformer.php
@@ -2,11 +2,18 @@
 
 namespace CachetHQ\Cachet\Transformers;
 
-use Component;
+use CachetHQ\Cachet\Models\Component;
 use League\Fractal\TransformerAbstract;
 
 class ComponentTransformer extends TransformerAbstract
 {
+    /**
+     * Transform a component model into an array.
+     *
+     * @param \CachetHQ\Cachet\Models\Component $component
+     *
+     * @return array
+     */
     public function transform(Component $component)
     {
         return [
diff --git a/src/Transformers/IncidentTransformer.php b/src/Transformers/IncidentTransformer.php
index 50bf7c82..1c89da5a 100644
--- a/src/Transformers/IncidentTransformer.php
+++ b/src/Transformers/IncidentTransformer.php
@@ -2,11 +2,18 @@
 
 namespace CachetHQ\Cachet\Transformers;
 
-use Incident;
+use CachetHQ\Cachet\Models\Incident;
 use League\Fractal\TransformerAbstract;
 
 class IncidentTransformer extends TransformerAbstract
 {
+    /**
+     * Transform an incident model into an array.
+     *
+     * @param \CachetHQ\Cachet\Models\Incident $incident
+     *
+     * @return array
+     */
     public function transform(Incident $incident)
     {
         $component = $incident->component;
diff --git a/src/Transformers/MetricPointTransformer.php b/src/Transformers/MetricPointTransformer.php
index def60b3b..b7b6ab1a 100644
--- a/src/Transformers/MetricPointTransformer.php
+++ b/src/Transformers/MetricPointTransformer.php
@@ -2,11 +2,18 @@
 
 namespace CachetHQ\Cachet\Transformers;
 
+use CachetHQ\Cachet\Models\MetricPoint;
 use League\Fractal\TransformerAbstract;
-use MetricPoint;
 
 class MetricPointTransformer extends TransformerAbstract
 {
+    /**
+     * Transform a metric point model into an array.
+     *
+     * @param \CachetHQ\Cachet\Models\MetricPoint $metricPoint
+     *
+     * @return array
+     */
     public function transform(MetricPoint $metricPoint)
     {
         return [
diff --git a/src/Transformers/MetricTransformer.php b/src/Transformers/MetricTransformer.php
index caef7f60..a9fc879a 100644
--- a/src/Transformers/MetricTransformer.php
+++ b/src/Transformers/MetricTransformer.php
@@ -2,11 +2,18 @@
 
 namespace CachetHQ\Cachet\Transformers;
 
+use CachetHQ\Cachet\Models\Metric;
 use League\Fractal\TransformerAbstract;
-use Metric;
 
 class MetricTransformer extends TransformerAbstract
 {
+    /**
+     * Transform a metric model into an array.
+     *
+     * @param \CachetHQ\Cachet\Models\Metric $metric
+     *
+     * @return array
+     */
     public function transform(Metric $metric)
     {
         return [
diff --git a/app/helpers.php b/src/helpers.php
similarity index 83%
rename from app/helpers.php
rename to src/helpers.php
index a7a5e9e4..689ef843 100644
--- a/app/helpers.php
+++ b/src/helpers.php
@@ -1,6 +1,8 @@
 <?php
 
-if (! function_exists('elixir')) {
+use Illuminate\Support\Facades\Request;
+
+if (!function_exists('elixir')) {
     /**
      * Get the path to a versioned Elixir file.
      *
@@ -24,7 +26,7 @@ if (! function_exists('elixir')) {
     }
 }
 
-if (! function_exists('set_active')) {
+if (!function_exists('set_active')) {
 
     /**
      * Set active class if request is in path.
@@ -35,7 +37,7 @@ if (! function_exists('set_active')) {
      *
      * @return string
      */
-    function set_active($path, $classes = [], $active = 'active')
+    function set_active($path, array $classes = [], $active = 'active')
     {
         if (Request::is($path)) {
             $classes[] = $active;
diff --git a/app/tests/Controllers/Api/ComponentControllerTest.php b/tests/Controllers/Api/ComponentControllerTest.php
similarity index 80%
rename from app/tests/Controllers/Api/ComponentControllerTest.php
rename to tests/Controllers/Api/ComponentControllerTest.php
index fb6cec54..1d5a058f 100644
--- a/app/tests/Controllers/Api/ComponentControllerTest.php
+++ b/tests/Controllers/Api/ComponentControllerTest.php
@@ -17,7 +17,7 @@ class ComponentControllerTest extends TestCase
     {
         $this->repo->shouldReceive('all')->once()->andReturn('foo');
 
-        $controller = new CachetHQ\Cachet\Controllers\Api\ComponentController($this->repo);
+        $controller = new CachetHQ\Cachet\Http\Controllers\Api\ComponentController($this->repo);
         $response = $controller->getComponents();
 
         $this->assertEquals('foo', $response);
@@ -27,7 +27,7 @@ class ComponentControllerTest extends TestCase
     {
         $this->repo->shouldReceive('findOrFail')->with(1)->once()->andReturn('foo');
 
-        $controller = new CachetHQ\Cachet\Controllers\Api\ComponentController($this->repo);
+        $controller = new CachetHQ\Cachet\Http\Controllers\Api\ComponentController($this->repo);
         $response = $controller->getComponent(1);
 
         $this->assertEquals('foo', $response);
diff --git a/app/tests/TestCase.php b/tests/TestCase.php
similarity index 83%
rename from app/tests/TestCase.php
rename to tests/TestCase.php
index 76f47391..3e9f0ac6 100644
--- a/app/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -13,6 +13,6 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
 
         $testEnvironment = 'testing';
 
-        return require __DIR__.'/../../bootstrap/start.php';
+        return require __DIR__.'/../bootstrap/start.php';
     }
 }