diff --git a/modules/Blog/Article/Providers/ArticleServiceProvider.php b/modules/Blog/Article/Providers/ArticleServiceProvider.php
index 77dbcac3..5967f16e 100644
--- a/modules/Blog/Article/Providers/ArticleServiceProvider.php
+++ b/modules/Blog/Article/Providers/ArticleServiceProvider.php
@@ -1,14 +1,13 @@
 <?php namespace Modules\Blog\Article\Providers;
 
-use App\Providers\ModulesServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 use Modules\Blog\Article\Pipeline\DisplayContent\LoadCommentsForBlogpost;
 use Modules\Blog\Article\Pipeline\SaveContent\TurnCommentsOnOrOff;
 
-class ArticleServiceProvider extends ModulesServiceProvider
+class ArticleServiceProvider extends ServiceProvider
 {
     /**
      * Boot the application events.
-     *
      * @return void
      */
     public function boot()
diff --git a/modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php b/modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php
index b6a8850e..3d5d2c58 100644
--- a/modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php
+++ b/modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php
@@ -1,9 +1,9 @@
 <?php namespace Modules\Blog\ArticleList\Providers;
 
-use App\Providers\ModulesServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 use Modules\Blog\ArticleList\Pipeline\DisplayContent\LoadArticlesForList;
 
-class ArticleListServiceProvider extends ModulesServiceProvider
+class ArticleListServiceProvider extends ServiceProvider
 {
     protected function setModuleAlias()
     {
diff --git a/modules/Categories/Providers/CategoriesServiceProvider.php b/modules/Categories/Providers/CategoriesServiceProvider.php
index 472b7777..cdde8c90 100644
--- a/modules/Categories/Providers/CategoriesServiceProvider.php
+++ b/modules/Categories/Providers/CategoriesServiceProvider.php
@@ -1,11 +1,11 @@
 <?php
 namespace Modules\Categories\Providers;
 
-use App\Providers\ModulesServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 use Modules\Categories\Contracts\Repositories\Category as ICategory;
 use Modules\Categories\Repositories\Category as Category;
 
-class CategoriesServiceProvider extends ModulesServiceProvider
+class CategoriesServiceProvider extends ServiceProvider
 {
     protected function setModuleAlias()
     {
diff --git a/modules/ContactForm/Providers/ContactFormServiceProvider.php b/modules/ContactForm/Providers/ContactFormServiceProvider.php
index 2cf32b56..10f65909 100644
--- a/modules/ContactForm/Providers/ContactFormServiceProvider.php
+++ b/modules/ContactForm/Providers/ContactFormServiceProvider.php
@@ -1,12 +1,12 @@
 <?php namespace Modules\ContactForm\Providers;
 
-use App\Providers\ModulesServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 use Modules\ContactForm\Handlers\ContactForm;
 use Modules\ContactForm\Pipeline\SavePipeline\SaveContactInformation;
 use Modules\ContactForm\Widgets\Address\Address;
 use Modules\ContactForm\Widgets\Form\Form;
 
-class ContactFormServiceProvider extends ModulesServiceProvider
+class ContactFormServiceProvider extends ServiceProvider
 {
     /**
      * Boot the application events.
diff --git a/modules/Gallery/Providers/GalleryServiceProvider.php b/modules/Gallery/Providers/GalleryServiceProvider.php
index 304b3075..0e675e82 100644
--- a/modules/Gallery/Providers/GalleryServiceProvider.php
+++ b/modules/Gallery/Providers/GalleryServiceProvider.php
@@ -1,8 +1,8 @@
 <?php namespace Modules\Gallery\Providers;
 
-use App\Providers\ModulesServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 
-class GalleryServiceProvider extends ModulesServiceProvider
+class GalleryServiceProvider extends ServiceProvider
 {
     protected function setModuleAlias()
     {
diff --git a/modules/StaticPages/Providers/StaticPagesServiceProvider.php b/modules/StaticPages/Providers/StaticPagesServiceProvider.php
index 46c5b152..c79e57c5 100644
--- a/modules/StaticPages/Providers/StaticPagesServiceProvider.php
+++ b/modules/StaticPages/Providers/StaticPagesServiceProvider.php
@@ -1,7 +1,6 @@
 <?php namespace Modules\Staticpages\Providers;
 
-
-use App\CMS\Contracts\Modules\ServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 
 class StaticPagesServiceProvider extends ServiceProvider
 {