FEATURE: change directory structure

modules/ContactForm/Handlers/ContactForm.php

@@ -1,12 +1,12 @@
 <?php
 namespace Modules\ContactForm\Handlers;
 
-use App\Enumerations\ModulesHandlerToId;
-use App\Handlers\Contracts\ContentTitles;
-use App\Handlers\Handler;
+use App\CMS\Enumerations\ModulesHandlerToId;
+use App\CMS\Handlers\Contracts\ContentTitles;
+use App\CMS\Handlers\Handler;
 use App\Http\Controllers\Admin\Contents\EditContent;
 use App\Http\Requests\Request;
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\User;
 
 class ContactForm extends Handler implements ContentTitles

modules/ContactForm/Handlers/ContactFormHistory.php

@@ -1,7 +1,7 @@
 <?php
 namespace Modules\ContactForm\Handlers;
 
-use App\Handlers\History;
+use App\CMS\Handlers\History;
 
 class ContactFormHistory extends History
 {

modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php

@@ -1,8 +1,8 @@
 <?php
 namespace Modules\ContactForm\Http\Controllers\Visitor;
 
-use App\Helpers\Template;
-use App\Models\Content;
+use App\CMS\Helpers\Template;
+use App\Models\Content\Content;
 use Illuminate\Mail\Message;
 use Illuminate\Support\Facades\Mail;
 use Modules\ContactForm\Http\Requests\SendNewEmailRequest;

modules/ContactForm/Widgets/Address/Address.php

@@ -1,11 +1,11 @@
 <?php
 namespace Modules\ContactForm\Widgets\Address;
 
-use App\Models\Widget;
-use App\Widgets\Contracts\WidgetRenderer;
-use App\Widgets\NonInstallableWidget;
+use App\CMS\Contracts\Widgets\PublicWidget;
+use App\Models\Widgets\Widget;
+use App\CMS\Contracts\Widgets\WidgetRenderer;
 
-class Address extends NonInstallableWidget
+class Address implements PublicWidget
 {
     /**
      * Name getter

modules/ContactForm/Widgets/Address/Presenter.php

@@ -1,10 +1,10 @@
 <?php
 namespace Modules\ContactForm\Widgets\Address;
 
-use App\Models\Content;
-use App\Models\Widget;
-use App\Models\WidgetType;
-use App\Widgets\Contracts\WidgetRenderer;
+use App\Models\Content\Content;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetType;
+use App\CMS\Contracts\Widgets\WidgetRenderer;
 
 class Presenter implements WidgetRenderer
 {

modules/ContactForm/Widgets/Form/Form.php

@@ -1,11 +1,11 @@
 <?php
 namespace Modules\ContactForm\Widgets\Form;
 
-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;
 
-class Form extends NonInstallableWidget
+class Form implements PublicWidget
 {
     /**
      * Name getter

modules/ContactForm/Widgets/Form/Presenter.php

@@ -1,10 +1,10 @@
 <?php
 namespace Modules\ContactForm\Widgets\Form;
 
-use App\Models\Content;
-use App\Models\Widget;
-use App\Models\WidgetType;
-use App\Widgets\Contracts\WidgetRenderer;
+use App\Models\Content\Content;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetType;
+use App\CMS\Contracts\Widgets\WidgetRenderer;
 
 class Presenter implements WidgetRenderer
 {