diff --git a/src/Intervention/Image/ImageServiceProvider.php b/src/Intervention/Image/ImageServiceProvider.php
index 7eb282b7..829df020 100644
--- a/src/Intervention/Image/ImageServiceProvider.php
+++ b/src/Intervention/Image/ImageServiceProvider.php
@@ -43,7 +43,7 @@ class ImageServiceProvider extends ServiceProvider
         $app = $this->app;
         $version = intval($app::VERSION);
         $provider = sprintf(
-            '\Intervention\Image\Providers\Laravel%dServiceProvider', $version
+            '\Intervention\Image\ImageServiceProviderLaravel%d', $version
         );
 
         return new $provider($app);
diff --git a/src/Intervention/Image/Providers/Laravel4ServiceProvider.php b/src/Intervention/Image/ImageServiceProviderLaravel4.php
similarity index 97%
rename from src/Intervention/Image/Providers/Laravel4ServiceProvider.php
rename to src/Intervention/Image/ImageServiceProviderLaravel4.php
index 49e4096d..d9683fe2 100755
--- a/src/Intervention/Image/Providers/Laravel4ServiceProvider.php
+++ b/src/Intervention/Image/ImageServiceProviderLaravel4.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Intervention\Image\Providers;
+namespace Intervention\Image;
 
-use Intervention\Image\ImageManager;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Http\Response as IlluminateResponse;
 
diff --git a/src/Intervention/Image/Providers/Laravel5ServiceProvider.php b/src/Intervention/Image/ImageServiceProviderLaravel5.php
similarity index 93%
rename from src/Intervention/Image/Providers/Laravel5ServiceProvider.php
rename to src/Intervention/Image/ImageServiceProviderLaravel5.php
index c72c147e..354a37b8 100644
--- a/src/Intervention/Image/Providers/Laravel5ServiceProvider.php
+++ b/src/Intervention/Image/ImageServiceProviderLaravel5.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Intervention\Image\Providers;
+namespace Intervention\Image;
 
-use Intervention\Image\ImageManager;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Http\Response as IlluminateResponse;
 
@@ -26,7 +25,7 @@ class Laravel5ServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->publishes(array(
-            __DIR__.'/../../../config/config.php' => config_path('image.php')
+            __DIR__.'/../../config/config.php' => config_path('image.php')
         ));
 
         // setup intervention/imagecache if package is installed
@@ -45,7 +44,7 @@ class Laravel5ServiceProvider extends ServiceProvider
         // merge default config
         $this->mergeConfigFrom(
             'image',
-            __DIR__.'/../../../config/config.php'
+            __DIR__.'/../../config/config.php'
         );
 
         // create image
@@ -62,7 +61,7 @@ class Laravel5ServiceProvider extends ServiceProvider
     private function bootstrapImageCache()
     {
         $app = $this->app;
-        $config = __DIR__.'/../../../../../imagecache/src/config/config.php';
+        $config = __DIR__.'/../../../../imagecache/src/config/config.php';
 
         $this->publishes(array(
             $config => config_path('imagecache.php')