diff --git a/app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php b/app/Exceptions/Displayers/JsonValidationDisplayer.php
similarity index 96%
rename from app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php
rename to app/Exceptions/Displayers/JsonValidationDisplayer.php
index c87a21d2d60a..bb3d0c5014e4 100644
--- a/app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php
+++ b/app/Exceptions/Displayers/JsonValidationDisplayer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers;
+namespace CachetHQ\Cachet\Exceptions\Displayers;
 
 use AltThree\Validator\ValidationException;
 use Exception;
diff --git a/app/Foundation/Exceptions/Displayers/MaintenanceDisplayer.php b/app/Exceptions/Displayers/MaintenanceDisplayer.php
similarity index 97%
rename from app/Foundation/Exceptions/Displayers/MaintenanceDisplayer.php
rename to app/Exceptions/Displayers/MaintenanceDisplayer.php
index 255d1b639f41..20b4a16d5e75 100644
--- a/app/Foundation/Exceptions/Displayers/MaintenanceDisplayer.php
+++ b/app/Exceptions/Displayers/MaintenanceDisplayer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers;
+namespace CachetHQ\Cachet\Exceptions\Displayers;
 
 use Exception;
 use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
diff --git a/app/Foundation/Exceptions/Displayers/RedirectDisplayer.php b/app/Exceptions/Displayers/RedirectDisplayer.php
similarity index 97%
rename from app/Foundation/Exceptions/Displayers/RedirectDisplayer.php
rename to app/Exceptions/Displayers/RedirectDisplayer.php
index 34c898c8acf0..7a1670cbf77f 100644
--- a/app/Foundation/Exceptions/Displayers/RedirectDisplayer.php
+++ b/app/Exceptions/Displayers/RedirectDisplayer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers;
+namespace CachetHQ\Cachet\Exceptions\Displayers;
 
 use Exception;
 use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
diff --git a/app/Foundation/Exceptions/Displayers/SettingsDisplayer.php b/app/Exceptions/Displayers/SettingsDisplayer.php
similarity index 96%
rename from app/Foundation/Exceptions/Displayers/SettingsDisplayer.php
rename to app/Exceptions/Displayers/SettingsDisplayer.php
index 79c5b738ab40..d3a76d0408a5 100644
--- a/app/Foundation/Exceptions/Displayers/SettingsDisplayer.php
+++ b/app/Exceptions/Displayers/SettingsDisplayer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers;
+namespace CachetHQ\Cachet\Exceptions\Displayers;
 
 use CachetHQ\Cachet\Settings\ReadException;
 use Exception;
diff --git a/app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php b/app/Exceptions/Displayers/ThrottleDisplayer.php
similarity index 97%
rename from app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php
rename to app/Exceptions/Displayers/ThrottleDisplayer.php
index e900c077af64..5f1907c7d7db 100644
--- a/app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php
+++ b/app/Exceptions/Displayers/ThrottleDisplayer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers;
+namespace CachetHQ\Cachet\Exceptions\Displayers;
 
 use Exception;
 use GrahamCampbell\Exceptions\Displayers\DisplayerInterface;
diff --git a/app/Foundation/Exceptions/Filters/ApiFilter.php b/app/Exceptions/Filters/ApiFilter.php
similarity index 95%
rename from app/Foundation/Exceptions/Filters/ApiFilter.php
rename to app/Exceptions/Filters/ApiFilter.php
index 7ce2d848659e..8d12e4dbffc2 100644
--- a/app/Foundation/Exceptions/Filters/ApiFilter.php
+++ b/app/Exceptions/Filters/ApiFilter.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Exceptions\Filters;
+namespace CachetHQ\Cachet\Exceptions\Filters;
 
 use Exception;
 use Illuminate\Http\Request;
diff --git a/app/Foundation/Exceptions/Transformers/BusTransformer.php b/app/Exceptions/Transformers/BusTransformer.php
similarity index 93%
rename from app/Foundation/Exceptions/Transformers/BusTransformer.php
rename to app/Exceptions/Transformers/BusTransformer.php
index 6ffd879a2e96..be0b2fe5cb18 100644
--- a/app/Foundation/Exceptions/Transformers/BusTransformer.php
+++ b/app/Exceptions/Transformers/BusTransformer.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Exceptions\Transformers;
+namespace CachetHQ\Cachet\Exceptions\Transformers;
 
 use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
 use Exception;
diff --git a/app/Foundation/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
similarity index 98%
rename from app/Foundation/Providers/AppServiceProvider.php
rename to app/Providers/AppServiceProvider.php
index 48f041db8c58..007a271ca4fe 100644
--- a/app/Foundation/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Providers;
+namespace CachetHQ\Cachet\Providers;
 
 use AltThree\Bus\Dispatcher;
 use AltThree\Validator\ValidatingMiddleware;
