diff --git a/Admin/Activate.php b/Admin/Activate.php
deleted file mode 100644
index 7ba7680..0000000
--- a/Admin/Activate.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages\Admin;
-
-
-use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\Module\ActivateAbstract;
-use phpOMS\Module\InfoManager;
-
-/**
- * Navigation class.
- *
- * @category   Modules
- * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class Activate extends ActivateAbstract
-{
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function activate(DatabasePool $dbPool, InfoManager $info)
-    {
-        parent::activate($dbPool, $info);
-    }
-}
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
deleted file mode 100644
index 0781995..0000000
--- a/Admin/Deactivate.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages\Admin;
-
-
-use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\Module\DeactivateAbstract;
-use phpOMS\Module\InfoManager;
-
-/**
- * Navigation class.
- *
- * @category   Modules
- * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class Deactivate extends DeactivateAbstract
-{
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function deactivate(DatabasePool $dbPool, InfoManager $info)
-    {
-        parent::deactivate($dbPool, $info);
-    }
-}
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
deleted file mode 100644
index 8d3f6a1..0000000
--- a/Admin/Install/Navigation.install.json
+++ /dev/null
@@ -1,108 +0,0 @@
-[
-    {
-        "id": 1001201001,
-        "pid": "754a08ddf8bcb1cf22f310f09206dd783d42f7dd",
-        "type": 1,
-        "subtype": 1,
-        "name": "Messages",
-        "uri": "/{/lang}/backend/messages/dashboard?{?}",
-        "target": "self",
-        "icon": "fa fa-envelope",
-        "order": 10,
-        "from": "Messages",
-        "permission": null,
-        "parent": 0,
-        "children": [
-            {
-                "id": 1001202001,
-                "pid": "754a08ddf8bcb1cf22f310f09206dd783d42f7dd",
-                "type": 3,
-                "subtype": 1,
-                "name": "Inbox",
-                "uri": "/{/lang}/backend/messages/dashboard?{?}",
-                "target": "self",
-                "icon": null,
-                "order": 1,
-                "from": "Messages",
-                "permission": null,
-                "parent": 1001201001,
-                "children": []
-            },
-            {
-                "id": 1001203001,
-                "pid": "754a08ddf8bcb1cf22f310f09206dd783d42f7dd",
-                "type": 3,
-                "subtype": 1,
-                "name": "Outbox",
-                "uri": "/{/lang}/backend/messages/outbox?{?}",
-                "target": "self",
-                "icon": null,
-                "order": 5,
-                "from": "Messages",
-                "permission": null,
-                "parent": 1001201001,
-                "children": []
-            },
-            {
-                "id": 1001204001,
-                "pid": "754a08ddf8bcb1cf22f310f09206dd783d42f7dd",
-                "type": 3,
-                "subtype": 1,
-                "name": "Trash",
-                "uri": "/{/lang}/backend/messages/trash?{?}",
-                "target": "self",
-                "icon": null,
-                "order": 10,
-                "from": "Messages",
-                "permission": null,
-                "parent": 1001201001,
-                "children": []
-            },
-            {
-                "id": 1001205001,
-                "pid": "754a08ddf8bcb1cf22f310f09206dd783d42f7dd",
-                "type": 3,
-                "subtype": 1,
-                "name": "Spam",
-                "uri": "/{/lang}/backend/messages/spam?{?}",
-                "target": "self",
-                "icon": null,
-                "order": 15,
-                "from": "Messages",
-                "permission": null,
-                "parent": 1001201001,
-                "children": []
-            },
-            {
-                "id": 1001206001,
-                "pid": "754a08ddf8bcb1cf22f310f09206dd783d42f7dd",
-                "type": 3,
-                "subtype": 1,
-                "name": "Draft",
-                "uri": "/{/lang}/backend/messages/draft?{?}",
-                "target": "self",
-                "icon": null,
-                "order": 20,
-                "from": "Messages",
-                "permission": null,
-                "parent": 1001201001,
-                "children": []
-            },
-            {
-                "id": 1001207001,
-                "pid": "754a08ddf8bcb1cf22f310f09206dd783d42f7dd",
-                "type": 3,
-                "subtype": 1,
-                "name": "Settings",
-                "uri": "/{/lang}/backend/messages/settings?{?}",
-                "target": "self",
-                "icon": null,
-                "order": 50,
-                "from": "Messages",
-                "permission": null,
-                "parent": 1001201001,
-                "children": []
-            }
-        ]
-    }
-]
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
deleted file mode 100644
index f19993a..0000000
--- a/Admin/Install/Navigation.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages\Admin\Install;
-use phpOMS\DataStorage\Database\DatabasePool;
-
-/**
- * Navigation class.
- *
- * @category   Modules
- * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class Navigation
-{
-    public static function install(string $path, DatabasePool $dbPool)
-    {
-        $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
-
-        $class = '\\Modules\\Navigation\\Admin\\Installer';
-        /** @var $class \Modules\Navigation\Admin\Installer */
-        $class::installExternal($dbPool, $navData);
-    }
-}
diff --git a/Admin/Installer.php b/Admin/Installer.php
deleted file mode 100644
index efe88d7..0000000
--- a/Admin/Installer.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages\Admin;
-
-use phpOMS\DataStorage\Database\DatabaseType;
-use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\Module\InfoManager;
-use phpOMS\Module\InstallerAbstract;
-
-/**
- * Messages install class.
- *
- * @category   Modules
- * @package    Modules\Messages
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class Installer extends InstallerAbstract
-{
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
-    {
-        parent::install($path, $dbPool, $info);
-
-        switch ($dbPool->get('core')->getType()) {
-            case DatabaseType::MYSQL:
-                $dbPool->get('core')->con->prepare(
-                    'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'message` (
-                            `message_id` int(11) NOT NULL AUTO_INCREMENT,
-                            `message_type`  tinyint(11) NOT NULL,
-                            `message_account` int(11) DEFAULT NULL,
-                            `message_email` varchar(256) NULL,
-                            `message_sent` datetime NULL,
-                            `message_cc` varchar(256) DEFAULT NULL,
-                            `message_bcc` varchar(256) DEFAULT NULL,
-                            `message_content` text DEFAULT NULL,
-                            `message_reference` int(11) DEFAULT NULL,
-                            PRIMARY KEY (`message_id`),
-                            KEY `message_account` (`message_account`),
-                            KEY `message_reference` (`message_reference`)
-                        )ENGINE=InnoDB  DEFAULT CHARSET=utf8;'
-                )->execute();
-
-                $dbPool->get('core')->con->prepare(
-                    'ALTER TABLE `' . $dbPool->get('core')->prefix . 'message`
-                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'message_ibfk_1` FOREIGN KEY (`message_account`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`),
-                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'message_ibfk_2` FOREIGN KEY (`message_reference`) REFERENCES `' . $dbPool->get('core')->prefix . 'message` (`message_id`);'
-                )->execute();
-
-                $dbPool->get('core')->con->prepare(
-                    'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'messages_attachment` (
-                            `messages_attachment_id` int(11) NOT NULL AUTO_INCREMENT,
-                            `messages_attachment_media` int(11) DEFAULT NULL,
-                            `messages_attachment_message` int(11) NULL,
-                            PRIMARY KEY (`messages_attachment_id`),
-                            KEY `messages_attachment_media` (`messages_attachment_media`),
-                            KEY `messages_attachment_message` (`messages_attachment_message`)
-                        )ENGINE=InnoDB  DEFAULT CHARSET=utf8;'
-                )->execute();
-
-                $dbPool->get('core')->con->prepare(
-                    'ALTER TABLE `' . $dbPool->get('core')->prefix . 'messages_attachment`
-                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'messages_attachment_ibfk_1` FOREIGN KEY (`messages_attachment_media`) REFERENCES `' . $dbPool->get('core')->prefix . 'media` (`media_id`),
-                            ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'messages_attachment_ibfk_2` FOREIGN KEY (`messages_attachment_message`) REFERENCES `' . $dbPool->get('core')->prefix . 'message` (`message_id`);'
-                )->execute();
-                break;
-        }
-    }
-}
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
deleted file mode 100644
index 51cd1c2..0000000
--- a/Admin/Routes/Web/Backend.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-use phpOMS\Router\RouteVerb;
-
-return [
-    '^.*/backend/messages/dashboard.*$' => [
-        [
-            'dest' => '\Modules\Messages\Controller:viewMessageInbox', 
-            'verb' => RouteVerb::GET,
-        ],
-    ],
-    '^.*/backend/messages/outbox.*$' => [
-        [
-            'dest' => '\Modules\Messages\Controller:viewMessageOutbox', 
-            'verb' => RouteVerb::GET,
-        ],
-    ],
-    '^.*/backend/messages/trash.*$' => [
-        [
-            'dest' => '\Modules\Messages\Controller:viewMessageTrash', 
-            'verb' => RouteVerb::GET,
-        ],
-    ],
-    '^.*/backend/messages/spam.*$' => [
-        [
-            'dest' => '\Modules\Messages\Controller:viewMessageSpam', 
-            'verb' => RouteVerb::GET,
-        ],
-    ],
-    '^.*/backend/messages/settings.*$' => [
-        [
-            'dest' => '\Modules\Messages\Controller:viewMessageSettings', 
-            'verb' => RouteVerb::GET,
-        ],
-    ],
-    '^.*/backend/messages/mail/create.*$' => [
-        [
-            'dest' => '\Modules\Messages\Controller:viewMessageCreate', 
-            'verb' => RouteVerb::GET,
-        ],
-    ],
-    '^.*/backend/messages/mail/single.*$' => [
-        [
-            'dest' => '\Modules\Messages\Controller:viewMessageView', 
-            'verb' => RouteVerb::GET,
-        ],
-    ],
-    '^.*/api/messages/mail/single.*$' => [
-        [
-            'dest' => '\Modules\Messages\Controller:viewMessageView', 
-            'verb' => RouteVerb::GET,
-        ],
-    ],
-];
diff --git a/Admin/Routes/console.php b/Admin/Routes/console.php
deleted file mode 100644
index 1ecbfac..0000000
--- a/Admin/Routes/console.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$moduleRoutes = [];
\ No newline at end of file
diff --git a/Admin/Routes/socket.php b/Admin/Routes/socket.php
deleted file mode 100644
index 1ecbfac..0000000
--- a/Admin/Routes/socket.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$moduleRoutes = [];
\ No newline at end of file
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
deleted file mode 100644
index d8461d5..0000000
--- a/Admin/Uninstall.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages\Admin;
-
-
-use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\DataStorage\Database\Schema\Builder;
-use phpOMS\Module\UninstallAbstract;
-
-/**
- * Navigation class.
- *
- * @category   Modules
- * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class Uninstall extends UninstallAbstract
-{
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function uninstall(DatabasePool $dbPool, InfoManager $info)
-    {
-        parent::uninstall($dbPool, $info);
-
-        $query = new Builder($dbPool->get());
-
-        $query->prefix($dbPool->get('core')->getPrefix())->drop(
-            'messages_attachment',
-            'message'
-        );
-
-        $dbPool->get()->con->prepare($query->toSql())->execute();
-    }
-}
diff --git a/Admin/Update.php b/Admin/Update.php
deleted file mode 100644
index c93aef0..0000000
--- a/Admin/Update.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages\Admin;
-
-
-use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\Module\UpdateAbstract;
-use phpOMS\System\File\Directory;
-
-/**
- * Navigation class.
- *
- * @category   Modules
- * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class Update extends UpdateAbstract
-{
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function update(DatabasePool $dbPool, array $info)
-    {
-        Directory::deletePath(__DIR__ . '/Update');
-        mkdir('Update');
-        parent::update($dbPool, $info);
-    }
-}
diff --git a/Controller.php b/Controller.php
deleted file mode 100644
index de2a4e7..0000000
--- a/Controller.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages;
-
-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;
-use phpOMS\Views\ViewLayout;
-
-/**
- * Messages controller class.
- *
- * @category   Messages
- * @package    Modules\Messages
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @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';
-
-    /**
-     * 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
-     * @param mixed            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function viewMessageInbox(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
-    {
-        $view = new View($this->app, $request, $response);
-        $view->setTemplate('/Modules/Messages/Theme/Backend/dashboard');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-
-        return $view;
-    }
-
-    /**
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function viewMessageOutbox(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
-    {
-        $view = new View($this->app, $request, $response);
-        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-out-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-
-        return $view;
-    }
-
-    /**
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function viewMessageTrash(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
-    {
-        $view = new View($this->app, $request, $response);
-        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-trash-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-
-        return $view;
-    }
-
-    /**
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function viewMessageSpam(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
-    {
-        $view = new View($this->app, $request, $response);
-        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-spam-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-
-        return $view;
-    }
-
-    /**
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function viewMessageView(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
-    {
-        $view = new View($this->app, $request, $response);
-        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-        $view->addData('id', (int) $request->getData('id'));
-
-        return $view;
-    }
-
-    /**
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function viewMessageCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
-    {
-        $view = new View($this->app, $request, $response);
-        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-create');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-
-        return $view;
-    }
-
-    /**
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function viewMessageSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
-    {
-        $view = new View($this->app, $request, $response);
-        $view->setTemplate('/Modules/Messages/Theme/Backend/message-settings');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-
-        return $view;
-    }
-
-}
diff --git a/Models/Email.php b/Models/Email.php
deleted file mode 100644
index a505aaa..0000000
--- a/Models/Email.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages;
-
-/**
- * Email interface.
- *
- * @category   Modules
- * @package    Messages
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-interface Email
-{
-    public function connect($host, $port, $user, $password);
-
-    public function getListNew();
-
-    public function getListAll();
-
-    public function getMessage();
-
-    public function removeMessage();
-
-    public function setStatus();
-}
diff --git a/Models/IMAP.php b/Models/IMAP.php
deleted file mode 100644
index 4dbad17..0000000
--- a/Models/IMAP.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace Modules\Messages;
-
-use Modules\Messages\Email;
-
-/**
- * IMAP class.
- *
- * @category   Modules
- * @package    Messages
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class IMAP implements Email
-{
-    private $con = null;
-
-    public function __construct()
-    {
-    }
-
-    public function connect($host, $port, $user, $password)
-    {
-        $this->con = imap_open('{' . $host . ':' . $port . '}', $user, $password);
-    }
-
-    public function getListNew()
-    {
-        // TODO: Implement getListNew() method.
-    }
-
-    public function getListAll()
-    {
-        // TODO: Implement getListAll() method.
-    }
-
-    public function getMessage()
-    {
-        // TODO: Implement getMessage() method.
-    }
-
-    public function removeMessage()
-    {
-        // TODO: Implement removeMessage() method.
-    }
-
-    public function setStatus()
-    {
-        // TODO: Implement setStatus() method.
-    }
-}
diff --git a/Models/SMTP.php b/Models/SMTP.php
deleted file mode 100644
index e69de29..0000000
diff --git a/README.md b/README.md
deleted file mode 100644
index bccd3f6..0000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Messages #
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
deleted file mode 100644
index 7cd3ebd..0000000
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-return ['Navigation' => [
-    'Draft'    => 'Draft',
-    'Inbox'    => 'Inbox',
-    'Messages' => 'Messages',
-    'Outbox'   => 'Outbox',
-    'Settings' => 'Settings',
-    'Spam'     => 'Spam',
-    'Trash'    => 'Trash',
-]];
diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
deleted file mode 100644
index afe845f..0000000
--- a/Theme/Backend/Lang/api.en.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$MODLANG[1] = [
-];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
deleted file mode 100644
index fb98bd3..0000000
--- a/Theme/Backend/Lang/en.lang.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-return ['Messages' => [
-    'All'           => 'All',
-    'AverageAmount' => 'Avg. Amount',
-    'BCC'           => 'BCC',
-    'CC'            => 'CC',
-    'Date'          => 'Date',
-    'Draft'         => 'Draft',
-    'From'          => 'From',
-    'Inbox'         => 'Inbox',
-    'Interval'      => 'Interval',
-    'Mailboxes'     => 'Mailboxes',
-    'Messages'      => 'Messages',
-    'Month'         => 'Month',
-    'New'           => 'New',
-    'Outbox'        => 'Outbox',
-    'Received'      => 'Received',
-    'Sent'          => 'Sent',
-    'Spam'          => 'Spam',
-    'Statistics'    => 'Statistics',
-    'Status'        => 'Status',
-    'Subject'       => 'Subject',
-    'Tag'           => 'Tag',
-    'To'            => 'To',
-    'Today'         => 'Today',
-    'Trash'         => 'Trash',
-    'Week'          => 'Week',
-    'Year'          => 'Year',
-]];
diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php
deleted file mode 100644
index 6ec4c45..0000000
--- a/Theme/Backend/dashboard.tpl.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}INBOX', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$unseen = $mail->getInboxUnseen();
-$seen = $mail->getInboxSeen();
-$quota = $mail->getQuota();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getText('Create', 0, 0); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getText('Delete'); ?></a>
-    </ul>
-</section>
-
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Messages'); ?></caption>
-        <thead>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getText('Tag'); ?>
-            <td class="wf-100"><?= $this->getText('Subject'); ?>
-            <td><?= $this->getText('From'); ?>
-            <td><?= $this->getText('Date'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
-        <tbody>
-            <?php $count = 0; foreach($unseen as $key => $value) : $count++;
-            $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-            <tr>
-                <td><span class="check"><input type="checkbox"></span>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-            <?php endforeach; ?>
-
-                    <?php foreach($seen as $key => $value) : $count++;
-                    $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-            <tr>
-                <td><span class="check"><input type="checkbox"></span>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-                    <?php endforeach; ?>
-            <?php if($count < 1) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-        <?php endif; ?>
-    </table>
-</div>
diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php
deleted file mode 100644
index 64ab5c9..0000000
--- a/Theme/Backend/mail-create.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <div class="inner">
-        <form>
-            <table class="layout wf-100">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getText('To'); ?>" name="to">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getText('CC'); ?>" name="cc">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getText('BCC'); ?>" name="bcc">
-                <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->getText('Subject'); ?>" name="subject">
-                <tr><td><td><input type="file" name="files" multiple>
-                <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="&#xf040;" style="display: none" name="mail"></textarea>
-                <tr><td><td><input type="submit" value="<?= $this->getText('Send', 0); ?>"> <input type="submit" value="<?= $this->getText('Save', 0); ?>">
-            </table>
-        </form>
-    </div>
-</section>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
deleted file mode 100644
index b24ecda..0000000
--- a/Theme/Backend/mail-out-view.tpl.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$sent = $mail->getInboxAll();
-$quota = $mail->getQuota();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getText('Create', 0, 0); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getText('Delete'); ?></a>
-    </ul>
-</section>
-
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Messages'); ?></caption>
-        <thead>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getText('Tag'); ?>
-            <td class="wf-100"><?= $this->getText('Subject'); ?>
-            <td><?= $this->getText('From'); ?>
-            <td><?= $this->getText('Date'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
-        <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-                <?php endforeach; ?>
-                <?php if($count < 1) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-                <?php endif; ?>
-    </table>
-</div>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
deleted file mode 100644
index b24ecda..0000000
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$sent = $mail->getInboxAll();
-$quota = $mail->getQuota();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getText('Create', 0, 0); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getText('Delete'); ?></a>
-    </ul>
-</section>
-
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Messages'); ?></caption>
-        <thead>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getText('Tag'); ?>
-            <td class="wf-100"><?= $this->getText('Subject'); ?>
-            <td><?= $this->getText('From'); ?>
-            <td><?= $this->getText('Date'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
-        <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-                <?php endforeach; ?>
-                <?php if($count < 1) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-                <?php endif; ?>
-    </table>
-</div>
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
deleted file mode 100644
index b24ecda..0000000
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$sent = $mail->getInboxAll();
-$quota = $mail->getQuota();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getText('Create', 0, 0); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getText('Delete'); ?></a>
-    </ul>
-</section>
-
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Messages'); ?></caption>
-        <thead>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getText('Tag'); ?>
-            <td class="wf-100"><?= $this->getText('Subject'); ?>
-            <td><?= $this->getText('From'); ?>
-            <td><?= $this->getText('Date'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
-        <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-                <?php endforeach; ?>
-                <?php if($count < 1) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-                <?php endif; ?>
-    </table>
-</div>
diff --git a/Theme/Backend/mail-view.tpl.php b/Theme/Backend/mail-view.tpl.php
deleted file mode 100644
index 16c9cdc..0000000
--- a/Theme/Backend/mail-view.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}INBOX', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$mails = $mail->getEmail($this->getData('id'));
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <header><h1><?= str_replace('_',' ', mb_decode_mimeheader($mails['overview'][0]->subject)); ?></h1></header>
-    <div class="inner">
-        <?= $mail::decode($mails['body'], $mails['encoding']->encoding); ?>
-    </div>
-</section>
diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php
deleted file mode 100644
index d2aad1c..0000000
--- a/Theme/Backend/message-settings.tpl.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$boxes = $mail->getBoxes();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-33">
-    <header><h1><?= $this->getText('Mailboxes'); ?></h1></header>
-    <div class="inner">
-        <form>
-            <table class="layout">
-                <tr><td><label for="iInbox"><?= $this->getText('Inbox'); ?></label>
-                <tr><td><select id="iInbox" name="inbox">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                            <?php endforeach; ?>
-                        </select>
-                <tr><td><label for="iOutbox"><?= $this->getText('Outbox'); ?></label>
-                <tr><td><select id="iOutbox" name="outbox">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                                <?php endforeach; ?>
-                        </select>
-                <tr><td><label for="iDraft"><?= $this->getText('Draft'); ?></label>
-                <tr><td><select id="iDraft" name="draft">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                                <?php endforeach; ?>
-                        </select>
-                <tr><td><label for="iTrash"><?= $this->getText('Trash'); ?></label>
-                <tr><td><select id="iTrash" name="trash">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                                <?php endforeach; ?>
-                        </select>
-                <tr><td><label for="iSpam"><?= $this->getText('Spam'); ?></label>
-                <tr><td><select id="iSpam" name="spam">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                                <?php endforeach; ?>
-                        </select>
-                <tr><td><input type="submit" value="<?= $this->getText('Save'); ?>">
-            </table>
-        </form>
-    </div>
-</section>
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
deleted file mode 100644
index 7cd3ebd..0000000
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-return ['Navigation' => [
-    'Draft'    => 'Draft',
-    'Inbox'    => 'Inbox',
-    'Messages' => 'Messages',
-    'Outbox'   => 'Outbox',
-    'Settings' => 'Settings',
-    'Spam'     => 'Spam',
-    'Trash'    => 'Trash',
-]];
diff --git a/Theme/backend/Lang/api.en.lang.php b/Theme/backend/Lang/api.en.lang.php
deleted file mode 100644
index afe845f..0000000
--- a/Theme/backend/Lang/api.en.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$MODLANG[1] = [
-];
diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php
deleted file mode 100644
index fb98bd3..0000000
--- a/Theme/backend/Lang/en.lang.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-return ['Messages' => [
-    'All'           => 'All',
-    'AverageAmount' => 'Avg. Amount',
-    'BCC'           => 'BCC',
-    'CC'            => 'CC',
-    'Date'          => 'Date',
-    'Draft'         => 'Draft',
-    'From'          => 'From',
-    'Inbox'         => 'Inbox',
-    'Interval'      => 'Interval',
-    'Mailboxes'     => 'Mailboxes',
-    'Messages'      => 'Messages',
-    'Month'         => 'Month',
-    'New'           => 'New',
-    'Outbox'        => 'Outbox',
-    'Received'      => 'Received',
-    'Sent'          => 'Sent',
-    'Spam'          => 'Spam',
-    'Statistics'    => 'Statistics',
-    'Status'        => 'Status',
-    'Subject'       => 'Subject',
-    'Tag'           => 'Tag',
-    'To'            => 'To',
-    'Today'         => 'Today',
-    'Trash'         => 'Trash',
-    'Week'          => 'Week',
-    'Year'          => 'Year',
-]];
diff --git a/Theme/backend/dashboard.tpl.php b/Theme/backend/dashboard.tpl.php
deleted file mode 100644
index 6ec4c45..0000000
--- a/Theme/backend/dashboard.tpl.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}INBOX', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$unseen = $mail->getInboxUnseen();
-$seen = $mail->getInboxSeen();
-$quota = $mail->getQuota();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getText('Create', 0, 0); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getText('Delete'); ?></a>
-    </ul>
-</section>
-
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Messages'); ?></caption>
-        <thead>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getText('Tag'); ?>
-            <td class="wf-100"><?= $this->getText('Subject'); ?>
-            <td><?= $this->getText('From'); ?>
-            <td><?= $this->getText('Date'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
-        <tbody>
-            <?php $count = 0; foreach($unseen as $key => $value) : $count++;
-            $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-            <tr>
-                <td><span class="check"><input type="checkbox"></span>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-            <?php endforeach; ?>
-
-                    <?php foreach($seen as $key => $value) : $count++;
-                    $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-            <tr>
-                <td><span class="check"><input type="checkbox"></span>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-                <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-                    <?php endforeach; ?>
-            <?php if($count < 1) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-        <?php endif; ?>
-    </table>
-</div>
diff --git a/Theme/backend/mail-create.tpl.php b/Theme/backend/mail-create.tpl.php
deleted file mode 100644
index 64ab5c9..0000000
--- a/Theme/backend/mail-create.tpl.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <div class="inner">
-        <form>
-            <table class="layout wf-100">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getText('To'); ?>" name="to">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getText('CC'); ?>" name="cc">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getText('BCC'); ?>" name="bcc">
-                <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->getText('Subject'); ?>" name="subject">
-                <tr><td><td><input type="file" name="files" multiple>
-                <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="&#xf040;" style="display: none" name="mail"></textarea>
-                <tr><td><td><input type="submit" value="<?= $this->getText('Send', 0); ?>"> <input type="submit" value="<?= $this->getText('Save', 0); ?>">
-            </table>
-        </form>
-    </div>
-</section>
diff --git a/Theme/backend/mail-out-view.tpl.php b/Theme/backend/mail-out-view.tpl.php
deleted file mode 100644
index b24ecda..0000000
--- a/Theme/backend/mail-out-view.tpl.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$sent = $mail->getInboxAll();
-$quota = $mail->getQuota();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getText('Create', 0, 0); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getText('Delete'); ?></a>
-    </ul>
-</section>
-
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Messages'); ?></caption>
-        <thead>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getText('Tag'); ?>
-            <td class="wf-100"><?= $this->getText('Subject'); ?>
-            <td><?= $this->getText('From'); ?>
-            <td><?= $this->getText('Date'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
-        <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-                <?php endforeach; ?>
-                <?php if($count < 1) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-                <?php endif; ?>
-    </table>
-</div>
diff --git a/Theme/backend/mail-spam-view.tpl.php b/Theme/backend/mail-spam-view.tpl.php
deleted file mode 100644
index b24ecda..0000000
--- a/Theme/backend/mail-spam-view.tpl.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$sent = $mail->getInboxAll();
-$quota = $mail->getQuota();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getText('Create', 0, 0); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getText('Delete'); ?></a>
-    </ul>
-</section>
-
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Messages'); ?></caption>
-        <thead>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getText('Tag'); ?>
-            <td class="wf-100"><?= $this->getText('Subject'); ?>
-            <td><?= $this->getText('From'); ?>
-            <td><?= $this->getText('Date'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
-        <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-                <?php endforeach; ?>
-                <?php if($count < 1) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-                <?php endif; ?>
-    </table>
-</div>
diff --git a/Theme/backend/mail-trash-view.tpl.php b/Theme/backend/mail-trash-view.tpl.php
deleted file mode 100644
index b24ecda..0000000
--- a/Theme/backend/mail-trash-view.tpl.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$sent = $mail->getInboxAll();
-$quota = $mail->getQuota();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?{?}= $this->getText('Create', 0, 0); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getText('Delete'); ?></a>
-    </ul>
-</section>
-
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Messages'); ?></caption>
-        <thead>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getText('Tag'); ?>
-            <td class="wf-100"><?= $this->getText('Subject'); ?>
-            <td><?= $this->getText('From'); ?>
-            <td><?= $this->getText('Date'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
-        <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
-        <tr>
-            <td><span class="check"><input type="checkbox"></span>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= str_replace('_',' ', mb_decode_mimeheader($value->subject)); ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= $value->from; ?></a>
-            <td><a href="<?= $url; ?>"<?= $value->seen == 0 ? ' class="unseen"' : ''; ?>><?= (new \DateTime($value->date))->format('Y-m-d H:i:s'); ?></a>
-                <?php endforeach; ?>
-                <?php if($count < 1) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-                <?php endif; ?>
-    </table>
-</div>
diff --git a/Theme/backend/mail-view.tpl.php b/Theme/backend/mail-view.tpl.php
deleted file mode 100644
index 16c9cdc..0000000
--- a/Theme/backend/mail-view.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}INBOX', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$mails = $mail->getEmail($this->getData('id'));
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-100">
-    <header><h1><?= str_replace('_',' ', mb_decode_mimeheader($mails['overview'][0]->subject)); ?></h1></header>
-    <div class="inner">
-        <?= $mail::decode($mails['body'], $mails['encoding']->encoding); ?>
-    </div>
-</section>
diff --git a/Theme/backend/message-settings.tpl.php b/Theme/backend/message-settings.tpl.php
deleted file mode 100644
index d2aad1c..0000000
--- a/Theme/backend/message-settings.tpl.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-$mail = new \phpOMS\Message\Mail\Imap();
-$mail->connect('{imap.gmail.com:993/imap/ssl}', 'dev.orange.management@gmail.com', DEV_PASSWORD);
-$boxes = $mail->getBoxes();
-
-echo $this->getData('nav')->render(); ?>
-
-<section class="box w-33">
-    <header><h1><?= $this->getText('Mailboxes'); ?></h1></header>
-    <div class="inner">
-        <form>
-            <table class="layout">
-                <tr><td><label for="iInbox"><?= $this->getText('Inbox'); ?></label>
-                <tr><td><select id="iInbox" name="inbox">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                            <?php endforeach; ?>
-                        </select>
-                <tr><td><label for="iOutbox"><?= $this->getText('Outbox'); ?></label>
-                <tr><td><select id="iOutbox" name="outbox">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                                <?php endforeach; ?>
-                        </select>
-                <tr><td><label for="iDraft"><?= $this->getText('Draft'); ?></label>
-                <tr><td><select id="iDraft" name="draft">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                                <?php endforeach; ?>
-                        </select>
-                <tr><td><label for="iTrash"><?= $this->getText('Trash'); ?></label>
-                <tr><td><select id="iTrash" name="trash">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                                <?php endforeach; ?>
-                        </select>
-                <tr><td><label for="iSpam"><?= $this->getText('Spam'); ?></label>
-                <tr><td><select id="iSpam" name="spam">
-                            <option value=""><?= $this->getText('Select'); ?>
-                            <?php foreach($boxes as $box) : ?>
-                            <option value="<?= $box; ?>"><?= $box; ?>
-                                <?php endforeach; ?>
-                        </select>
-                <tr><td><input type="submit" value="<?= $this->getText('Save'); ?>">
-            </table>
-        </form>
-    </div>
-</section>
diff --git a/img/module_teaser_small.png b/img/module_teaser_small.png
deleted file mode 100644
index f56e6ff..0000000
Binary files a/img/module_teaser_small.png and /dev/null differ
diff --git a/info.json b/info.json
deleted file mode 100644
index 0ed2016..0000000
--- a/info.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": {
-        "id": 1001200000,
-        "internal": "Messages",
-        "external": "OMS Messages"
-    },
-    "version": "1.0.0",
-    "requirements": {
-        "phpOMS": "1.0.0",
-        "phpOMS-db": "1.0.0"
-    },
-    "creator": {
-        "name": "Orange Management",
-        "website": "www.spl1nes.com"
-    },
-    "description": "Messages module.",
-    "directory": "Messages",
-    "dependencies": {
-        "Admin" : "1.0.0"
-    },
-    "providing": {
-        "Navigation": "*"
-    },
-    "load": [
-        {
-            "pid": [
-                "ea312354fa4b4029c8a121b7da7992983d3132a9"
-            ],
-            "type": 4,
-            "for": 0,
-            "from": "Messages",
-            "file": "Messages"
-        },
-        {
-            "pid": [
-                "754a08ddf8bcb1cf22f310f09206dd783d42f7dd"
-            ],
-            "type": 5,
-            "from": "Messages",
-            "for": "Navigation",
-            "file": "Navigation"
-        }
-    ]
-}