FEATURE: change directory structure

templates/Base/OnePage/Events/AddPageIntoHomepage.php

@@ -1,7 +1,7 @@
 <?php
 namespace Templates\Base\OnePage\Events;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Queue\SerializesModels;
 
 class AddPageIntoHomepage {

templates/Base/OnePage/Events/RemovePageFromHomepage.php

@@ -1,7 +1,7 @@
 <?php
 namespace Templates\Base\OnePage\Events;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Queue\SerializesModels;
 
 class RemovePageFromHomepage {

templates/Base/OnePage/Handlers/OnePage.php

@@ -1,20 +1,20 @@
 <?php
 namespace Templates\Base\OnePage\Handlers;
 
-use App\Handlers\Contracts\TemplateHandler;
-use App\Helpers\CurrentTemplate;
-use App\Helpers\PageRenderer;
-use App\Helpers\Settings;
-use App\Helpers\Template;
+use App\CMS\Handlers\Contracts\TemplateHandler;
+use App\CMS\Helpers\CurrentTemplate;
+use App\CMS\Helpers\PageRenderer;
+use App\CMS\Helpers\Settings;
+use App\CMS\Helpers\Template;
 use App\Models\ActionLogType;
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\Module;
 use App\Models\Settings as SettingsModel;
 use App\Models\User;
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 use App\Models\WidgetArea;
 use App\Models\WidgetInWidgetArea;
-use App\Models\WidgetType;
+use App\Models\Widgets\WidgetType;
 use Illuminate\Support\Facades\Auth;
 use Templates\Base\OnePage\Widgets\OnePageMenu\OnePageMenu;
 

templates/Base/OnePage/Http/Controllers/Admin/SetHomepage.php

@@ -1,9 +1,9 @@
 <?php
 namespace Templates\Base\OnePage\Http\Controllers\Admin;
 
-use App\Helpers\Settings;
+use App\CMS\Helpers\Settings;
 use App\Http\Controllers\Admin\Controller;
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\Settings as SettingsModel;
 use Illuminate\Support\Facades\Event;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;

templates/Base/OnePage/Listeners/HomepageChanged.php

@@ -2,7 +2,7 @@
 namespace Templates\Base\OnePage\Listeners;
 
 use App\Events\SetHomepage;
-use App\Helpers\Settings;
+use App\CMS\Helpers\Settings;
 use App\Models\Settings as SettingsModel;
 use Templates\Base\OnePage\Handlers\OnePage;
 

templates/Base/OnePage/Listeners/Loggers/LogAddingPage.php

@@ -1,7 +1,7 @@
 <?php
-namespace Templates\Base\OnePage\Listeners;
+namespace Templates\Base\OnePage\Listeners\Loggers;
 
-use App\Listeners\Logger;
+use App\Listeners\Loggers\Logger;
 use Templates\Base\OnePage\Events\AddPageIntoHomepage;
 
 class LogAddingPage extends Logger

templates/Base/OnePage/Listeners/Loggers/LogRemovingPage.php

@@ -1,7 +1,7 @@
 <?php
-namespace Templates\Base\OnePage\Listeners;
+namespace Templates\Base\OnePage\Listeners\Loggers;
 
-use App\Listeners\Logger;
+use App\Listeners\Loggers\Logger;
 use Templates\Base\OnePage\Events\RemovePageFromHomepage;
 
 class LogRemovingPage extends Logger

templates/Base/OnePage/Providers/EventProvider.php

@@ -6,8 +6,8 @@ use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvi
 use Templates\Base\OnePage\Events\AddPageIntoHomepage;
 use Templates\Base\OnePage\Events\RemovePageFromHomepage;
 use Templates\Base\OnePage\Listeners\HomepageChanged;
-use Templates\Base\OnePage\Listeners\LogAddingPage;
-use Templates\Base\OnePage\Listeners\LogRemovingPage;
+use Templates\Base\OnePage\Listeners\Loggers\LogAddingPage;
+use Templates\Base\OnePage\Listeners\Loggers\LogRemovingPage;
 
 class EventProvider extends ServiceProvider
 {

templates/Base/OnePage/Widgets/OnePageMenu/OnePageMenu.php

@@ -1,12 +1,12 @@
 <?php
 namespace Templates\Base\OnePage\Widgets\OnePageMenu;
 
-use App\Models\Widget;
-use App\Widgets\Contracts\WidgetRenderer;
-use App\Widgets\NonInstallableWidget;
+use App\CMS\Contracts\Widgets\PublicWidget;
+use App\CMS\Contracts\Widgets\WidgetRenderer;
+use App\Models\Widgets\Widget;
 use stdClass;
 
-class OnePageMenu extends NonInstallableWidget
+class OnePageMenu implements PublicWidget
 {
     /**
      * Name getter
@@ -39,8 +39,8 @@ class OnePageMenu extends NonInstallableWidget
     }
 
     /**
-     * @param Widget $widget
-     * @param stdClass          $data
+     * @param Widget   $widget
+     * @param stdClass $data
      *
      * @return mixed
      */

templates/Base/OnePage/Widgets/OnePageMenu/Presenter.php

@@ -1,9 +1,9 @@
 <?php
 namespace Templates\Base\OnePage\Widgets\OnePageMenu;
 
-use App\Models\Widget;
-use App\Models\WidgetType;
-use App\Widgets\Contracts\WidgetRenderer;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetType;
+use App\CMS\Contracts\Widgets\WidgetRenderer;
 use Templates\Base\OnePage\Handlers\OnePage;
 
 class Presenter implements WidgetRenderer