diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index d09ed0f..a38a773 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -3,15 +3,15 @@
 use phpOMS\Router\RouteVerb;
 use phpOMS\Account\PermissionType;
 use Modules\Messages\Models\PermissionState;
-use Modules\Messages\Controller;
+use Modules\Messages\Controller\BackendController;
 
 return [
     '^.*/backend/messages/dashboard.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller:viewMessageInbox',
+            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageInbox',
             'verb' => RouteVerb::GET,
             'permission' => [
-                'module' => Controller::MODULE_NAME,
+                'module' => BackendController::MODULE_NAME,
                 'type'  => PermissionType::READ,
                 'state' => PermissionState::MESSAGE,
             ],
@@ -19,10 +19,10 @@ return [
     ],
     '^.*/backend/messages/outbox.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller:viewMessageOutbox',
+            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageOutbox',
             'verb' => RouteVerb::GET,
             'permission' => [
-                'module' => Controller::MODULE_NAME,
+                'module' => BackendController::MODULE_NAME,
                 'type'  => PermissionType::READ,
                 'state' => PermissionState::MESSAGE,
             ],
@@ -30,10 +30,10 @@ return [
     ],
     '^.*/backend/messages/trash.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller:viewMessageTrash',
+            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTrash',
             'verb' => RouteVerb::GET,
             'permission' => [
-                'module' => Controller::MODULE_NAME,
+                'module' => BackendController::MODULE_NAME,
                 'type'  => PermissionType::READ,
                 'state' => PermissionState::MESSAGE,
             ],
@@ -41,10 +41,10 @@ return [
     ],
     '^.*/backend/messages/spam.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller:viewMessageSpam',
+            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSpam',
             'verb' => RouteVerb::GET,
             'permission' => [
-                'module' => Controller::MODULE_NAME,
+                'module' => BackendController::MODULE_NAME,
                 'type'  => PermissionType::READ,
                 'state' => PermissionState::MESSAGE,
             ],
@@ -52,10 +52,10 @@ return [
     ],
     '^.*/backend/messages/settings.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller:viewMessageSettings',
+            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSettings',
             'verb' => RouteVerb::GET,
             'permission' => [
-                'module' => Controller::MODULE_NAME,
+                'module' => BackendController::MODULE_NAME,
                 'type'  => PermissionType::READ,
                 'state' => PermissionState::MESSAGE,
             ],
@@ -63,10 +63,10 @@ return [
     ],
     '^.*/backend/messages/mail/create.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller:viewMessageCreate',
+            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageCreate',
             'verb' => RouteVerb::GET,
             'permission' => [
-                'module' => Controller::MODULE_NAME,
+                'module' => BackendController::MODULE_NAME,
                 'type'  => PermissionType::CREATE,
                 'state' => PermissionState::MESSAGE,
             ],
@@ -74,10 +74,10 @@ return [
     ],
     '^.*/backend/messages/mail/single.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller:viewMessageView',
+            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView',
             'verb' => RouteVerb::GET,
             'permission' => [
-                'module' => Controller::MODULE_NAME,
+                'module' => BackendController::MODULE_NAME,
                 'type'  => PermissionType::READ,
                 'state' => PermissionState::MESSAGE,
             ],
@@ -85,10 +85,10 @@ return [
     ],
     '^.*/api/messages/mail/single.*$' => [
         [
-            'dest' => '\Modules\Messages\Controller:viewMessageView',
+            'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView',
             'verb' => RouteVerb::GET,
             'permission' => [
-                'module' => Controller::MODULE_NAME,
+                'module' => BackendController::MODULE_NAME,
                 'type'  => PermissionType::READ,
                 'state' => PermissionState::MESSAGE,
             ],
diff --git a/Controller.php b/Controller/BackendController.php
similarity index 86%
rename from Controller.php
rename to Controller/BackendController.php
index b9d7411..f3c0d2c 100644
--- a/Controller.php
+++ b/Controller/BackendController.php
@@ -12,7 +12,7 @@
  */
 declare(strict_types=1);
 
-namespace Modules\Messages;
+namespace Modules\Messages\Controller;
 
 use Modules\Navigation\Models\Navigation;
 use Modules\Navigation\Views\NavigationView;
@@ -31,58 +31,9 @@ use phpOMS\Views\View;
  * @link       http://website.orange-management.de
  * @since      1.0.0
  */
-final class Controller extends ModuleAbstract implements WebInterface
+class BackendController extends Controller
 {
 
-    /**
-     * Module path.
-     *
-     * @var string
-     * @since 1.0.0
-     */
-    public const MODULE_PATH = __DIR__;
-
-    /**
-     * Module version.
-     *
-     * @var string
-     * @since 1.0.0
-     */
-    public const MODULE_VERSION = '1.0.0';
-
-    /**
-     * Module name.
-     *
-     * @var string
-     * @since 1.0.0
-     */
-    public const MODULE_NAME = 'Messages';
-
-    /**
-     * Module id.
-     *
-     * @var int
-     * @since 1.0.0
-     */
-    public const MODULE_ID = 1001200000;
-
-    /**
-     * Providing.
-     *
-     * @var string[]
-     * @since 1.0.0
-     */
-    protected static $providing = [];
-
-    /**
-     * Dependencies.
-     *
-     * @var string[]
-     * @since 1.0.0
-     */
-    protected static $dependencies = [
-    ];
-
     /**
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
diff --git a/Controller/Controller.php b/Controller/Controller.php
new file mode 100644
index 0000000..0b8ea81
--- /dev/null
+++ b/Controller/Controller.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.2
+ *
+ * @package    Modules\Messages
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://website.orange-management.de
+ */
+declare(strict_types=1);
+
+namespace Modules\Messages\Controller;
+
+use Modules\Navigation\Models\Navigation;
+use Modules\Navigation\Views\NavigationView;
+use phpOMS\Contract\RenderableInterface;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use phpOMS\Module\ModuleAbstract;
+use phpOMS\Module\WebInterface;
+use phpOMS\Views\View;
+
+/**
+ * Messages controller class.
+ *
+ * @package    Modules\Messages
+ * @license    OMS License 1.0
+ * @link       http://website.orange-management.de
+ * @since      1.0.0
+ */
+class Controller extends ModuleAbstract implements WebInterface
+{
+
+    /**
+     * Module path.
+     *
+     * @var string
+     * @since 1.0.0
+     */
+    public const MODULE_PATH = __DIR__ . '/../';
+
+    /**
+     * Module version.
+     *
+     * @var string
+     * @since 1.0.0
+     */
+    public const MODULE_VERSION = '1.0.0';
+
+    /**
+     * Module name.
+     *
+     * @var string
+     * @since 1.0.0
+     */
+    public const MODULE_NAME = 'Messages';
+
+    /**
+     * Module id.
+     *
+     * @var int
+     * @since 1.0.0
+     */
+    public const MODULE_ID = 1001200000;
+
+    /**
+     * Providing.
+     *
+     * @var string[]
+     * @since 1.0.0
+     */
+    protected static $providing = [];
+
+    /**
+     * Dependencies.
+     *
+     * @var string[]
+     * @since 1.0.0
+     */
+    protected static $dependencies = [
+    ];
+}