diff --git a/config/sleeping_owl.php b/config/sleeping_owl.php
index 30dc1f7cd..64a715026 100644
--- a/config/sleeping_owl.php
+++ b/config/sleeping_owl.php
@@ -106,12 +106,7 @@
    */
 
     'providers' => [
-        SleepingOwl\Admin\Providers\ColumnFilterServiceProvider::class,
-        SleepingOwl\Admin\Providers\ColumnServiceProvider::class,
-        SleepingOwl\Admin\Providers\DisplayServiceProvider::class,
-        SleepingOwl\Admin\Providers\FilterServiceProvider::class,
-        SleepingOwl\Admin\Providers\FormServiceProvider::class,
-        SleepingOwl\Admin\Providers\FormElementsServiceProvider::class,
+        SleepingOwl\Admin\Providers\AliasesServiceProvider::class,
         KodiCMS\Assets\AssetsServiceProvider::class,
         Collective\Html\HtmlServiceProvider::class,
         SleepingOwl\Admin\Providers\AdminServiceProvider::class
@@ -134,14 +129,14 @@
         'Form'              => Collective\Html\FormFacade::class,
         'HTML'              => Collective\Html\HtmlFacade::class,
 
-        'AdminSection'       => SleepingOwl\Admin\Facades\AdminSection::class,
-        'AdminTemplate'      => SleepingOwl\Admin\Facades\AdminTemplate::class,
-        'AdminNavigation'    => SleepingOwl\Admin\Facades\AdminNavigation::class,
-        'AdminColumn'        => SleepingOwl\Admin\TableColumn::class,
-        'AdminColumnFilter'  => SleepingOwl\Admin\TableColumnFilter::class,
-        'AdminDisplayFilter' => SleepingOwl\Admin\DisplayFilter::class,
-        'AdminForm'          => SleepingOwl\Admin\Form::class,
-        'AdminFormElement'   => SleepingOwl\Admin\FormElement::class,
-        'AdminDisplay'       => SleepingOwl\Admin\Display::class
+        'AdminSection'       => SleepingOwl\Admin\Facades\Admin::class,
+        'AdminTemplate'      => SleepingOwl\Admin\Facades\Template::class,
+        'AdminNavigation'    => SleepingOwl\Admin\Facades\Navigation::class,
+        'AdminColumn'        => SleepingOwl\Admin\Facades\TableColumn::class,
+        'AdminColumnFilter'  => SleepingOwl\Admin\Facades\TableColumnFilter::class,
+        'AdminDisplayFilter' => SleepingOwl\Admin\Facades\DisplayFilter::class,
+        'AdminForm'          => SleepingOwl\Admin\Facades\Form::class,
+        'AdminFormElement'   => SleepingOwl\Admin\Facades\FormElement::class,
+        'AdminDisplay'       => SleepingOwl\Admin\Facades\Display::class
     ]
 ];
diff --git a/src/AliasBinder.php b/src/AliasBinder.php
index 5b459b4e8..6c0e9099f 100644
--- a/src/AliasBinder.php
+++ b/src/AliasBinder.php
@@ -2,28 +2,35 @@
 
 namespace SleepingOwl\Admin;
 
-use Route;
 use BadMethodCallException;
 
