FEATURE: change directory structure

modules/Blog/Article/Entities/Article.php

@@ -1,7 +1,7 @@
 <?php
 namespace Modules\Blog\Article\Entities;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 
 class Article extends Content
 {

modules/Blog/Article/Entities/Comment.php

@@ -1,6 +1,6 @@
 <?php namespace Modules\Blog\Article\Entities;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 

modules/Blog/Article/Handlers/Article.php

@@ -1,14 +1,14 @@
 <?php
 namespace Modules\Blog\Article\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\Controllers\Controller;
 use App\Http\Requests\Request;
 use App\Models\ActionLogType;
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\User;
 use Modules\Blog\Article\Entities\Comment;
 

modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php

@@ -1,7 +1,7 @@
 <?php
 namespace Modules\Blog\Article\Http\Controllers\Visitor;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
 use Modules\Blog\Article\Entities\Comment;

modules/Blog/Article/Resources/views/admin/comments/overview.blade.php

@@ -21,7 +21,7 @@
                     </p>
                 </div>
                 <div class="card-footer">
-                    @lang('article::comments.createdAt', ['date' => \App\Helpers\Template::date($comment->created_at)])
+                    @lang('article::comments.createdAt', ['date' => \App\CMS\Helpers\Template::date($comment->created_at)])
                     |
 
                     @lang('article::comments.commentedArticle'):

modules/Blog/ArticleList/Handlers/ArticleList.php

@@ -1,11 +1,11 @@
 <?php
 namespace Modules\Blog\ArticleList\Handlers;
 
-use App\Enumerations\ModulesHandlerToId;
-use App\Handlers\Handler;
+use App\CMS\Enumerations\ModulesHandlerToId;
+use App\CMS\Handlers\Handler;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Request;
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;

modules/Categories/Entities/Category.php

@@ -1,7 +1,7 @@
 <?php
 namespace Modules\Categories\Entities;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\Module;
 use Franzose\ClosureTable\Models\Entity;
 

modules/Categories/Handlers/Categories.php

@@ -1,8 +1,8 @@
 <?php
 namespace Modules\Categories\Handlers;
 
-use App\Enumerations\ModulesHandlerToId;
-use App\Handlers\BaseHandler;
+use App\CMS\Enumerations\ModulesHandlerToId;
+use App\CMS\Handlers\BaseHandler;
 use App\Models\User;
 
 class Categories extends BaseHandler

modules/Categories/Http/Controllers/CategoriesOverview.php

@@ -1,6 +1,6 @@
 <?php namespace Modules\Categories\Http\Controllers;
 
-use App\Enumerations\ModuleNamesWithIds;
+use App\CMS\Enumerations\ModuleNamesWithIds;
 use App\Models\Module;
 use Modules\Categories\Entities\Category;
 use Pingpong\Modules\Routing\Controller;

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
 {

modules/Gallery/Handlers/Gallery.php

@@ -1,15 +1,15 @@
 <?php
 namespace Modules\Gallery\Handlers;
 
-use App\Enumerations\ModulesHandlerToId;
-use App\Handlers\Contracts\AppHandler;
-use App\Handlers\Handler;
-use App\Handlers\History;
+use App\CMS\Enumerations\ModulesHandlerToId;
+use App\CMS\Handlers\Contracts\AppHandler;
+use App\CMS\Handlers\Handler;
+use App\CMS\Handlers\History;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Request;
-use App\Models\Content;
-use App\Models\Directory;
-use App\Models\File;
+use App\Models\Content\Content;
+use App\Models\FileManager\Directory;
+use App\Models\FileManager\File;
 use App\Models\User;
 use Illuminate\Support\Facades\Storage;
 

modules/Gallery/Http/Controllers/Admin/CreateOrbitSlider.php

@@ -1,9 +1,9 @@
 <?php namespace Modules\Gallery\Http\Controllers\Admin;
 
-use App\Models\Content;
-use App\Models\Widget;
-use App\Models\WidgetType;
-use App\Widgets\OrbitSlider\OrbitSlider;
+use App\Models\Content\Content;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetType;
+use App\CMS\Widgets\OrbitSlider\OrbitSlider;
 use Pingpong\Modules\Routing\Controller;
 
 class CreateOrbitSlider extends Controller

modules/StaticPages/Handlers/StaticPage.php

@@ -1,12 +1,12 @@
 <?php
 namespace Modules\StaticPages\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\Controller;
 use App\Http\Requests\Request;
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\User;
 
 class StaticPage extends Handler implements ContentTitles