diff --git a/app/Foundation/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
similarity index 97%
rename from app/Foundation/Providers/ComposerServiceProvider.php
rename to app/Providers/ComposerServiceProvider.php
index 51f241fc8016..d3a23d62c4c1 100644
--- a/app/Foundation/Providers/ComposerServiceProvider.php
+++ b/app/Providers/ComposerServiceProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Providers;
+namespace CachetHQ\Cachet\Providers;
 
 use CachetHQ\Cachet\Composers\AppComposer;
 use CachetHQ\Cachet\Composers\ComponentsComposer;
diff --git a/app/Foundation/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php
similarity index 98%
rename from app/Foundation/Providers/ConfigServiceProvider.php
rename to app/Providers/ConfigServiceProvider.php
index 42d6c330413c..7390f720d778 100644
--- a/app/Foundation/Providers/ConfigServiceProvider.php
+++ b/app/Providers/ConfigServiceProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Providers;
+namespace CachetHQ\Cachet\Providers;
 
 use CachetHQ\Cachet\Models\Setting as SettingModel;
 use CachetHQ\Cachet\Settings\Cache;
diff --git a/app/Foundation/Providers/ConsoleServiceProvider.php b/app/Providers/ConsoleServiceProvider.php
similarity index 94%
rename from app/Foundation/Providers/ConsoleServiceProvider.php
rename to app/Providers/ConsoleServiceProvider.php
index 54d2b92b9835..6976453b5c82 100644
--- a/app/Foundation/Providers/ConsoleServiceProvider.php
+++ b/app/Providers/ConsoleServiceProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Providers;
+namespace CachetHQ\Cachet\Providers;
 
 use CachetHQ\Cachet\Subscribers\CommandSubscriber;
 use Illuminate\Support\ServiceProvider;
diff --git a/app/Foundation/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
similarity index 99%
rename from app/Foundation/Providers/EventServiceProvider.php
rename to app/Providers/EventServiceProvider.php
index ff44252a4016..792e2b8bbf7c 100644
--- a/app/Foundation/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Providers;
+namespace CachetHQ\Cachet\Providers;
 
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
diff --git a/app/Foundation/Providers/IntegrationServiceProvider.php b/app/Providers/IntegrationServiceProvider.php
similarity index 98%
rename from app/Foundation/Providers/IntegrationServiceProvider.php
rename to app/Providers/IntegrationServiceProvider.php
index 52e869e66f9a..57d27523cdab 100644
--- a/app/Foundation/Providers/IntegrationServiceProvider.php
+++ b/app/Providers/IntegrationServiceProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Providers;
+namespace CachetHQ\Cachet\Providers;
 
 use CachetHQ\Cachet\Integrations\Contracts\Beacon as BeaconContract;
 use CachetHQ\Cachet\Integrations\Contracts\Credits as CreditsContract;
diff --git a/app/Foundation/Providers/RepositoryServiceProvider.php b/app/Providers/RepositoryServiceProvider.php
similarity index 97%
rename from app/Foundation/Providers/RepositoryServiceProvider.php
rename to app/Providers/RepositoryServiceProvider.php
index ed75c14d5107..4a00b575e2ea 100644
--- a/app/Foundation/Providers/RepositoryServiceProvider.php
+++ b/app/Providers/RepositoryServiceProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Providers;
+namespace CachetHQ\Cachet\Providers;
 
 use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
 use CachetHQ\Cachet\Repositories\Metric\MySqlRepository;
diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
similarity index 99%
rename from app/Foundation/Providers/RouteServiceProvider.php
rename to app/Providers/RouteServiceProvider.php
index d83e8b70417e..f23d7a023da4 100644
--- a/app/Foundation/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Cachet\Foundation\Providers;
+namespace CachetHQ\Cachet\Providers;
 
 use CachetHQ\Cachet\Http\Middleware\Acceptable;
 use CachetHQ\Cachet\Http\Middleware\Authenticate;
diff --git a/config/app.php b/config/app.php
index 2d1b6527ef22..8105175f63c7 100644
--- a/config/app.php
+++ b/config/app.php
@@ -190,14 +190,14 @@
         /*
          * Application Service Providers...
          */