-abstract class AliasBinder
+class AliasBinder
 {
+    /**
+     * @var array
+     */
+    protected $aliases = [];
+
     /**
      * Register new alias.
      *
      * @param string $alias
      * @param string $class
      */
-    public static function register($alias, $class)
+    public function register($alias, $class)
     {
-        static::$aliases[$alias] = $class;
-        Route::group([
-            'prefix' => config('sleeping_owl.url_prefix'),
-            'middleware' => config('sleeping_owl.middleware'),
-        ], function () use ($class) {
-            if (method_exists($class, 'registerRoutes')) {
-                call_user_func([$class, 'registerRoutes']);
+        $this->aliases[$alias] = $class;
+
+        app('router')->group(
+            ['prefix' => config('sleeping_owl.url_prefix'), 'middleware' => config('sleeping_owl.middleware')],
+            function () use ($class) {
+
+                if (method_exists($class, 'registerRoutes')) {
+                    call_user_func([$class, 'registerRoutes']);
+                }
+
             }
-        });
+        );
     }
 
     /**
@@ -33,9 +40,9 @@ public static function register($alias, $class)
      *
      * @return string
      */
-    public static function getAlias($alias)
+    public function getAlias($alias)
     {
-        return static::$aliases[$alias];
+        return $this->aliases[$alias];
     }
 
     /**
@@ -45,9 +52,9 @@ public static function getAlias($alias)
      *
      * @return bool
      */
-    public static function hasAlias($alias)
+    public function hasAlias($alias)
     {
-        return array_key_exists($alias, static::$aliases);
+        return array_key_exists($alias, $this->aliases);
     }
 
     /**
@@ -58,12 +65,12 @@ public static function hasAlias($alias)
      *
      * @return mixed
      */
-    public static function __callStatic($name, $arguments)
+    public function __call($name, $arguments)
     {
-        if (! static::hasAlias($name)) {
+        if (! $this->hasAlias($name)) {
             throw new BadMethodCallException($name);
         }
 
-        return app(static::getAlias($name), $arguments);
+        return app($this->getAlias($name), $arguments);
     }
 }
diff --git a/src/Facades/AdminSection.php b/src/Facades/Admin.php
similarity index 84%
rename from src/Facades/AdminSection.php
rename to src/Facades/Admin.php
index e1c9b44c0..b03558f13 100644
--- a/src/Facades/AdminSection.php
+++ b/src/Facades/Admin.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Facades\Facade;
 
-class AdminSection extends Facade
+class Admin extends Facade
 {
     public static function getFacadeAccessor()
     {
diff --git a/src/Display.php b/src/Facades/Display.php
similarity index 66%
rename from src/Display.php
rename to src/Facades/Display.php
index fcccfac98..eb6671ede 100644
--- a/src/Display.php
+++ b/src/Facades/Display.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace SleepingOwl\Admin;
+namespace SleepingOwl\Admin\Facades;
+
+use Illuminate\Support\Facades\Facade;
 
 /**
  * @method static \SleepingOwl\Admin\Display\DisplayDatatables datatables()
@@ -10,11 +12,15 @@
  * @method static \SleepingOwl\Admin\Display\DisplayTable table()
  * @method static \SleepingOwl\Admin\Display\DisplayTree tree()
  */
-class Display extends AliasBinder
+class Display extends Facade
 {
+
     /**
-     * Display class aliases.
-     * @var string[]
+     * @return string
      */
-    protected static $aliases = [];
-}
+    protected static function getFacadeAccessor()
+    {
+        return 'sleeping_owl.display';
+    }
+
+}
\ No newline at end of file
diff --git a/src/DisplayFilter.php b/src/Facades/DisplayFilter.php
similarity index 60%
rename from src/DisplayFilter.php
rename to src/Facades/DisplayFilter.php
index 09f9a4f13..744f3a012 100644
--- a/src/DisplayFilter.php
+++ b/src/Facades/DisplayFilter.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace SleepingOwl\Admin;
+namespace SleepingOwl\Admin\Facades;
+
+use Illuminate\Support\Facades\Facade;
 
 /**
  * Class Filter.
@@ -9,10 +11,13 @@
  * @method static \SleepingOwl\Admin\Display\Filter\FilterRelated related($name)
  * @method static \SleepingOwl\Admin\Display\Filter\FilterScope scope($name)
  */
-class DisplayFilter extends AliasBinder
+class DisplayFilter extends Facade
 {
     /**
-     * @var array
+     * @return string
      */
-    protected static $aliases = [];
+    protected static function getFacadeAccessor()
+    {
+        return 'sleeping_owl.display.filter';
+    }
 }
diff --git a/src/Form.php b/src/Facades/Form.php
similarity index 50%
rename from src/Form.php
rename to src/Facades/Form.php
index 6b5cad655..86da58d2e 100644
--- a/src/Form.php
+++ b/src/Facades/Form.php
@@ -1,17 +1,18 @@
 <?php
 
-namespace SleepingOwl\Admin;
+namespace SleepingOwl\Admin\Facades;
+
+use Illuminate\Support\Facades\Facade;
 
 /**
  * @method static \SleepingOwl\Admin\Form\FormDefault form()
  * @method static \SleepingOwl\Admin\Form\FormTabbed tabbed()
  * @method static \SleepingOwl\Admin\Form\FormPanel panel()
  */
-class Form extends AliasBinder
+class Form extends Facade
 {
-    /**
-     * Form class aliases.
-     * @var string[]
-     */
-    protected static $aliases = [];
+    public static function getFacadeAccessor()
+    {
+        return 'sleeping_owl.form';
+    }
 }
diff --git a/src/FormElement.php b/src/Facades/FormElement.php
similarity index 87%
rename from src/FormElement.php
rename to src/Facades/FormElement.php
index 9ff99789b..c675de073 100644
--- a/src/FormElement.php
+++ b/src/Facades/FormElement.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace SleepingOwl\Admin;
+namespace SleepingOwl\Admin\Facades;
 
+use Illuminate\Support\Facades\Facade;
 /**
  * Class AdminForm.
  * @method static \SleepingOwl\Admin\Form\Element\Text text($name, $label = null)
@@ -25,10 +26,13 @@
  * @method static \SleepingOwl\Admin\Form\Element\Radio radio($name, $label = null)
  * @method static \SleepingOwl\Admin\Form\Element\Wysiwyg wysiwyg($name, $label = null)
  */
-class FormElement extends AliasBinder
+class FormElement extends Facade
 {
     /**
-     * @var array
+     * @return string
      */
-    protected static $aliases = [];
+    protected static function getFacadeAccessor()
+    {
+        return 'sleeping_owl.form.element';
+    }
 }
diff --git a/src/Facades/AdminNavigation.php b/src/Facades/Navigation.php
similarity index 84%
rename from src/Facades/AdminNavigation.php
rename to src/Facades/Navigation.php
index c9a927d0d..8c0ab0447 100644
--- a/src/Facades/AdminNavigation.php
+++ b/src/Facades/Navigation.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Facades\Facade;
 
-class AdminNavigation extends Facade
+class Navigation extends Facade
 {
 
 	/**
diff --git a/src/TableColumn.php b/src/Facades/TableColumn.php
similarity index 84%
rename from src/TableColumn.php
rename to src/Facades/TableColumn.php
index f6ded25a9..0c6b1cfa7 100644
--- a/src/TableColumn.php
+++ b/src/Facades/TableColumn.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace SleepingOwl\Admin;
+namespace SleepingOwl\Admin\Facades;
+
+use Illuminate\Support\Facades\Facade;
 
 /**
  * @method static \SleepingOwl\Admin\Display\Column\Action action($name)
@@ -20,11 +22,11 @@
  * @method static \SleepingOwl\Admin\Display\Column\TreeControl treeControl()
  * @method static \SleepingOwl\Admin\Display\Column\Url url($name)
  */
-class TableColumn extends AliasBinder
+class TableColumn extends Facade
 {
-    /**
-     * Column class aliases.
-     * @var string[]
-     */
-    protected static $aliases = [];
+
+    public static function getFacadeAccessor()
+    {
+        return 'sleeping_owl.table.column';
+    }
 }
diff --git a/src/TableColumnFilter.php b/src/Facades/TableColumnFilter.php
similarity index 57%
rename from src/TableColumnFilter.php
rename to src/Facades/TableColumnFilter.php
index c29fd1ca4..aafcd319b 100644
--- a/src/TableColumnFilter.php
+++ b/src/Facades/TableColumnFilter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace SleepingOwl\Admin;
+namespace SleepingOwl\Admin\Facades;
 
-use SleepingOwl\Admin\AliasBinder;
+use Illuminate\Support\Facades\Facade;
 
 /**
  * @method static \SleepingOwl\Admin\Display\Column\Filter\Text text()
@@ -10,11 +10,13 @@
  * @method static \SleepingOwl\Admin\Display\Column\Filter\Select select()
  * @method static \SleepingOwl\Admin\Display\Column\Filter\Range range()
  */
-class TableColumnFilter extends AliasBinder
+class TableColumnFilter  extends Facade
 {
     /**
-     * Column filter class aliases.
-     * @var string[]
+     * @return string
      */
-    protected static $aliases = [];
+    protected static function getFacadeAccessor()
+    {
+        return 'sleeping_owl.column_filter';
+    }
 }
diff --git a/src/Facades/AdminTemplate.php b/src/Facades/Template.php
similarity index 85%
rename from src/Facades/AdminTemplate.php
rename to src/Facades/Template.php
index fdcbb5e79..f26bc9980 100644
--- a/src/Facades/AdminTemplate.php
+++ b/src/Facades/Template.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Facades\Facade;
 
-class AdminTemplate extends Facade
+class Template extends Facade
 {
 
 	/**
diff --git a/src/Providers/AliasesServiceProvider.php b/src/Providers/AliasesServiceProvider.php
new file mode 100644
index 000000000..649c9cd76
--- /dev/null
+++ b/src/Providers/AliasesServiceProvider.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace SleepingOwl\Admin\Providers;
+
+use SleepingOwl\Admin\AliasBinder;
+use Illuminate\Support\ServiceProvider;
+
+class AliasesServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        $this->registerColumnFilters();
+        $this->registerDisplays();
+        $this->registerColumns();
+        $this->registerForms();
+        $this->registerFormElements();
+    }
+
+    protected function registerColumnFilters()
+    {
+        $this->app->singleton('sleeping_owl.column_filter', function () {
+
+            $alias = new AliasBinder();
+
+            $alias->register('text', \SleepingOwl\Admin\Display\Column\Filter\Text::class);
+            $alias->register('date', \SleepingOwl\Admin\Display\Column\Filter\Date::class);
+            $alias->register('range', \SleepingOwl\Admin\Display\Column\Filter\Range::class);
+            $alias->register('select', \SleepingOwl\Admin\Display\Column\Filter\Select::class);
+
+            return $alias;
+        });
+    }
+
+    protected function registerDisplays()
+    {
+        $this->app->singleton('sleeping_owl.display', function () {
+
+            $alias = new AliasBinder();
+
+            $alias->register('datatables', \SleepingOwl\Admin\Display\DisplayDatatables::class);
+            $alias->register('datatablesAsync', \SleepingOwl\Admin\Display\DisplayDatatablesAsync::class);
+            $alias->register('tab', \SleepingOwl\Admin\Display\DisplayTab::class);
+            $alias->register('tabbed', \SleepingOwl\Admin\Display\DisplayTabbed::class);
+            $alias->register('table', \SleepingOwl\Admin\Display\DisplayTable::class);
+            $alias->register('tree', \SleepingOwl\Admin\Display\DisplayTree::class);
+
+            return $alias;
+        });
+    }
+
+    protected function registerColumns()
+    {
+        $this->app->singleton('sleeping_owl.table.column', function () {
+
+            $alias = new AliasBinder();
+
+            $alias->register('action', \SleepingOwl\Admin\Display\Column\Action::class);
+            $alias->register('checkbox', \SleepingOwl\Admin\Display\Column\Checkbox::class);
+            $alias->register('control', \SleepingOwl\Admin\Display\Column\Control::class);
+            $alias->register('count', \SleepingOwl\Admin\Display\Column\Count::class);
+            $alias->register('custom', \SleepingOwl\Admin\Display\Column\Custom::class);
+            $alias->register('datetime', \SleepingOwl\Admin\Display\Column\DateTime::class);
+            $alias->register('filter', \SleepingOwl\Admin\Display\Column\Filter::class);
+            $alias->register('image', \SleepingOwl\Admin\Display\Column\Image::class);
+            $alias->register('lists', \SleepingOwl\Admin\Display\Column\Lists::class);
+            $alias->register('order', \SleepingOwl\Admin\Display\Column\Order::class);
+            $alias->register('text', \SleepingOwl\Admin\Display\Column\Text::class);
+            $alias->register('link', \SleepingOwl\Admin\Display\Column\Link::class);
+            $alias->register('relatedLink', \SleepingOwl\Admin\Display\Column\RelatedLink::class);
+            $alias->register('email', \SleepingOwl\Admin\Display\Column\Email::class);
+            $alias->register('treeControl', \SleepingOwl\Admin\Display\Column\TreeControl::class);
+
+            return $alias;
+        });
+    }
+
+    protected function registerFormElements()
+    {
+        $this->app->singleton('sleeping_owl.form.element', function () {
+
+            $alias = new AliasBinder();
+
+            $alias->register('columns', \SleepingOwl\Admin\Form\Element\Columns::class);
+            $alias->register('text', \SleepingOwl\Admin\Form\Element\Text::class);
+            $alias->register('time', \SleepingOwl\Admin\Form\Element\Time::class);
+            $alias->register('date', \SleepingOwl\Admin\Form\Element\Date::class);
+            $alias->register('timestamp', \SleepingOwl\Admin\Form\Element\Timestamp::class);
+            $alias->register('textaddon', \SleepingOwl\Admin\Form\Element\TextAddon::class);
+            $alias->register('select', \SleepingOwl\Admin\Form\Element\Select::class);
+            $alias->register('multiselect', \SleepingOwl\Admin\Form\Element\MultiSelect::class);
+            $alias->register('hidden', \SleepingOwl\Admin\Form\Element\Hidden::class);
+            $alias->register('checkbox', \SleepingOwl\Admin\Form\Element\Checkbox::class);
+            $alias->register('ckeditor', \SleepingOwl\Admin\Form\Element\CKEditor::class);
+            $alias->register('custom', \SleepingOwl\Admin\Form\Element\Custom::class);
+            $alias->register('password', \SleepingOwl\Admin\Form\Element\Password::class);
+            $alias->register('textarea', \SleepingOwl\Admin\Form\Element\Textarea::class);
+            $alias->register('view', \SleepingOwl\Admin\Form\Element\View::class);
+            $alias->register('image', \SleepingOwl\Admin\Form\Element\Image::class);
+            $alias->register('images', \SleepingOwl\Admin\Form\Element\Images::class);
+            $alias->register('file', \SleepingOwl\Admin\Form\Element\File::class);
+            $alias->register('radio', \SleepingOwl\Admin\Form\Element\Radio::class);
+            $alias->register('wysiwyg', \SleepingOwl\Admin\Form\Element\Wysiwyg::class);
+
+            return $alias;
+        });
+    }
+
+    protected function registerForms()
+    {
+        $this->app->singleton('sleeping_owl.form', function () {
+
+            $alias = new AliasBinder();
+
+            $alias->register('form', \SleepingOwl\Admin\Form\FormDefault::class);
+            $alias->register('tabbed', \SleepingOwl\Admin\Form\FormTabbed::class);
+            $alias->register('panel', \SleepingOwl\Admin\Form\FormPanel::class);
+
+            return $alias;
+        });
+    }
+
+    protected function registerFilters()
+    {
+        $this->app->singleton('sleeping_owl.display.filter', function () {
+
+            $alias = new AliasBinder();
+
+            $alias->register('field', \SleepingOwl\Admin\Display\Filter\FilterField::class);
+            $alias->register('scope', \SleepingOwl\Admin\Display\Filter\FilterScope::class);
+            $alias->register('custom', \SleepingOwl\Admin\Display\Filter\FilterCustom::class);
+            $alias->register('related', \SleepingOwl\Admin\Display\Filter\FilterRelated::class);
+
+            return $alias;
+        });
+    }
+}
diff --git a/src/Providers/ColumnFilterServiceProvider.php b/src/Providers/ColumnFilterServiceProvider.php
deleted file mode 100644
index 17e717e92..000000000
--- a/src/Providers/ColumnFilterServiceProvider.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace SleepingOwl\Admin\Providers;
-
-use Illuminate\Support\ServiceProvider;
-use SleepingOwl\Admin\TableColumnFilter;
-
-class ColumnFilterServiceProvider extends ServiceProvider
-{
-    public function register()
-    {
-        TableColumnFilter::register('text', \SleepingOwl\Admin\Display\Column\Filter\Text::class);
-        TableColumnFilter::register('date', \SleepingOwl\Admin\Display\Column\Filter\Date::class);
-        TableColumnFilter::register('range', \SleepingOwl\Admin\Display\Column\Filter\Range::class);
-        TableColumnFilter::register('select', \SleepingOwl\Admin\Display\Column\Filter\Select::class);
-    }
-}
diff --git a/src/Providers/ColumnServiceProvider.php b/src/Providers/ColumnServiceProvider.php
deleted file mode 100644
index 04ff37d5f..000000000
--- a/src/Providers/ColumnServiceProvider.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace SleepingOwl\Admin\Providers;
-
-use SleepingOwl\Admin\TableColumn;
-use Illuminate\Support\ServiceProvider;
-
-class ColumnServiceProvider extends ServiceProvider
-{
-    public function register()
-    {
-        TableColumn::register('action', \SleepingOwl\Admin\Display\Column\Action::class);
-        TableColumn::register('checkbox', \SleepingOwl\Admin\Display\Column\Checkbox::class);
-        TableColumn::register('control', \SleepingOwl\Admin\Display\Column\Control::class);
-        TableColumn::register('count', \SleepingOwl\Admin\Display\Column\Count::class);
-        TableColumn::register('custom', \SleepingOwl\Admin\Display\Column\Custom::class);
-        TableColumn::register('datetime', \SleepingOwl\Admin\Display\Column\DateTime::class);
-        TableColumn::register('filter', \SleepingOwl\Admin\Display\Column\Filter::class);
-        TableColumn::register('image', \SleepingOwl\Admin\Display\Column\Image::class);
-        TableColumn::register('lists', \SleepingOwl\Admin\Display\Column\Lists::class);
-        TableColumn::register('order', \SleepingOwl\Admin\Display\Column\Order::class);
-        TableColumn::register('text', \SleepingOwl\Admin\Display\Column\Text::class);
-        TableColumn::register('link', \SleepingOwl\Admin\Display\Column\Link::class);
-        TableColumn::register('relatedLink', \SleepingOwl\Admin\Display\Column\RelatedLink::class);
-        TableColumn::register('email', \SleepingOwl\Admin\Display\Column\Email::class);
-        TableColumn::register('treeControl', \SleepingOwl\Admin\Display\Column\TreeControl::class);
-        TableColumn::register('url', \SleepingOwl\Admin\Display\Column\Url::class);
-    }
-}
diff --git a/src/Providers/DisplayServiceProvider.php b/src/Providers/DisplayServiceProvider.php
deleted file mode 100644
index 0e377de59..000000000
--- a/src/Providers/DisplayServiceProvider.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace SleepingOwl\Admin\Providers;
-
-use SleepingOwl\Admin\Display;
-use Illuminate\Support\ServiceProvider;
-
-class DisplayServiceProvider extends ServiceProvider
-{
-    public function register()
-    {
-        Display::register('datatables', \SleepingOwl\Admin\Display\DisplayDatatables::class);
-        Display::register('datatablesAsync', \SleepingOwl\Admin\Display\DisplayDatatablesAsync::class);
-        Display::register('tab', \SleepingOwl\Admin\Display\DisplayTab::class);
-        Display::register('tabbed', \SleepingOwl\Admin\Display\DisplayTabbed::class);
-        Display::register('table', \SleepingOwl\Admin\Display\DisplayTable::class);
-        Display::register('tree', \SleepingOwl\Admin\Display\DisplayTree::class);
-    }
-}
diff --git a/src/Providers/FilterServiceProvider.php b/src/Providers/FilterServiceProvider.php
deleted file mode 100644
index ef015bd13..000000000
--- a/src/Providers/FilterServiceProvider.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace SleepingOwl\Admin\Providers;
-
-use SleepingOwl\Admin\DisplayFilter;
-use Illuminate\Support\ServiceProvider;
-
-class FilterServiceProvider extends ServiceProvider
-{
-    public function register()
-    {
-        DisplayFilter::register('field', \SleepingOwl\Admin\Display\Filter\FilterField::class);
-        DisplayFilter::register('scope', \SleepingOwl\Admin\Display\Filter\FilterScope::class);
-        DisplayFilter::register('custom', \SleepingOwl\Admin\Display\Filter\FilterCustom::class);
-        DisplayFilter::register('related', \SleepingOwl\Admin\Display\Filter\FilterRelated::class);
-    }
-}
diff --git a/src/Providers/FormElementsServiceProvider.php b/src/Providers/FormElementsServiceProvider.php
deleted file mode 100644
index f77c82624..000000000
--- a/src/Providers/FormElementsServiceProvider.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace SleepingOwl\Admin\Providers;
-
-use Illuminate\Support\ServiceProvider;
-use SleepingOwl\Admin\FormElement;
-
-class FormElementsServiceProvider extends ServiceProvider
-{
-    public function register()
-    {
-        FormElement::register('columns', \SleepingOwl\Admin\Form\Element\Columns::class);
-        FormElement::register('text', \SleepingOwl\Admin\Form\Element\Text::class);
-        FormElement::register('time', \SleepingOwl\Admin\Form\Element\Time::class);
-        FormElement::register('date', \SleepingOwl\Admin\Form\Element\Date::class);
-        FormElement::register('timestamp', \SleepingOwl\Admin\Form\Element\Timestamp::class);
-        FormElement::register('textaddon', \SleepingOwl\Admin\Form\Element\TextAddon::class);
-        FormElement::register('select', \SleepingOwl\Admin\Form\Element\Select::class);
-        FormElement::register('multiselect', \SleepingOwl\Admin\Form\Element\MultiSelect::class);
-        FormElement::register('hidden', \SleepingOwl\Admin\Form\Element\Hidden::class);
-        FormElement::register('checkbox', \SleepingOwl\Admin\Form\Element\Checkbox::class);
-        FormElement::register('ckeditor', \SleepingOwl\Admin\Form\Element\CKEditor::class);
-        FormElement::register('custom', \SleepingOwl\Admin\Form\Element\Custom::class);
-        FormElement::register('password', \SleepingOwl\Admin\Form\Element\Password::class);
-        FormElement::register('textarea', \SleepingOwl\Admin\Form\Element\Textarea::class);
-        FormElement::register('view', \SleepingOwl\Admin\Form\Element\View::class);
-        FormElement::register('image', \SleepingOwl\Admin\Form\Element\Image::class);
-        FormElement::register('images', \SleepingOwl\Admin\Form\Element\Images::class);
-        FormElement::register('file', \SleepingOwl\Admin\Form\Element\File::class);
-        FormElement::register('radio', \SleepingOwl\Admin\Form\Element\Radio::class);
-        FormElement::register('wysiwyg', \SleepingOwl\Admin\Form\Element\Wysiwyg::class);
-    }
-}
diff --git a/src/Providers/FormServiceProvider.php b/src/Providers/FormServiceProvider.php
deleted file mode 100644
index 1fa931684..000000000
--- a/src/Providers/FormServiceProvider.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace SleepingOwl\Admin\Providers;
-
-use SleepingOwl\Admin\Form;
-use Illuminate\Support\ServiceProvider;
-
-class FormServiceProvider extends ServiceProvider
-{
-    public function register()
-    {
-        Form::register('form', \SleepingOwl\Admin\Form\FormDefault::class);
-        Form::register('tabbed', \SleepingOwl\Admin\Form\FormTabbed::class);
-        Form::register('panel', \SleepingOwl\Admin\Form\FormPanel::class);
-    }
-}