From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 3 Dec 2020 12:40:32 +0000 (+0100)
Subject: wip #3753 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e0350a745b794714d240d85d86ff1441185f7304;p=cubist_cms-back.git

wip #3753 @1
---

diff --git a/composer.json b/composer.json
index 33a43e6..8a08db1 100644
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,8 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {
-        "psr-0": {
-            "Cubist\\Backpack\\": "src"
+        "psr-4": {
+            "Cubist\\Backpack\\": "src/app"
         },
         "files": [
             "src/app/helpers.php"
diff --git a/src/CubistBackpackServiceProvider.php b/src/CubistBackpackServiceProvider.php
index 85a3425..e5934fa 100644
--- a/src/CubistBackpackServiceProvider.php
+++ b/src/CubistBackpackServiceProvider.php
@@ -2,16 +2,16 @@
 
 namespace Cubist\Backpack;
 
-use Cubist\Backpack\app\Console\Commands\MigrateCommand;
-use Cubist\Backpack\app\Console\Commands\GenerateCommand;
-use Cubist\Backpack\app\Console\Commands\InstallCommand;
-use Cubist\Backpack\app\Console\Commands\LocaleCopy;
-use Cubist\Backpack\app\Console\Commands\LocaleSlugReset;
-use Cubist\Backpack\app\Console\Commands\SearchIndexCommand;
-use Cubist\Backpack\app\Console\Commands\UpdateCommand;
+use Cubist\Backpack\Console\Commands\MigrateCommand;
+use Cubist\Backpack\Console\Commands\GenerateCommand;
+use Cubist\Backpack\Console\Commands\InstallCommand;
+use Cubist\Backpack\Console\Commands\LocaleCopy;
+use Cubist\Backpack\Console\Commands\LocaleSlugReset;
+use Cubist\Backpack\Console\Commands\SearchIndexCommand;
+use Cubist\Backpack\Console\Commands\UpdateCommand;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
-use Cubist\Backpack\app\CubistCrudPanel;
+use Cubist\Backpack\CubistCrudPanel;
 
 class CubistBackpackServiceProvider extends ServiceProvider
 {
diff --git a/src/app/Application.php b/src/app/Application.php
index b856973..3b5f7d5 100644
--- a/src/app/Application.php
+++ b/src/app/Application.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app;
+namespace Cubist\Backpack;
 
 class Application extends \Illuminate\Foundation\Application
 {
diff --git a/src/app/Console/Commands/CubistCommand.php b/src/app/Console/Commands/CubistCommand.php
index f95e2e4..32d0190 100644
--- a/src/app/Console/Commands/CubistCommand.php
+++ b/src/app/Console/Commands/CubistCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
 use Illuminate\Console\Command;
 use Symfony\Component\Process\Exception\ProcessFailedException;
diff --git a/src/app/Console/Commands/CubistMagicCommand.php b/src/app/Console/Commands/CubistMagicCommand.php
index de6a69f..bf18824 100644
--- a/src/app/Console/Commands/CubistMagicCommand.php
+++ b/src/app/Console/Commands/CubistMagicCommand.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 use Cubist\Util\Files\Files;
 use Cubist\Util\PHP;
 use Illuminate\Support\Facades\App;
diff --git a/src/app/Console/Commands/GenerateCommand.php b/src/app/Console/Commands/GenerateCommand.php
index 936fd2d..59b1260 100644
--- a/src/app/Console/Commands/GenerateCommand.php
+++ b/src/app/Console/Commands/GenerateCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
-use Cubist\Backpack\app\Magic\Util;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Util;
 
 class GenerateCommand extends CubistMagicCommand
 {
diff --git a/src/app/Console/Commands/InstallCommand.php b/src/app/Console/Commands/InstallCommand.php
index 5432cd2..52c48d7 100644
--- a/src/app/Console/Commands/InstallCommand.php
+++ b/src/app/Console/Commands/InstallCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
 class InstallCommand extends CubistCommand
 {
diff --git a/src/app/Console/Commands/LocaleCopy.php b/src/app/Console/Commands/LocaleCopy.php
index caf23a6..333ef7d 100644
--- a/src/app/Console/Commands/LocaleCopy.php
+++ b/src/app/Console/Commands/LocaleCopy.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
-use Cubist\Backpack\app\Magic\Models\CubistMagicTranslatableModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicTranslatableModel;
 
 class LocaleCopy extends CubistCommand
 {
diff --git a/src/app/Console/Commands/LocaleSlugReset.php b/src/app/Console/Commands/LocaleSlugReset.php
index 994e049..1102722 100644
--- a/src/app/Console/Commands/LocaleSlugReset.php
+++ b/src/app/Console/Commands/LocaleSlugReset.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
-use Cubist\Backpack\app\Magic\Models\CubistMagicTranslatableModel;
-use Cubist\Backpack\app\Magic\Models\Locale;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicTranslatableModel;
+use Cubist\Backpack\Magic\Models\Locale;
 
 class LocaleSlugReset extends CubistCommand
 {
diff --git a/src/app/Console/Commands/MigrateCommand.php b/src/app/Console/Commands/MigrateCommand.php
index cc8be1d..09d9c96 100644
--- a/src/app/Console/Commands/MigrateCommand.php
+++ b/src/app/Console/Commands/MigrateCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/app/Console/Commands/SearchIndexCommand.php b/src/app/Console/Commands/SearchIndexCommand.php
index 38c8819..4947da8 100644
--- a/src/app/Console/Commands/SearchIndexCommand.php
+++ b/src/app/Console/Commands/SearchIndexCommand.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
-use Cubist\Backpack\app\Magic\Search;
+use Cubist\Backpack\Magic\Search;
 use Illuminate\Console\Command;
 
 
diff --git a/src/app/Console/Commands/UpdateCommand.php b/src/app/Console/Commands/UpdateCommand.php
index 98e566c..fef57c3 100644
--- a/src/app/Console/Commands/UpdateCommand.php
+++ b/src/app/Console/Commands/UpdateCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Console\Commands;
+namespace Cubist\Backpack\Console\Commands;
 
 class UpdateCommand extends CubistCommand
 {
diff --git a/src/app/CubistCrudPanel.php b/src/app/CubistCrudPanel.php
index 893be99..049ca69 100644
--- a/src/app/CubistCrudPanel.php
+++ b/src/app/CubistCrudPanel.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cubist\Backpack\app;
+namespace Cubist\Backpack;
 
 use Backpack\CRUD\app\Exceptions\AccessDeniedException;
 use Backpack\CRUD\app\Library\CrudPanel\CrudPanel;
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 
 /**
  * @property CubistMagicAbstractModel $model
diff --git a/src/app/Facades/App.php b/src/app/Facades/App.php
index 3bb381f..cfd6049 100644
--- a/src/app/Facades/App.php
+++ b/src/app/Facades/App.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Facades;
+namespace Cubist\Backpack\Facades;
 
 use Illuminate\Support\Facades\App as Base;
 
diff --git a/src/app/Http/Controllers/CubistCrudController.php b/src/app/Http/Controllers/CubistCrudController.php
index 803ad2d..d81b35a 100644
--- a/src/app/Http/Controllers/CubistCrudController.php
+++ b/src/app/Http/Controllers/CubistCrudController.php
@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Http\Controllers;
+namespace Cubist\Backpack\Http\Controllers;
 
 
 use Backpack\CRUD\app\Http\Controllers\CrudController;
 
-use Cubist\Backpack\app\Http\Controllers\Operations\ListOperation;
-use Cubist\Backpack\app\Http\Controllers\Operations\MediaOperation;
+use Cubist\Backpack\Http\Controllers\Operations\ListOperation;
+use Cubist\Backpack\Http\Controllers\Operations\MediaOperation;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class CubistCrudController extends CrudController
diff --git a/src/app/Http/Controllers/CubistFrontController.php b/src/app/Http/Controllers/CubistFrontController.php
index 9ee5dc9..172a6f9 100644
--- a/src/app/Http/Controllers/CubistFrontController.php
+++ b/src/app/Http/Controllers/CubistFrontController.php
@@ -1,12 +1,12 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Http\Controllers;
+namespace Cubist\Backpack\Http\Controllers;
 
-use Cubist\Backpack\app\Magic\Menu\Menu;
-use Cubist\Backpack\app\Magic\Models\Settings;
-use Cubist\Backpack\app\Magic\Models\Locale;
-use Cubist\Backpack\app\Facades\App;
+use Cubist\Backpack\Magic\Menu\Menu;
+use Cubist\Backpack\Magic\Models\Settings;
+use Cubist\Backpack\Magic\Models\Locale;
+use Cubist\Backpack\Facades\App;
 use Illuminate\Routing\Controller as BaseController;
 
 class CubistFrontController extends BaseController
diff --git a/src/app/Http/Controllers/CubistPWAController.php b/src/app/Http/Controllers/CubistPWAController.php
index bd48a8a..58a493e 100644
--- a/src/app/Http/Controllers/CubistPWAController.php
+++ b/src/app/Http/Controllers/CubistPWAController.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Http\Controllers;
+namespace Cubist\Backpack\Http\Controllers;
 
 use Illuminate\Http\Request;
 use PHP_ICO;
diff --git a/src/app/Http/Controllers/CubistPageController.php b/src/app/Http/Controllers/CubistPageController.php
index ccf32ad..282ccf0 100644
--- a/src/app/Http/Controllers/CubistPageController.php
+++ b/src/app/Http/Controllers/CubistPageController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cubist\Backpack\app\Http\Controllers;
+namespace Cubist\Backpack\Http\Controllers;
 
-use Cubist\Backpack\app\Magic\Menu\Facade as CubistMenu;
-use Cubist\Backpack\app\Magic\Menu\Menu;
-use Cubist\Backpack\app\Magic\Models\CMSPage;
+use Cubist\Backpack\Magic\Menu\Facade as CubistMenu;
+use Cubist\Backpack\Magic\Menu\Menu;
+use Cubist\Backpack\Magic\Models\CMSPage;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Str;
diff --git a/src/app/Http/Controllers/CubistRedirectToAdminController.php b/src/app/Http/Controllers/CubistRedirectToAdminController.php
index bc7f606..ae89214 100644
--- a/src/app/Http/Controllers/CubistRedirectToAdminController.php
+++ b/src/app/Http/Controllers/CubistRedirectToAdminController.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Http\Controllers;
+namespace Cubist\Backpack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
diff --git a/src/app/Http/Controllers/CubistSEOController.php b/src/app/Http/Controllers/CubistSEOController.php
index 8e06aea..59b6350 100644
--- a/src/app/Http/Controllers/CubistSEOController.php
+++ b/src/app/Http/Controllers/CubistSEOController.php
@@ -1,12 +1,12 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Http\Controllers;
+namespace Cubist\Backpack\Http\Controllers;
 
 
-use Cubist\Backpack\app\Magic\Menu\Menu;
-use Cubist\Backpack\app\Magic\Menu\PageItem;
-use Cubist\Backpack\app\Magic\Models\Locale;
+use Cubist\Backpack\Magic\Menu\Menu;
+use Cubist\Backpack\Magic\Menu\PageItem;
+use Cubist\Backpack\Magic\Models\Locale;
 use Illuminate\Http\Request;
 
 class CubistSEOController extends CubistFrontController
diff --git a/src/app/Http/Controllers/Operations/BulkPublishOperation.php b/src/app/Http/Controllers/Operations/BulkPublishOperation.php
index 00f355a..c73727a 100644
--- a/src/app/Http/Controllers/Operations/BulkPublishOperation.php
+++ b/src/app/Http/Controllers/Operations/BulkPublishOperation.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cubist\Backpack\app\Http\Controllers\Operations;
+namespace Cubist\Backpack\Http\Controllers\Operations;
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicPageModel;
+use Cubist\Backpack\Magic\Models\CubistMagicPageModel;
 use Cubist\Backpack\CubistBackpackServiceProvider;
 use Illuminate\Support\Facades\Route;
 
diff --git a/src/app/Http/Controllers/Operations/ListOperation.php b/src/app/Http/Controllers/Operations/ListOperation.php
index caf0686..8529e8d 100644
--- a/src/app/Http/Controllers/Operations/ListOperation.php
+++ b/src/app/Http/Controllers/Operations/ListOperation.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Http\Controllers\Operations;
+namespace Cubist\Backpack\Http\Controllers\Operations;
 
 
 trait ListOperation
diff --git a/src/app/Http/Controllers/Operations/MediaOperation.php b/src/app/Http/Controllers/Operations/MediaOperation.php
index cb7f8be..43265e7 100644
--- a/src/app/Http/Controllers/Operations/MediaOperation.php
+++ b/src/app/Http/Controllers/Operations/MediaOperation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Http\Controllers\Operations;
+namespace Cubist\Backpack\Http\Controllers\Operations;
 
 
 use Illuminate\Support\Facades\Route;
diff --git a/src/app/Http/Controllers/Operations/ShowOperation.php b/src/app/Http/Controllers/Operations/ShowOperation.php
index e844cf3..f032dc9 100644
--- a/src/app/Http/Controllers/Operations/ShowOperation.php
+++ b/src/app/Http/Controllers/Operations/ShowOperation.php
@@ -1,8 +1,70 @@
 <?php
 
-namespace Cubist\Backpack\app\Http\Controllers\Operations;
+namespace Cubist\Backpack\Http\Controllers\Operations;
 
 trait ShowOperation
 {
-    use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
+    use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation {
+        show as showTrait;
+    }
+
+    public function show($id)
+    {
+        dd($id);
+
+        $this->crud->hasAccessOrFail('show');
+
+        // get entry ID from Request (makes sure its the last ID for nested resources)
+        $id = $this->crud->getCurrentEntryId() ?? $id;
+        $setFromDb = $this->crud->get('show.setFromDb');
+
+        // get the info for that entry
+        $this->data['entry'] = $this->crud->getEntry($id);
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = $this->crud->getTitle() ?? trans('backpack::crud.preview') . ' ' . $this->crud->entity_name;
+
+        // set columns from db
+        if ($setFromDb) {
+            $this->crud->setFromDb();
+        }
+
+        // cycle through columns
+        foreach ($this->crud->columns() as $key => $column) {
+
+            debug($column);
+            // remove any autoset relationship columns
+            if (array_key_exists('model', $column) && array_key_exists('autoset', $column) && $column['autoset']) {
+                $this->crud->removeColumn($column['key']);
+            }
+
+            // remove any autoset table columns
+            if ($column['type'] == 'table' && array_key_exists('autoset', $column) && $column['autoset']) {
+                $this->crud->removeColumn($column['key']);
+            }
+
+            // remove the row_number column, since it doesn't make sense in this context
+            if ($column['type'] == 'row_number') {
+                $this->crud->removeColumn($column['key']);
+            }
+
+            // remove columns that have visibleInShow set as false
+            if (isset($column['visibleInShow']) && $column['visibleInShow'] == false) {
+                $this->crud->removeColumn($column['key']);
+            }
+
+            // remove the character limit on columns that take it into account
+            if (in_array($column['type'], ['text', 'email', 'model_function', 'model_function_attribute', 'phone', 'row_number', 'select'])) {
+                $this->crud->modifyColumn($column['key'], ['limit' => ($column['limit'] ?? 999)]);
+            }
+        }
+
+        // remove preview button from stack:line
+        $this->crud->removeButton('show');
+
+        // remove bulk actions colums
+        $this->crud->removeColumns(['blank_first_column', 'bulk_actions']);
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view($this->crud->getShowView(), $this->data);
+    }
 }
diff --git a/src/app/Magic/BunchOfFields.php b/src/app/Magic/BunchOfFields.php
index 15b1166..92c181d 100644
--- a/src/app/Magic/BunchOfFields.php
+++ b/src/app/Magic/BunchOfFields.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic;
+namespace Cubist\Backpack\Magic;
 
 
-use Cubist\Backpack\app\Magic\Fields\Field;
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Fields\Field;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 
 trait BunchOfFields
 {
diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index c0ae0f6..c2b31fb 100644
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -1,15 +1,15 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Controllers;
-
-use Cubist\Backpack\app\Http\Controllers\CubistCrudController;
-use Cubist\Backpack\app\Magic\Fields\Field;
-use Cubist\Backpack\app\Magic\Menu\Menu;
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
-use Cubist\Backpack\app\Magic\Models\CubistMagicTranslatableModel;
-use Cubist\Backpack\app\Magic\Requests\CubistMagicRequest;
-use Cubist\Backpack\app\Magic\Requests\CubistMagicUpdateRequest;
+namespace Cubist\Backpack\Magic\Controllers;
+
+use Cubist\Backpack\Http\Controllers\CubistCrudController;
+use Cubist\Backpack\Magic\Fields\Field;
+use Cubist\Backpack\Magic\Menu\Menu;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicTranslatableModel;
+use Cubist\Backpack\Magic\Requests\CubistMagicRequest;
+use Cubist\Backpack\Magic\Requests\CubistMagicUpdateRequest;
 use Cubist\Backpack\CubistBackpackServiceProvider;
 use Gaspertrix\Backpack\DropzoneField\Traits\HandleAjaxMedia;
 use Illuminate\Support\Arr;
diff --git a/src/app/Magic/Controllers/CubistMagicNestedController.php b/src/app/Magic/Controllers/CubistMagicNestedController.php
index 35fee4a..650fc4d 100644
--- a/src/app/Magic/Controllers/CubistMagicNestedController.php
+++ b/src/app/Magic/Controllers/CubistMagicNestedController.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Controllers;
+namespace Cubist\Backpack\Magic\Controllers;
 
 
 use Backpack\CRUD\app\Http\Controllers\Operations\ReorderOperation;
diff --git a/src/app/Magic/CubistMagicAttribute.php b/src/app/Magic/CubistMagicAttribute.php
index 0447ff1..31d92a6 100644
--- a/src/app/Magic/CubistMagicAttribute.php
+++ b/src/app/Magic/CubistMagicAttribute.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic;
+namespace Cubist\Backpack\Magic;
 
 
 use Illuminate\Support\Arr;
diff --git a/src/app/Magic/EntityData.php b/src/app/Magic/EntityData.php
index 0956511..6b03b03 100644
--- a/src/app/Magic/EntityData.php
+++ b/src/app/Magic/EntityData.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic;
+namespace Cubist\Backpack\Magic;
 
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
-use Cubist\Backpack\app\Magic\Models\CubistMagicModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicModel;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 use Spatie\MediaLibrary\Models\Media;
diff --git a/src/app/Magic/Fields/APIToken.php b/src/app/Magic/Fields/APIToken.php
index a357f15..bd42f33 100644
--- a/src/app/Magic/Fields/APIToken.php
+++ b/src/app/Magic/Fields/APIToken.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 use Illuminate\Support\Str;
diff --git a/src/app/Magic/Fields/BunchOfFields.php b/src/app/Magic/Fields/BunchOfFields.php
index 8c0128b..d2afdcb 100644
--- a/src/app/Magic/Fields/BunchOfFields.php
+++ b/src/app/Magic/Fields/BunchOfFields.php
@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
 
 class BunchOfFields extends Field
 {
-    use \Cubist\Backpack\app\Magic\BunchOfFields;
+    use \Cubist\Backpack\Magic\BunchOfFields;
 
     protected $_adminType = 'bunch';
     protected $_cast = 'array';
diff --git a/src/app/Magic/Fields/BunchOfFieldsMultiple.php b/src/app/Magic/Fields/BunchOfFieldsMultiple.php
index 181bfbd..776538c 100644
--- a/src/app/Magic/Fields/BunchOfFieldsMultiple.php
+++ b/src/app/Magic/Fields/BunchOfFieldsMultiple.php
@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
 
 class BunchOfFieldsMultiple extends BunchOfFields
 {
-    use \Cubist\Backpack\app\Magic\BunchOfFields;
+    use \Cubist\Backpack\Magic\BunchOfFields;
 
     protected $_adminType = 'bunch_multiple';
     protected $_cast = 'array';
diff --git a/src/app/Magic/Fields/Button.php b/src/app/Magic/Fields/Button.php
index 84e3a2f..7498f9e 100644
--- a/src/app/Magic/Fields/Button.php
+++ b/src/app/Magic/Fields/Button.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
-use Cubist\Backpack\app\Magic\Models\CMSPage;
+use Cubist\Backpack\Magic\Models\CMSPage;
 use Cubist\Backpack\CubistBackpackServiceProvider;
 
 class Button extends Field
diff --git a/src/app/Magic/Fields/CMSTemplate.php b/src/app/Magic/Fields/CMSTemplate.php
index 244e480..3c85211 100644
--- a/src/app/Magic/Fields/CMSTemplate.php
+++ b/src/app/Magic/Fields/CMSTemplate.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
-use Cubist\Backpack\app\Template\TemplateAbstract;
+use Cubist\Backpack\Template\TemplateAbstract;
 use Illuminate\Support\Str;
 
 class CMSTemplate extends SelectFromArray
diff --git a/src/app/Magic/Fields/Checkbox.php b/src/app/Magic/Fields/Checkbox.php
index 650bead..7d13000 100644
--- a/src/app/Magic/Fields/Checkbox.php
+++ b/src/app/Magic/Fields/Checkbox.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Checkbox extends Field
diff --git a/src/app/Magic/Fields/Code.php b/src/app/Magic/Fields/Code.php
index 8f80b59..c2f3172 100644
--- a/src/app/Magic/Fields/Code.php
+++ b/src/app/Magic/Fields/Code.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
diff --git a/src/app/Magic/Fields/Color.php b/src/app/Magic/Fields/Color.php
index 41c10a1..d050979 100644
--- a/src/app/Magic/Fields/Color.php
+++ b/src/app/Magic/Fields/Color.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
diff --git a/src/app/Magic/Fields/Country.php b/src/app/Magic/Fields/Country.php
index 44d80f8..a21f54d 100644
--- a/src/app/Magic/Fields/Country.php
+++ b/src/app/Magic/Fields/Country.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 use Illuminate\Support\Facades\App;
 
 class Country extends Locale
diff --git a/src/app/Magic/Fields/Date.php b/src/app/Magic/Fields/Date.php
index 3105e6b..537147b 100644
--- a/src/app/Magic/Fields/Date.php
+++ b/src/app/Magic/Fields/Date.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 class Date extends Datetime
 {
diff --git a/src/app/Magic/Fields/Datetime.php b/src/app/Magic/Fields/Datetime.php
index b20bdb6..23ab912 100644
--- a/src/app/Magic/Fields/Datetime.php
+++ b/src/app/Magic/Fields/Datetime.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 class Datetime extends Field
 {
diff --git a/src/app/Magic/Fields/Email.php b/src/app/Magic/Fields/Email.php
index 186d4ba..bb6ad80 100644
--- a/src/app/Magic/Fields/Email.php
+++ b/src/app/Magic/Fields/Email.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Email extends Field
diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php
index 7106915..92fbd33 100644
--- a/src/app/Magic/Fields/Field.php
+++ b/src/app/Magic/Fields/Field.php
@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
-use Cubist\Backpack\app\Magic\CubistMagicAttribute;
+use Cubist\Backpack\Magic\CubistMagicAttribute;
 use Cubist\Backpack\CubistBackpackServiceProvider;
 use Doctrine\DBAL\Schema\Table;
 use Exception;
 use Illuminate\Support\Str;
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 
 class Field implements \ArrayAccess
 {
diff --git a/src/app/Magic/Fields/Files.php b/src/app/Magic/Fields/Files.php
index 4f5dcd7..9177edc 100644
--- a/src/app/Magic/Fields/Files.php
+++ b/src/app/Magic/Fields/Files.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
 
diff --git a/src/app/Magic/Fields/Hidden.php b/src/app/Magic/Fields/Hidden.php
index 2c123dd..14fc708 100644
--- a/src/app/Magic/Fields/Hidden.php
+++ b/src/app/Magic/Fields/Hidden.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Hidden extends Field
diff --git a/src/app/Magic/Fields/Images.php b/src/app/Magic/Fields/Images.php
index 580386b..56704c6 100644
--- a/src/app/Magic/Fields/Images.php
+++ b/src/app/Magic/Fields/Images.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Images extends Files
diff --git a/src/app/Magic/Fields/Integer.php b/src/app/Magic/Fields/Integer.php
index c2a4a7e..4924a81 100644
--- a/src/app/Magic/Fields/Integer.php
+++ b/src/app/Magic/Fields/Integer.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Integer extends Number
diff --git a/src/app/Magic/Fields/Locale.php b/src/app/Magic/Fields/Locale.php
index 7adb521..cc9a257 100644
--- a/src/app/Magic/Fields/Locale.php
+++ b/src/app/Magic/Fields/Locale.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Illuminate\Support\Facades\App;
 
diff --git a/src/app/Magic/Fields/LocaleEnabled.php b/src/app/Magic/Fields/LocaleEnabled.php
index 89bfd7d..8148c1a 100644
--- a/src/app/Magic/Fields/LocaleEnabled.php
+++ b/src/app/Magic/Fields/LocaleEnabled.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Illuminate\Support\Facades\App;
 
diff --git a/src/app/Magic/Fields/Markdown.php b/src/app/Magic/Fields/Markdown.php
index 57630d0..e9f6aa3 100644
--- a/src/app/Magic/Fields/Markdown.php
+++ b/src/app/Magic/Fields/Markdown.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
 
diff --git a/src/app/Magic/Fields/Model.php b/src/app/Magic/Fields/Model.php
index 958a5bd..ce87a43 100644
--- a/src/app/Magic/Fields/Model.php
+++ b/src/app/Magic/Fields/Model.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Model extends Field
diff --git a/src/app/Magic/Fields/ModelAttribute.php b/src/app/Magic/Fields/ModelAttribute.php
index 34d5a78..0308080 100644
--- a/src/app/Magic/Fields/ModelAttribute.php
+++ b/src/app/Magic/Fields/ModelAttribute.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
-use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 
 class ModelAttribute extends StaticValue
 {
diff --git a/src/app/Magic/Fields/Number.php b/src/app/Magic/Fields/Number.php
index 88c09c9..5ee0ddf 100644
--- a/src/app/Magic/Fields/Number.php
+++ b/src/app/Magic/Fields/Number.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Number extends Field
diff --git a/src/app/Magic/Fields/PageInternal.php b/src/app/Magic/Fields/PageInternal.php
index b4c1322..22469b1 100644
--- a/src/app/Magic/Fields/PageInternal.php
+++ b/src/app/Magic/Fields/PageInternal.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
-use Cubist\Backpack\app\Magic\Models\CMSPage;
+use Cubist\Backpack\Magic\Models\CMSPage;
 
 class PageInternal extends SelectFromArray
 {
diff --git a/src/app/Magic/Fields/Password.php b/src/app/Magic/Fields/Password.php
index cd29753..6ff6072 100644
--- a/src/app/Magic/Fields/Password.php
+++ b/src/app/Magic/Fields/Password.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Password extends Text
diff --git a/src/app/Magic/Fields/Phone.php b/src/app/Magic/Fields/Phone.php
index 1b8ce31..67f7c37 100644
--- a/src/app/Magic/Fields/Phone.php
+++ b/src/app/Magic/Fields/Phone.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Phone extends Text
diff --git a/src/app/Magic/Fields/Postcode.php b/src/app/Magic/Fields/Postcode.php
index 8a2831d..fe33163 100644
--- a/src/app/Magic/Fields/Postcode.php
+++ b/src/app/Magic/Fields/Postcode.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Postcode extends Text
diff --git a/src/app/Magic/Fields/Range.php b/src/app/Magic/Fields/Range.php
index 882c9dd..800e411 100644
--- a/src/app/Magic/Fields/Range.php
+++ b/src/app/Magic/Fields/Range.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
diff --git a/src/app/Magic/Fields/RolesPermissions.php b/src/app/Magic/Fields/RolesPermissions.php
index 3378237..e1ee699 100644
--- a/src/app/Magic/Fields/RolesPermissions.php
+++ b/src/app/Magic/Fields/RolesPermissions.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class RolesPermissions extends Field
diff --git a/src/app/Magic/Fields/SelectFromArray.php b/src/app/Magic/Fields/SelectFromArray.php
index 8a0c547..01edf84 100644
--- a/src/app/Magic/Fields/SelectFromArray.php
+++ b/src/app/Magic/Fields/SelectFromArray.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
diff --git a/src/app/Magic/Fields/SelectFromModel.php b/src/app/Magic/Fields/SelectFromModel.php
index 1686a81..8876779 100644
--- a/src/app/Magic/Fields/SelectFromModel.php
+++ b/src/app/Magic/Fields/SelectFromModel.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
diff --git a/src/app/Magic/Fields/SiteVariant.php b/src/app/Magic/Fields/SiteVariant.php
index 3c0fb1b..4ec76de 100644
--- a/src/app/Magic/Fields/SiteVariant.php
+++ b/src/app/Magic/Fields/SiteVariant.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Illuminate\Support\Facades\App;
 
diff --git a/src/app/Magic/Fields/SiteVariantMultiple.php b/src/app/Magic/Fields/SiteVariantMultiple.php
index 8a0a186..68fb4c3 100644
--- a/src/app/Magic/Fields/SiteVariantMultiple.php
+++ b/src/app/Magic/Fields/SiteVariantMultiple.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 class SiteVariantMultiple extends SiteVariant
 {
diff --git a/src/app/Magic/Fields/Slug.php b/src/app/Magic/Fields/Slug.php
index 806fcb8..2aefba8 100644
--- a/src/app/Magic/Fields/Slug.php
+++ b/src/app/Magic/Fields/Slug.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 class Slug extends Field
 {
diff --git a/src/app/Magic/Fields/StaticValue.php b/src/app/Magic/Fields/StaticValue.php
index 372367b..5109259 100644
--- a/src/app/Magic/Fields/StaticValue.php
+++ b/src/app/Magic/Fields/StaticValue.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
diff --git a/src/app/Magic/Fields/Table.php b/src/app/Magic/Fields/Table.php
index 87733ad..ca7f64f 100644
--- a/src/app/Magic/Fields/Table.php
+++ b/src/app/Magic/Fields/Table.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Table extends Field
diff --git a/src/app/Magic/Fields/Tags.php b/src/app/Magic/Fields/Tags.php
index 0f73d1c..a310286 100644
--- a/src/app/Magic/Fields/Tags.php
+++ b/src/app/Magic/Fields/Tags.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
 
diff --git a/src/app/Magic/Fields/Text.php b/src/app/Magic/Fields/Text.php
index 22eb7fe..c7c6cfa 100644
--- a/src/app/Magic/Fields/Text.php
+++ b/src/app/Magic/Fields/Text.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 use Cubist\Backpack\CubistBackpackServiceProvider;
 
@@ -9,5 +9,5 @@ class Text extends Field
     protected $_databaseType = 'string';
     protected $_translatable = true;
     protected $_viewNamespace = CubistBackpackServiceProvider::NAMESPACE . '::fields';
-    
+
 }
diff --git a/src/app/Magic/Fields/Textarea.php b/src/app/Magic/Fields/Textarea.php
index 0978b1f..4ff96e8 100644
--- a/src/app/Magic/Fields/Textarea.php
+++ b/src/app/Magic/Fields/Textarea.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 
 class Textarea extends Field
diff --git a/src/app/Magic/Fields/URL.php b/src/app/Magic/Fields/URL.php
index 278298d..2574fcb 100644
--- a/src/app/Magic/Fields/URL.php
+++ b/src/app/Magic/Fields/URL.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 class URL extends Field
 {
diff --git a/src/app/Magic/Fields/User.php b/src/app/Magic/Fields/User.php
index 721bd22..3365c36 100644
--- a/src/app/Magic/Fields/User.php
+++ b/src/app/Magic/Fields/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 class User extends SelectFromModel
 {
diff --git a/src/app/Magic/Fields/VATNumber.php b/src/app/Magic/Fields/VATNumber.php
index 392f0c8..c21fe60 100644
--- a/src/app/Magic/Fields/VATNumber.php
+++ b/src/app/Magic/Fields/VATNumber.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Fields;
+namespace Cubist\Backpack\Magic\Fields;
 
 class VATNumber extends Text
 {
diff --git a/src/app/Magic/Menu/Facade.php b/src/app/Magic/Menu/Facade.php
index fc23380..84cded3 100644
--- a/src/app/Magic/Menu/Facade.php
+++ b/src/app/Magic/Menu/Facade.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Menu;
+namespace Cubist\Backpack\Magic\Menu;
 
 use \Illuminate\Support\Facades\Facade as BaseFacade;
 
diff --git a/src/app/Magic/Menu/Item.php b/src/app/Magic/Menu/Item.php
index 58f8d47..1330aec 100644
--- a/src/app/Magic/Menu/Item.php
+++ b/src/app/Magic/Menu/Item.php
@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Menu;
-
-use Cubist\Backpack\app\Magic\Models\CMSPage;
-use Cubist\Backpack\app\Magic\Models\CubistMagicPageModel;
-use Cubist\Backpack\app\Magic\Models\Locale;
-use Cubist\Backpack\app\Magic\PageData;
-use Cubist\Backpack\app\Template\Navigation;
-use Cubist\Backpack\app\Facades\App;
+namespace Cubist\Backpack\Magic\Menu;
+
+use Cubist\Backpack\Magic\Models\CMSPage;
+use Cubist\Backpack\Magic\Models\CubistMagicPageModel;
+use Cubist\Backpack\Magic\Models\Locale;
+use Cubist\Backpack\Magic\PageData;
+use Cubist\Backpack\Template\Navigation;
+use Cubist\Backpack\Facades\App;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Str;
diff --git a/src/app/Magic/Menu/Menu.php b/src/app/Magic/Menu/Menu.php
index cb185b1..14e5938 100644
--- a/src/app/Magic/Menu/Menu.php
+++ b/src/app/Magic/Menu/Menu.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Menu;
+namespace Cubist\Backpack\Magic\Menu;
 
-use Cubist\Backpack\app\Template\Navigation;
-use Cubist\Backpack\app\Template\Redirection;
-use Cubist\Backpack\app\Facades\App;
+use Cubist\Backpack\Template\Navigation;
+use Cubist\Backpack\Template\Redirection;
+use Cubist\Backpack\Facades\App;
 use Lavary\Menu\Menu as BaseMenu;
 use Illuminate\Support\Facades\Cache;
 
@@ -79,7 +79,7 @@ class Menu extends BaseMenu
     }
 
     /**
-     * @return Cubist\Backpack\app\Magic\Menu\Item[]
+     * @return Cubist\Backpack\Magic\Menu\Item[]
      */
     public static function getAllNavigablePages($locale = null, $variant = null)
     {
diff --git a/src/app/Magic/Menu/PageItem.php b/src/app/Magic/Menu/PageItem.php
index 6daa438..970f6ae 100644
--- a/src/app/Magic/Menu/PageItem.php
+++ b/src/app/Magic/Menu/PageItem.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Menu;
+namespace Cubist\Backpack\Magic\Menu;
 
 
-use Cubist\Backpack\app\Magic\Models\CMSPage;
-use Cubist\Backpack\app\Magic\Models\CubistMagicPageModel;
+use Cubist\Backpack\Magic\Models\CMSPage;
+use Cubist\Backpack\Magic\Models\CubistMagicPageModel;
 
 class PageItem extends Item
 {
diff --git a/src/app/Magic/Menu/VirtualItem.php b/src/app/Magic/Menu/VirtualItem.php
index eaf312b..5038935 100644
--- a/src/app/Magic/Menu/VirtualItem.php
+++ b/src/app/Magic/Menu/VirtualItem.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Menu;
+namespace Cubist\Backpack\Magic\Menu;
 
 
 class VirtualItem extends Item
diff --git a/src/app/Magic/Models/CMSPage.php b/src/app/Magic/Models/CMSPage.php
index 6363fd1..20509b3 100644
--- a/src/app/Magic/Models/CMSPage.php
+++ b/src/app/Magic/Models/CMSPage.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-use Cubist\Backpack\app\Template\TemplateAbstract;
-use Cubist\Backpack\app\Facades\App;
+use Cubist\Backpack\Magic\Controllers\CubistMagicController;
+use Cubist\Backpack\Template\TemplateAbstract;
+use Cubist\Backpack\Facades\App;
 use Cubist\Util\Json;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
@@ -79,7 +79,7 @@ class CMSPage extends CubistMagicNestedModel
     }
 
     /**
-     * @param \Cubist\Backpack\app\Magic\Controllers\CubistMagicController $controller
+     * @param \Cubist\Backpack\Magic\Controllers\CubistMagicController $controller
      * @throws \Exception
      */
     public function onBeforeCreate($controller)
@@ -249,7 +249,7 @@ class CMSPage extends CubistMagicNestedModel
     public static function getPageClass()
     {
         $class = CMSPage::class;
-        $config = config('cubist.page_model', 'Cubist\Backpack\app\Magic\Models\CMSPage');
+        $config = config('cubist.page_model', 'Cubist\Backpack\Magic\Models\CMSPage');
         if (class_exists($config)) {
             $class = $config;
         }
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index dd674ba..2fad7ca 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
 use Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
 use Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
@@ -8,19 +8,19 @@ use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
 use Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
 use Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
 use Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
-use Cubist\Backpack\app\CubistCrudPanel;
-use Cubist\Backpack\app\Http\Controllers\Operations\BulkPublishOperation;
+use Cubist\Backpack\CubistCrudPanel;
+use Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation;
 use Backpack\ReviseOperation\ReviseOperation;
 use Backpack\CRUD\app\Library\CrudPanel\CrudPanel;
 use Backpack\CRUD\app\Models\Traits\CrudTrait;
-use Cubist\Backpack\app\Magic\BunchOfFields;
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
-use Cubist\Backpack\app\Magic\EntityData;
-use Cubist\Backpack\app\Magic\Fields\Field;
-use Cubist\Backpack\app\Magic\PageData;
-use Cubist\Backpack\app\Magic\QueryBuilder;
-use Cubist\Backpack\app\Magic\Requests\CubistMagicUpdateRequest;
-use Cubist\Backpack\app\Magic\Util;
+use Cubist\Backpack\Magic\BunchOfFields;
+use Cubist\Backpack\Magic\Controllers\CubistMagicController;
+use Cubist\Backpack\Magic\EntityData;
+use Cubist\Backpack\Magic\Fields\Field;
+use Cubist\Backpack\Magic\PageData;
+use Cubist\Backpack\Magic\QueryBuilder;
+use Cubist\Backpack\Magic\Requests\CubistMagicUpdateRequest;
+use Cubist\Backpack\Magic\Util;
 use Cubist\Util\Json;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
diff --git a/src/app/Magic/Models/CubistMagicAuthenticatable.php b/src/app/Magic/Models/CubistMagicAuthenticatable.php
index a0a996f..043136d 100644
--- a/src/app/Magic/Models/CubistMagicAuthenticatable.php
+++ b/src/app/Magic/Models/CubistMagicAuthenticatable.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
 use Backpack\CRUD\app\Models\Traits\InheritsRelationsFromParentModel;
 use Backpack\CRUD\app\Notifications\ResetPasswordNotification;
diff --git a/src/app/Magic/Models/CubistMagicNestedModel.php b/src/app/Magic/Models/CubistMagicNestedModel.php
index 93787de..a817a10 100644
--- a/src/app/Magic/Models/CubistMagicNestedModel.php
+++ b/src/app/Magic/Models/CubistMagicNestedModel.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
-use Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController;
+use Cubist\Backpack\Magic\Controllers\CubistMagicNestedController;
 
 class CubistMagicNestedModel extends CubistMagicPageModel
 {
diff --git a/src/app/Magic/Models/CubistMagicPageModel.php b/src/app/Magic/Models/CubistMagicPageModel.php
index 03d40c4..cdd0f6c 100644
--- a/src/app/Magic/Models/CubistMagicPageModel.php
+++ b/src/app/Magic/Models/CubistMagicPageModel.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
 
 class CubistMagicPageModel extends CubistMagicTranslatableModel
diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php
index 4849850..a960bff 100644
--- a/src/app/Magic/Models/CubistMagicTranslatableModel.php
+++ b/src/app/Magic/Models/CubistMagicTranslatableModel.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
 use Backpack\CRUD\app\Models\Traits\SpatieTranslatable\HasTranslations;
 use Backpack\CRUD\app\Models\Traits\SpatieTranslatable\Sluggable;
diff --git a/src/app/Magic/Models/Locale.php b/src/app/Magic/Models/Locale.php
index 401e9ce..1bccca4 100644
--- a/src/app/Magic/Models/Locale.php
+++ b/src/app/Magic/Models/Locale.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
 
-use Cubist\Backpack\app\Facades\App;
+use Cubist\Backpack\Facades\App;
 
 class Locale extends CubistMagicAbstractModel
 {
@@ -127,7 +127,7 @@ class Locale extends CubistMagicAbstractModel
     {
 
         $class = self::class;
-        $config = config('cubist.locale_model', 'Cubist\Backpack\app\Magic\Models\Locale');
+        $config = config('cubist.locale_model', 'Cubist\Backpack\Magic\Models\Locale');
         if (class_exists($config)) {
             $class = $config;
         }
diff --git a/src/app/Magic/Models/News.php b/src/app/Magic/Models/News.php
index 3b4646a..e2eef02 100644
--- a/src/app/Magic/Models/News.php
+++ b/src/app/Magic/Models/News.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
 class News extends CubistMagicPageModel
 {
diff --git a/src/app/Magic/Models/Settings.php b/src/app/Magic/Models/Settings.php
index 5f4faec..f587cc2 100644
--- a/src/app/Magic/Models/Settings.php
+++ b/src/app/Magic/Models/Settings.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
-use Cubist\Backpack\app\Http\Controllers\CubistPWAController;
-use Cubist\Backpack\app\Magic\PageData;
-use Cubist\Backpack\app\Facades\App;
+use Cubist\Backpack\Http\Controllers\CubistPWAController;
+use Cubist\Backpack\Magic\PageData;
+use Cubist\Backpack\Facades\App;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class Settings extends CubistMagicTranslatableModel
@@ -149,7 +149,7 @@ class Settings extends CubistMagicTranslatableModel
     public static function getSettingsClass()
     {
         $class = self::class;
-        $config = config('cubist.settings_model', 'Cubist\Backpack\app\Magic\Models\Settings');
+        $config = config('cubist.settings_model', 'Cubist\Backpack\Magic\Models\Settings');
         if (class_exists($config)) {
             $class = $config;
         }
diff --git a/src/app/Magic/Models/Translate.php b/src/app/Magic/Models/Translate.php
index 55df37c..9ddfa7c 100644
--- a/src/app/Magic/Models/Translate.php
+++ b/src/app/Magic/Models/Translate.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic\Models;
+namespace Cubist\Backpack\Magic\Models;
 
 class Translate extends CubistMagicTranslatableModel
 {
@@ -45,8 +45,8 @@ class Translate extends CubistMagicTranslatableModel
     }
 
     /**
-     * @param \Cubist\Backpack\app\Magic\Controllers\CubistMagicController $controller
-     * @param \Cubist\Backpack\app\Magic\Requests\CubistMagicUpdateRequest $request
+     * @param \Cubist\Backpack\Magic\Controllers\CubistMagicController $controller
+     * @param \Cubist\Backpack\Magic\Requests\CubistMagicUpdateRequest $request
      */
     public function onBeforeUpdate($controller, $request)
     {
@@ -55,8 +55,8 @@ class Translate extends CubistMagicTranslatableModel
     }
 
     /**
-     * @param \Cubist\Backpack\app\Magic\Controllers\CubistMagicController $controller
-     * @param \Cubist\Backpack\app\Magic\Requests\CubistMagicUpdateRequest $request
+     * @param \Cubist\Backpack\Magic\Controllers\CubistMagicController $controller
+     * @param \Cubist\Backpack\Magic\Requests\CubistMagicUpdateRequest $request
      */
     public function saveLanguageFile($controller, $request)
     {
diff --git a/src/app/Magic/PageData.php b/src/app/Magic/PageData.php
index ef1334a..8cfd089 100644
--- a/src/app/Magic/PageData.php
+++ b/src/app/Magic/PageData.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic;
+namespace Cubist\Backpack\Magic;
 
-use Cubist\Backpack\app\Magic\Models\Settings;
+use Cubist\Backpack\Magic\Models\Settings;
 
 class PageData extends EntityData
 {
diff --git a/src/app/Magic/QueryBuilder.php b/src/app/Magic/QueryBuilder.php
index 0397a06..d588e8c 100644
--- a/src/app/Magic/QueryBuilder.php
+++ b/src/app/Magic/QueryBuilder.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic;
+namespace Cubist\Backpack\Magic;
 
-use Cubist\Backpack\app\Facades\App;
+use Cubist\Backpack\Facades\App;
 use Illuminate\Database\Eloquent\Builder;
 
 class QueryBuilder extends Builder
diff --git a/src/app/Magic/Requests/CubistMagicRequest.php b/src/app/Magic/Requests/CubistMagicRequest.php
index 72854c8..6a81f09 100644
--- a/src/app/Magic/Requests/CubistMagicRequest.php
+++ b/src/app/Magic/Requests/CubistMagicRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Requests;
+namespace Cubist\Backpack\Magic\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/src/app/Magic/Requests/CubistMagicStoreRequest.php b/src/app/Magic/Requests/CubistMagicStoreRequest.php
index efe3725..a12dffb 100644
--- a/src/app/Magic/Requests/CubistMagicStoreRequest.php
+++ b/src/app/Magic/Requests/CubistMagicStoreRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Requests;
+namespace Cubist\Backpack\Magic\Requests;
 
 class CubistMagicStoreRequest extends CubistMagicRequest
 {
diff --git a/src/app/Magic/Requests/CubistMagicUpdateRequest.php b/src/app/Magic/Requests/CubistMagicUpdateRequest.php
index b22e8e9..e587e23 100644
--- a/src/app/Magic/Requests/CubistMagicUpdateRequest.php
+++ b/src/app/Magic/Requests/CubistMagicUpdateRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic\Requests;
+namespace Cubist\Backpack\Magic\Requests;
 
 class CubistMagicUpdateRequest extends CubistMagicRequest
 {
diff --git a/src/app/Magic/Search.php b/src/app/Magic/Search.php
index 8543616..634c125 100644
--- a/src/app/Magic/Search.php
+++ b/src/app/Magic/Search.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic;
+namespace Cubist\Backpack\Magic;
 
-use Cubist\Backpack\app\Magic\Models\Locale;
-use Cubist\Backpack\app\Magic\Menu\Menu;
-use Cubist\Backpack\app\Facades\App;
+use Cubist\Backpack\Magic\Models\Locale;
+use Cubist\Backpack\Magic\Menu\Menu;
+use Cubist\Backpack\Facades\App;
 use Cubist\Util\XML\DOMSelector;
 use Cviebrock\LaravelElasticsearch\Facade as Elasticsearch;
 
@@ -183,7 +183,7 @@ class Search
                 'body' => $body
             ]);
 
-        /** @var Cubist\Backpack\app\Magic\Menu\Item[] $pages */
+        /** @var Cubist\Backpack\Magic\Menu\Item[] $pages */
         $pages = Menu::getAllNavigablePages($locale, $variant);
         $indexed = [];
 
diff --git a/src/app/Magic/SubForm.php b/src/app/Magic/SubForm.php
index 0c5cb4d..4a6560f 100644
--- a/src/app/Magic/SubForm.php
+++ b/src/app/Magic/SubForm.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Magic;
+namespace Cubist\Backpack\Magic;
 
 
 class SubForm
diff --git a/src/app/Magic/Util.php b/src/app/Magic/Util.php
index 36b87d8..f20a0e1 100644
--- a/src/app/Magic/Util.php
+++ b/src/app/Magic/Util.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Magic;
+namespace Cubist\Backpack\Magic;
 
 
 class Util
diff --git a/src/app/Markdown/Heading/Extension.php b/src/app/Markdown/Heading/Extension.php
index b70e245..099c212 100644
--- a/src/app/Markdown/Heading/Extension.php
+++ b/src/app/Markdown/Heading/Extension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Markdown\Heading;
+namespace Cubist\Backpack\Markdown\Heading;
 
 
 use League\CommonMark\Block\Element\Heading;
diff --git a/src/app/Markdown/Heading/Renderer.php b/src/app/Markdown/Heading/Renderer.php
index ca2edc4..3aaf247 100644
--- a/src/app/Markdown/Heading/Renderer.php
+++ b/src/app/Markdown/Heading/Renderer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Markdown\Heading;
+namespace Cubist\Backpack\Markdown\Heading;
 
 use League\CommonMark\Block\Element\AbstractBlock;
 use League\CommonMark\Block\Element\Heading;
diff --git a/src/app/Markdown/InternaLink/Extension.php b/src/app/Markdown/InternaLink/Extension.php
index 65ef941..0e826be 100644
--- a/src/app/Markdown/InternaLink/Extension.php
+++ b/src/app/Markdown/InternaLink/Extension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Markdown\InternalLink;
+namespace Cubist\Backpack\Markdown\InternalLink;
 
 
 use League\CommonMark\Block\Element\Heading;
diff --git a/src/app/Markdown/InternaLink/Renderer.php b/src/app/Markdown/InternaLink/Renderer.php
index f599fed..ce724da 100644
--- a/src/app/Markdown/InternaLink/Renderer.php
+++ b/src/app/Markdown/InternaLink/Renderer.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Markdown\InternalLink;
+namespace Cubist\Backpack\Markdown\InternalLink;
 
 
-use Cubist\Backpack\app\Magic\Menu\Menu;
+use Cubist\Backpack\Magic\Menu\Menu;
 use League\CommonMark\ElementRendererInterface;
 use League\CommonMark\HtmlElement;
 use League\CommonMark\Inline\Element\AbstractInline;
diff --git a/src/app/Markdown/Wrapper/Extension.php b/src/app/Markdown/Wrapper/Extension.php
index 18274b1..a82a3aa 100644
--- a/src/app/Markdown/Wrapper/Extension.php
+++ b/src/app/Markdown/Wrapper/Extension.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Markdown\Wrapper;
+namespace Cubist\Backpack\Markdown\Wrapper;
 
 
 use League\CommonMark\Block\Element\Document;
diff --git a/src/app/Markdown/Wrapper/Renderer.php b/src/app/Markdown/Wrapper/Renderer.php
index b988b25..adc7e95 100644
--- a/src/app/Markdown/Wrapper/Renderer.php
+++ b/src/app/Markdown/Wrapper/Renderer.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Markdown\Wrapper;
+namespace Cubist\Backpack\Markdown\Wrapper;
 
 
 use League\CommonMark\Block\Element\AbstractBlock;
diff --git a/src/app/Middleware/CubistMiddleware.php b/src/app/Middleware/CubistMiddleware.php
index be0e7ba..c283ccd 100644
--- a/src/app/Middleware/CubistMiddleware.php
+++ b/src/app/Middleware/CubistMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cubist\Backpack\app\Middleware;
+namespace Cubist\Backpack\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
diff --git a/src/app/Middleware/EmailObfuscate.php b/src/app/Middleware/EmailObfuscate.php
index f033596..f50f2e7 100644
--- a/src/app/Middleware/EmailObfuscate.php
+++ b/src/app/Middleware/EmailObfuscate.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Middleware;
+namespace Cubist\Backpack\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Support\Renderable;
diff --git a/src/app/Middleware/LocaleSelector.php b/src/app/Middleware/LocaleSelector.php
index 75876dd..4eea5b1 100644
--- a/src/app/Middleware/LocaleSelector.php
+++ b/src/app/Middleware/LocaleSelector.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Cubist\Backpack\app\Middleware;
+namespace Cubist\Backpack\Middleware;
 
 use Closure;
-use Cubist\Backpack\app\Magic\Models\Locale;
+use Cubist\Backpack\Magic\Models\Locale;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 
diff --git a/src/app/Middleware/VariantSelector.php b/src/app/Middleware/VariantSelector.php
index f00161a..7d675d9 100644
--- a/src/app/Middleware/VariantSelector.php
+++ b/src/app/Middleware/VariantSelector.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Cubist\Backpack\app\Middleware;
+namespace Cubist\Backpack\Middleware;
 
 use Closure;
-use Cubist\Backpack\app\Magic\Models\Locale;
+use Cubist\Backpack\Magic\Models\Locale;
 use Illuminate\Http\Request;
-use Cubist\Backpack\app\Facades\App;
+use Cubist\Backpack\Facades\App;
 
 
 class VariantSelector extends CubistMiddleware
diff --git a/src/app/Template/FirstRedirection.php b/src/app/Template/FirstRedirection.php
index a4f93a5..2eaaa50 100644
--- a/src/app/Template/FirstRedirection.php
+++ b/src/app/Template/FirstRedirection.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Template;
+namespace Cubist\Backpack\Template;
 
 
 class FirstRedirection extends Redirection
diff --git a/src/app/Template/InternalRedirection.php b/src/app/Template/InternalRedirection.php
index fb97004..82de3a8 100644
--- a/src/app/Template/InternalRedirection.php
+++ b/src/app/Template/InternalRedirection.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Template;
+namespace Cubist\Backpack\Template;
 
 
 class InternalRedirection extends Redirection
diff --git a/src/app/Template/Navigation.php b/src/app/Template/Navigation.php
index 22d285e..ec367b6 100644
--- a/src/app/Template/Navigation.php
+++ b/src/app/Template/Navigation.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Template;
+namespace Cubist\Backpack\Template;
 
 
 class Navigation extends TemplateAbstract
diff --git a/src/app/Template/Redirection.php b/src/app/Template/Redirection.php
index b979630..22ceed7 100644
--- a/src/app/Template/Redirection.php
+++ b/src/app/Template/Redirection.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Template;
+namespace Cubist\Backpack\Template;
 
 
 class Redirection extends TemplateAbstract
diff --git a/src/app/Template/TemplateAbstract.php b/src/app/Template/TemplateAbstract.php
index fe2af61..d61d783 100644
--- a/src/app/Template/TemplateAbstract.php
+++ b/src/app/Template/TemplateAbstract.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cubist\Backpack\app\Template;
+namespace Cubist\Backpack\Template;
 
-use Cubist\Backpack\app\Magic\Menu\Item;
+use Cubist\Backpack\Magic\Menu\Item;
 use Illuminate\Support\Str;
 
 class TemplateAbstract
diff --git a/src/app/Template/TemplatePage.php b/src/app/Template/TemplatePage.php
index b3b2238..86fab63 100644
--- a/src/app/Template/TemplatePage.php
+++ b/src/app/Template/TemplatePage.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Cubist\Backpack\app\Template;
+namespace Cubist\Backpack\Template;
 
 class TemplatePage extends TemplateAbstract
 {
diff --git a/src/resources/config/app.php b/src/resources/config/app.php
index 08b2395..f241cce 100644
--- a/src/resources/config/app.php
+++ b/src/resources/config/app.php
@@ -1,7 +1,7 @@
 <?php
 return [
     'aliases' => [
-        'App' => Cubist\Backpack\app\Facades\App::class,
+        'App' => Cubist\Backpack\Facades\App::class,
         'Arr' => Illuminate\Support\Arr::class,
         'Str' => Illuminate\Support\Str::class,
     ],
diff --git a/src/resources/install/app/Http/Controllers/PageController.php b/src/resources/install/app/Http/Controllers/PageController.php
index 8881bfd..af718d8 100644
--- a/src/resources/install/app/Http/Controllers/PageController.php
+++ b/src/resources/install/app/Http/Controllers/PageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Cubist\Backpack\app\Http\Controllers\CubistPageController;
+use Cubist\Backpack\Http\Controllers\CubistPageController;
 
 class PageController extends CubistPageController
 {
diff --git a/src/resources/install/app/Http/Kernel.php b/src/resources/install/app/Http/Kernel.php
index 8fbb543..88476b6 100644
--- a/src/resources/install/app/Http/Kernel.php
+++ b/src/resources/install/app/Http/Kernel.php
@@ -19,7 +19,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \Cubist\Backpack\app\Middleware\VariantSelector::class,
+        \Cubist\Backpack\Middleware\VariantSelector::class,
         \Spatie\Honeypot\ProtectAgainstSpam::class,
     ];
 
@@ -35,12 +35,12 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             \Backpack\CRUD\app\Http\Middleware\UseBackpackAuthGuardInsteadOfDefaultAuthGuard::class,
             \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Cubist\Backpack\app\Middleware\VariantSelector::class,
-            \Cubist\Backpack\app\Middleware\LocaleSelector::class,
+            \Cubist\Backpack\Middleware\VariantSelector::class,
+            \Cubist\Backpack\Middleware\LocaleSelector::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \Cubist\Backpack\app\Middleware\EmailObfuscate::class,
+            \Cubist\Backpack\Middleware\EmailObfuscate::class,
             \App\Http\Middleware\Menu::class,
         ],
 
@@ -83,8 +83,8 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\Authenticate::class,
         \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \Cubist\Backpack\app\Middleware\VariantSelector::class,
-        \Cubist\Backpack\app\Middleware\LocaleSelector::class,
+        \Cubist\Backpack\Middleware\VariantSelector::class,
+        \Cubist\Backpack\Middleware\LocaleSelector::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,
     ];
diff --git a/src/resources/install/app/Models/Locale.php b/src/resources/install/app/Models/Locale.php
index fd75ee0..093c228 100644
--- a/src/resources/install/app/Models/Locale.php
+++ b/src/resources/install/app/Models/Locale.php
@@ -2,7 +2,7 @@
 namespace App\Models;
 
 
-class Locale extends \Cubist\Backpack\app\Magic\Models\Locale
+class Locale extends \Cubist\Backpack\Magic\Models\Locale
 {
 
 }
diff --git a/src/resources/install/app/Models/Page.php b/src/resources/install/app/Models/Page.php
index f2fc9bb..1775a51 100644
--- a/src/resources/install/app/Models/Page.php
+++ b/src/resources/install/app/Models/Page.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Cubist\Backpack\app\Magic\Models\CMSPage;
+use Cubist\Backpack\Magic\Models\CMSPage;
 
 class Page extends CMSPage
 {
diff --git a/src/resources/install/app/Models/Settings.php b/src/resources/install/app/Models/Settings.php
index f6c57cc..7210b64 100644
--- a/src/resources/install/app/Models/Settings.php
+++ b/src/resources/install/app/Models/Settings.php
@@ -4,7 +4,7 @@
 namespace App\Models;
 
 
-class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
+class Settings extends \Cubist\Backpack\Magic\Models\Settings
 {
     public function setFields()
     {
diff --git a/src/resources/install/bootstrap/app.php b/src/resources/install/bootstrap/app.php
index 521fba4..8d4e15e 100644
--- a/src/resources/install/bootstrap/app.php
+++ b/src/resources/install/bootstrap/app.php
@@ -11,7 +11,7 @@
 |
 */
 
-$app = new Cubist\Backpack\app\Application(
+$app = new Cubist\Backpack\Application(
     $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
diff --git a/src/resources/install/config/markdown.php b/src/resources/install/config/markdown.php
index 5f7115c..fbb3d62 100644
--- a/src/resources/install/config/markdown.php
+++ b/src/resources/install/config/markdown.php
@@ -42,11 +42,11 @@ return [
     */
 
     'extensions' => [
-        Cubist\Backpack\app\Markdown\Heading\Extension::class,
-        Cubist\Backpack\app\Markdown\Wrapper\Extension::class,
+        Cubist\Backpack\Markdown\Heading\Extension::class,
+        Cubist\Backpack\Markdown\Wrapper\Extension::class,
         League\CommonMark\Ext\Autolink\AutolinkExtension::class,
         League\CommonMark\Ext\Table\TableExtension::class,
-        Cubist\Backpack\app\Markdown\InternalLink\Extension::class,
+        Cubist\Backpack\Markdown\InternalLink\Extension::class,
 
     ],
 
diff --git a/src/resources/views/favicon.blade.php b/src/resources/views/favicon.blade.php
index 364cd70..c123d21 100644
--- a/src/resources/views/favicon.blade.php
+++ b/src/resources/views/favicon.blade.php
@@ -1,6 +1,6 @@
-@foreach(Cubist\Backpack\app\Http\Controllers\CubistPWAController::$faviconSizes as $size)
+@foreach(Cubist\Backpack\Http\Controllers\CubistPWAController::$faviconSizes as $size)
 <link rel="icon" type="image/png" sizes="{{$size}}x{{$size}}" href="{{ $global->getImageUrl('favicon','favicon_'.$size) }}">
 @endforeach
-@foreach(Cubist\Backpack\app\Http\Controllers\CubistPWAController::$iosSizes as $size)
+@foreach(Cubist\Backpack\Http\Controllers\CubistPWAController::$iosSizes as $size)
 <link rel="apple-touch-icon" type="image/png" sizes="{{$size}}x{{$size}}" href="{{ $global->getImageUrl('favicon_ios','favicon_ios_'.$size) }}">
 @endforeach
diff --git a/src/resources/views/fields/button.blade.php b/src/resources/views/fields/button.blade.php
index 8cf274a..5854edc 100644
--- a/src/resources/views/fields/button.blade.php
+++ b/src/resources/views/fields/button.blade.php
@@ -4,7 +4,7 @@
 $link_types = ['none' => 'Désactiver', 'page_link' => trans('backpack::crud.page_link'), 'internal_link' => trans('backpack::crud.internal_link'), 'external_link' => trans('backpack::crud.external_link')];
 $field['allows_null'] = false;
 $page_model = $field['page_model'];
-$active_pages = \Cubist\Backpack\app\Magic\Models\CMSPage::getPagesList();
+$active_pages = \Cubist\Backpack\Magic\Models\CMSPage::getPagesList();
 
 $empty = ['label' => '', 'type' => 'none', 'link' => '', 'external_link' => '', 'page_id' => ''];
 $value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? [];
diff --git a/src/routes/cubist/backpack/pwa.php b/src/routes/cubist/backpack/pwa.php
index 1573788..3046fcc 100644
--- a/src/routes/cubist/backpack/pwa.php
+++ b/src/routes/cubist/backpack/pwa.php
@@ -1,3 +1,3 @@
 <?php
-Route::get('/manifest.webmanifest', '\Cubist\Backpack\app\Http\Controllers\CubistPWAController@manifest');
-Route::get('/favicon.ico', '\Cubist\Backpack\app\Http\Controllers\CubistPWAController@favicon');
+Route::get('/manifest.webmanifest', '\Cubist\Backpack\Http\Controllers\CubistPWAController@manifest');
+Route::get('/favicon.ico', '\Cubist\Backpack\Http\Controllers\CubistPWAController@favicon');
diff --git a/src/routes/cubist/backpack/seo.php b/src/routes/cubist/backpack/seo.php
index 4b0c59a..e0fc4c3 100644
--- a/src/routes/cubist/backpack/seo.php
+++ b/src/routes/cubist/backpack/seo.php
@@ -1,3 +1,3 @@
 <?php
-Route::get('/robots.txt', '\Cubist\Backpack\app\Http\Controllers\CubistSEOController@robots');
-Route::get('/sitemap.xml', '\Cubist\Backpack\app\Http\Controllers\CubistSEOController@sitemap');
+Route::get('/robots.txt', '\Cubist\Backpack\Http\Controllers\CubistSEOController@robots');
+Route::get('/sitemap.xml', '\Cubist\Backpack\Http\Controllers\CubistSEOController@sitemap');