-        CachetHQ\Cachet\Foundation\Providers\AppServiceProvider::class,
-        CachetHQ\Cachet\Foundation\Providers\ComposerServiceProvider::class,
-        CachetHQ\Cachet\Foundation\Providers\ConsoleServiceProvider::class,
-        CachetHQ\Cachet\Foundation\Providers\ConfigServiceProvider::class,
-        CachetHQ\Cachet\Foundation\Providers\EventServiceProvider::class,
-        CachetHQ\Cachet\Foundation\Providers\IntegrationServiceProvider::class,
-        CachetHQ\Cachet\Foundation\Providers\RepositoryServiceProvider::class,
-        CachetHQ\Cachet\Foundation\Providers\RouteServiceProvider::class,
+        CachetHQ\Cachet\Providers\AppServiceProvider::class,
+        CachetHQ\Cachet\Providers\ComposerServiceProvider::class,
+        CachetHQ\Cachet\Providers\ConsoleServiceProvider::class,
+        CachetHQ\Cachet\Providers\ConfigServiceProvider::class,
+        CachetHQ\Cachet\Providers\EventServiceProvider::class,
+        CachetHQ\Cachet\Providers\IntegrationServiceProvider::class,
+        CachetHQ\Cachet\Providers\RepositoryServiceProvider::class,
+        CachetHQ\Cachet\Providers\RouteServiceProvider::class,
 
     ]),
 
diff --git a/config/exceptions.php b/config/exceptions.php
index 7f3a115e7d13..bbdd386e0e4a 100644
--- a/config/exceptions.php
+++ b/config/exceptions.php
@@ -29,7 +29,7 @@
         'GrahamCampbell\Exceptions\Transformers\AuthTransformer',
         'GrahamCampbell\Exceptions\Transformers\CsrfTransformer',
         'GrahamCampbell\Exceptions\Transformers\ModelTransformer',
