diff --git a/app/config/app.php b/app/config/app.php
index a182c155..be45956a 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -113,7 +113,6 @@ return [
         'Illuminate\Pagination\PaginationServiceProvider',
         'Illuminate\Queue\QueueServiceProvider',
         'Illuminate\Redis\RedisServiceProvider',
-        'Illuminate\Remote\RemoteServiceProvider',
         'Illuminate\Auth\Reminders\ReminderServiceProvider',
         'Illuminate\Database\SeedServiceProvider',
         'Illuminate\Session\SessionServiceProvider',
@@ -127,8 +126,8 @@ return [
         'GrahamCampbell\Markdown\MarkdownServiceProvider',
         'Thujohn\Rss\RssServiceProvider',
 
-        'CachetHQ\Cachet\Support\ServiceProviders\RepositoryServiceProvider',
-        'CachetHQ\Cachet\Support\ServiceProviders\RoutingServiceProvider',
+        'CachetHQ\Cachet\Providers\RepositoryServiceProvider',
+        'CachetHQ\Cachet\Providers\RoutingServiceProvider',
 
     ],
 
@@ -192,7 +191,6 @@ return [
         'Seeder'            => 'Illuminate\Database\Seeder',
         'Session'           => 'Illuminate\Support\Facades\Session',
         'SoftDeletingTrait' => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
-        'SSH'               => 'Illuminate\Support\Facades\SSH',
         'Str'               => 'Illuminate\Support\Str',
         'URL'               => 'Illuminate\Support\Facades\URL',
         'Validator'         => 'Illuminate\Support\Facades\Validator',
diff --git a/src/Support/ServiceProviders/RepositoryServiceProvider.php b/src/Providers/RepositoryServiceProvider.php
similarity index 93%
rename from src/Support/ServiceProviders/RepositoryServiceProvider.php
rename to src/Providers/RepositoryServiceProvider.php
index c193b5d3..89166bd0 100644
--- a/src/Support/ServiceProviders/RepositoryServiceProvider.php
+++ b/src/Providers/RepositoryServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Support\ServiceProviders;
+namespace CachetHQ\Cachet\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/src/Support/ServiceProviders/RoutingServiceProvider.php b/src/Providers/RoutingServiceProvider.php
similarity index 94%
rename from src/Support/ServiceProviders/RoutingServiceProvider.php
rename to src/Providers/RoutingServiceProvider.php
index 79289c05..07fc0f99 100644
--- a/src/Support/ServiceProviders/RoutingServiceProvider.php
+++ b/src/Providers/RoutingServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CachetHQ\Cachet\Support\ServiceProviders;
+namespace CachetHQ\Cachet\Providers;
 
 use Illuminate\Support\ServiceProvider;
 use RecursiveDirectoryIterator;