-        'CachetHQ\Cachet\Foundation\Exceptions\Transformers\BusTransformer',
+        'CachetHQ\Cachet\Exceptions\Transformers\BusTransformer',
     ],
 
     /*
@@ -47,11 +47,11 @@
     */
 
     'displayers' => [
-        'CachetHQ\Cachet\Foundation\Exceptions\Displayers\MaintenanceDisplayer',
-        'CachetHQ\Cachet\Foundation\Exceptions\Displayers\SettingsDisplayer',
-        'CachetHQ\Cachet\Foundation\Exceptions\Displayers\RedirectDisplayer',
-        'CachetHQ\Cachet\Foundation\Exceptions\Displayers\ThrottleDisplayer',
-        'CachetHQ\Cachet\Foundation\Exceptions\Displayers\JsonValidationDisplayer',
+        'CachetHQ\Cachet\Exceptions\Displayers\MaintenanceDisplayer',
+        'CachetHQ\Cachet\Exceptions\Displayers\SettingsDisplayer',
+        'CachetHQ\Cachet\Exceptions\Displayers\RedirectDisplayer',
+        'CachetHQ\Cachet\Exceptions\Displayers\ThrottleDisplayer',
+        'CachetHQ\Cachet\Exceptions\Displayers\JsonValidationDisplayer',
         'GrahamCampbell\Exceptions\Displayers\DebugDisplayer',
         'GrahamCampbell\Exceptions\Displayers\HtmlDisplayer',
         'GrahamCampbell\Exceptions\Displayers\JsonDisplayer',
@@ -75,7 +75,7 @@
         'GrahamCampbell\Exceptions\Filters\VerboseFilter',
         'GrahamCampbell\Exceptions\Filters\CanDisplayFilter',
         'GrahamCampbell\Exceptions\Filters\ContentTypeFilter',
-        'CachetHQ\Cachet\Foundation\Exceptions\Filters\ApiFilter',
+        'CachetHQ\Cachet\Exceptions\Filters\ApiFilter',
     ],
 
     /*
diff --git a/tests/Foundation/Providers/AppServiceProviderTest.php b/tests/Providers/AppServiceProviderTest.php
similarity index 92%
rename from tests/Foundation/Providers/AppServiceProviderTest.php
rename to tests/Providers/AppServiceProviderTest.php
index f3147cf18283..2abf9bdc4ada 100644
--- a/tests/Foundation/Providers/AppServiceProviderTest.php
+++ b/tests/Providers/AppServiceProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Tests\Cachet\Foundation\Providers;
+namespace CachetHQ\Tests\Cachet\Providers;
 
 use AltThree\TestBench\ServiceProviderTrait;
 use CachetHQ\Cachet\Services\Dates\DateFactory;
diff --git a/tests/Foundation/Providers/ComposerServiceProviderTest.php b/tests/Providers/ComposerServiceProviderTest.php
similarity index 90%
rename from tests/Foundation/Providers/ComposerServiceProviderTest.php
rename to tests/Providers/ComposerServiceProviderTest.php
index 8e4d11cf4b42..aca05ee1f786 100644
--- a/tests/Foundation/Providers/ComposerServiceProviderTest.php
+++ b/tests/Providers/ComposerServiceProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Tests\Cachet\Foundation\Providers;
+namespace CachetHQ\Tests\Cachet\Providers;
 
 use AltThree\TestBench\ServiceProviderTrait;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
diff --git a/tests/Foundation/Providers/ConfigServiceProviderTest.php b/tests/Providers/ConfigServiceProviderTest.php
similarity index 93%
rename from tests/Foundation/Providers/ConfigServiceProviderTest.php
rename to tests/Providers/ConfigServiceProviderTest.php
index 45345d50e78b..cd7293959efc 100644
--- a/tests/Foundation/Providers/ConfigServiceProviderTest.php
+++ b/tests/Providers/ConfigServiceProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Tests\Cachet\Foundation\Providers;
+namespace CachetHQ\Tests\Cachet\Providers;
 
 use AltThree\TestBench\ServiceProviderTrait;
 use CachetHQ\Cachet\Settings\Cache;
diff --git a/tests/Foundation/Providers/ConsoleServiceProviderTest.php b/tests/Providers/ConsoleServiceProviderTest.php
similarity index 90%
rename from tests/Foundation/Providers/ConsoleServiceProviderTest.php
rename to tests/Providers/ConsoleServiceProviderTest.php
index 0050c8a4b8fb..6df555d1a6c6 100644
--- a/tests/Foundation/Providers/ConsoleServiceProviderTest.php
+++ b/tests/Providers/ConsoleServiceProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Tests\Cachet\Foundation\Providers;
+namespace CachetHQ\Tests\Cachet\Providers;
 
 use AltThree\TestBench\ServiceProviderTrait;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
diff --git a/tests/Foundation/Providers/EventServiceProviderTest.php b/tests/Providers/EventServiceProviderTest.php
similarity index 94%
rename from tests/Foundation/Providers/EventServiceProviderTest.php
rename to tests/Providers/EventServiceProviderTest.php
index 94f02c2cf87a..e4f2005dceda 100644
--- a/tests/Foundation/Providers/EventServiceProviderTest.php
+++ b/tests/Providers/EventServiceProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Tests\Cachet\Foundation\Providers;
+namespace CachetHQ\Tests\Cachet\Providers;
 
 use AltThree\TestBench\EventServiceProviderTrait;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
diff --git a/tests/Foundation/Providers/IntegrationServiceProviderTest.php b/tests/Providers/IntegrationServiceProviderTest.php
similarity index 96%
rename from tests/Foundation/Providers/IntegrationServiceProviderTest.php
rename to tests/Providers/IntegrationServiceProviderTest.php
index d3d5f95a2993..a6177f64424b 100644
--- a/tests/Foundation/Providers/IntegrationServiceProviderTest.php
+++ b/tests/Providers/IntegrationServiceProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Tests\Cachet\Foundation\Providers;
+namespace CachetHQ\Tests\Cachet\Providers;
 
 use AltThree\TestBench\ServiceProviderTrait;
 use CachetHQ\Cachet\Integrations\Contracts\Beacon;
diff --git a/tests/Foundation/Providers/RepositoryServiceProviderTest.php b/tests/Providers/RepositoryServiceProviderTest.php
similarity index 92%
rename from tests/Foundation/Providers/RepositoryServiceProviderTest.php
rename to tests/Providers/RepositoryServiceProviderTest.php
index 585a7ab7dd8a..feb4f6f7077e 100644
--- a/tests/Foundation/Providers/RepositoryServiceProviderTest.php
+++ b/tests/Providers/RepositoryServiceProviderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Tests\Cachet\Foundation\Providers;
+namespace CachetHQ\Tests\Cachet\Providers;
 
 use AltThree\TestBench\ServiceProviderTrait;
 use CachetHQ\Cachet\Repositories\Metric\MetricRepository;
diff --git a/tests/Foundation/Providers/RouteServiceProviderTest.php b/tests/Providers/RouteServiceProviderTest.php
similarity index 98%
rename from tests/Foundation/Providers/RouteServiceProviderTest.php
rename to tests/Providers/RouteServiceProviderTest.php
index ffd727aaf352..1a6e4aa0631c 100644
--- a/tests/Foundation/Providers/RouteServiceProviderTest.php
+++ b/tests/Providers/RouteServiceProviderTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace CachetHQ\Tests\Cachet\Foundation\Providers;
+namespace CachetHQ\Tests\Cachet\Providers;
 
 use AltThree\TestBench\ServiceProviderTrait;
-use CachetHQ\Cachet\Foundation\Providers\RouteServiceProvider;
 use CachetHQ\Cachet\Http\Middleware\Authenticate;
+use CachetHQ\Cachet\Providers\RouteServiceProvider;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
 use Illuminate\Routing\Route;
 use Illuminate\Routing\RouteCollection;