diff --git a/.gitignore b/.gitignore
index 67ffd12..0c5acab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,28 @@ obj/
 bin/Debug
 x64/Debug
 app/server/Libraries
-.vscode
\ No newline at end of file
+.vscode
+Logs
+Vagrantfile
+cache
+.sass-cache
+.idea
+vendor
+bower_components
+node_modules
+Libraries
+puphpet
+.vagrant
+private.php
+private.sh
+.vscode
+cookie.txt
+config.php
+coverage.xml
+.htaccess
+.directory
+*.log
+*.jar
+*.cache
+*.phar
+*.xml
diff --git a/app/local/App.xaml b/app/local/App.xaml
old mode 100644
new mode 100755
diff --git a/app/local/App.xaml.cs b/app/local/App.xaml.cs
old mode 100644
new mode 100755
diff --git a/app/local/AssemblyInfo.cs b/app/local/AssemblyInfo.cs
old mode 100644
new mode 100755
diff --git a/app/local/MainWindow.xaml b/app/local/MainWindow.xaml
old mode 100644
new mode 100755
diff --git a/app/local/MainWindow.xaml.cs b/app/local/MainWindow.xaml.cs
old mode 100644
new mode 100755
diff --git a/app/local/OnlineResourceWatcherLocalApp.csproj b/app/local/OnlineResourceWatcherLocalApp.csproj
old mode 100644
new mode 100755
diff --git a/app/local/OnlineResourceWatcherLocalApp.csproj.user b/app/local/OnlineResourceWatcherLocalApp.csproj.user
old mode 100644
new mode 100755
diff --git a/app/local/OnlineResourceWatcherLocalApp.sln b/app/local/OnlineResourceWatcherLocalApp.sln
old mode 100644
new mode 100755
diff --git a/app/server/CMakeLists.txt b/app/server/CMakeLists.txt
old mode 100644
new mode 100755
diff --git a/app/server/Controller/ApiController.h b/app/server/Controller/ApiController.h
old mode 100644
new mode 100755
diff --git a/app/server/Controller/InstallController.h b/app/server/Controller/InstallController.h
old mode 100644
new mode 100755
diff --git a/app/server/Install/config.json b/app/server/Install/config.json
old mode 100644
new mode 100755
diff --git a/app/server/Install/db.sqlite b/app/server/Install/db.sqlite
old mode 100644
new mode 100755
diff --git a/app/server/Models/Account.h b/app/server/Models/Account.h
old mode 100644
new mode 100755
diff --git a/app/server/Models/AccountStatus.h b/app/server/Models/AccountStatus.h
old mode 100644
new mode 100755
diff --git a/app/server/Models/Db.h b/app/server/Models/Db.h
old mode 100644
new mode 100755
diff --git a/app/server/Models/File.h b/app/server/Models/File.h
old mode 100644
new mode 100755
diff --git a/app/server/Models/InstallType.h b/app/server/Models/InstallType.h
old mode 100644
new mode 100755
diff --git a/app/server/Models/Organization.h b/app/server/Models/Organization.h
old mode 100644
new mode 100755
diff --git a/app/server/Models/ReosurceStatus.h b/app/server/Models/ReosurceStatus.h
old mode 100644
new mode 100755
diff --git a/app/server/Models/Resource.h b/app/server/Models/Resource.h
old mode 100644
new mode 100755
diff --git a/app/server/Models/ResourceInfo.h b/app/server/Models/ResourceInfo.h
old mode 100644
new mode 100755
diff --git a/app/server/OnlineResourceWatcherServerApp.aps b/app/server/OnlineResourceWatcherServerApp.aps
old mode 100644
new mode 100755
diff --git a/app/server/OnlineResourceWatcherServerApp.rc b/app/server/OnlineResourceWatcherServerApp.rc
old mode 100644
new mode 100755
diff --git a/app/server/OnlineResourceWatcherServerApp.sln b/app/server/OnlineResourceWatcherServerApp.sln
old mode 100644
new mode 100755
diff --git a/app/server/OnlineResourceWatcherServerApp.vcxproj b/app/server/OnlineResourceWatcherServerApp.vcxproj
old mode 100644
new mode 100755
diff --git a/app/server/OnlineResourceWatcherServerApp.vcxproj.filters b/app/server/OnlineResourceWatcherServerApp.vcxproj.filters
old mode 100644
new mode 100755
diff --git a/app/server/OnlineResourceWatcherServerApp.vcxproj.user b/app/server/OnlineResourceWatcherServerApp.vcxproj.user
old mode 100644
new mode 100755
diff --git a/app/server/Routes.h b/app/server/Routes.h
old mode 100644
new mode 100755
diff --git a/app/server/build/install.sh b/app/server/build/install.sh
old mode 100644
new mode 100755
diff --git a/app/server/cOMS b/app/server/cOMS
index 324801f..9a2c89e 160000
--- a/app/server/cOMS
+++ b/app/server/cOMS
@@ -1 +1 @@
-Subproject commit 324801f79a04c39558c4ca0d5dcb88236a851d26
+Subproject commit 9a2c89e12b4a3fce3382937f60990ded5ac36c37
diff --git a/app/server/config.json b/app/server/config.json
old mode 100644
new mode 100755
diff --git a/app/web/content/about.de.md b/app/server/data/README.md
similarity index 100%
rename from app/web/content/about.de.md
rename to app/server/data/README.md
diff --git a/app/server/favicon.ico b/app/server/favicon.ico
old mode 100644
new mode 100755
diff --git a/app/server/main.cpp b/app/server/main.cpp
old mode 100644
new mode 100755
diff --git a/app/server/resource.h b/app/server/resource.h
old mode 100644
new mode 100755
diff --git a/app/web/.htaccess b/app/web/.htaccess
old mode 100644
new mode 100755
diff --git a/app/web/Applications/Api/Application.php b/app/web/Applications/Api/Application.php
old mode 100644
new mode 100755
index 633eb51..7d49148
--- a/app/web/Applications/Api/Application.php
+++ b/app/web/Applications/Api/Application.php
@@ -1,23 +1,28 @@
 <?php
+/**
+ * Karaka
+ *
+ * PHP Version 8.1
+ *
+ * @package   Applications\Api
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://karaka.app
+ */
 declare(strict_types=1);
 
 namespace Applications\Api;
 
-use Models\CoreSettings;
-use Models\SettingsEnum;
-use Models\AccountMapper;
-use Models\LocalizationMapper;
-use Models\NullAccount;
-use Models\PermissionCategory;
 use phpOMS\Account\Account;
 use phpOMS\Account\AccountManager;
 use phpOMS\Account\PermissionType;
-use phpOMS\Application\ApplicationAbstract;
-use phpOMS\Application\ApplicationStatus;
+use phpOMS\Asset\AssetType;
 use phpOMS\Auth\Auth;
 use phpOMS\DataStorage\Cache\CachePool;
 use phpOMS\DataStorage\Cookie\CookieJar;
 use phpOMS\DataStorage\Database\DatabasePool;
+use phpOMS\DataStorage\Database\DatabaseStatus;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 use phpOMS\DataStorage\Session\HttpSession;
 use phpOMS\Dispatcher\Dispatcher;
@@ -25,20 +30,17 @@ use phpOMS\Event\EventManager;
 use phpOMS\Localization\L11nManager;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
+use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Model\Html\Head;
-use phpOMS\Module\ModuleManager;
 use phpOMS\Router\RouteVerb;
 use phpOMS\Router\WebRouter;
-use phpOMS\System\File\PathException;
-use phpOMS\System\MimeType;
 use phpOMS\Uri\UriFactory;
 use phpOMS\Views\View;
 use WebApplication;
 
 final class Application
 {
-
     private WebApplication $app;
 
     private array $config;
@@ -51,230 +53,8 @@ final class Application
         UriFactory::setQuery('/app', \strtolower($this->app->appName));
     }
 
-    public function run(HttpRequest $request, HttpResponse $response): void
+    public function run(HttpRequest $request, HttpResponse $response) : void
     {
-        $response->header->set('Content-Type', 'text/plain; charset=utf-8');
-        $pageView = new View($this->app->l11nManager, $request, $response);
 
-        $this->app->l11nManager = new L11nManager($this->app->appName);
-        $this->app->dbPool      = new DatabasePool();
-        $this->app->router      = new WebRouter();
-        $this->app->router->importFromFile(__DIR__ . '/Routes.php');
-
-        $this->app->sessionManager = new HttpSession(0);
-        $this->app->cookieJar      = new CookieJar();
-        $this->app->moduleManager  = new ModuleManager($this->app, __DIR__ . '/../../Modules/');
-        $this->app->dispatcher     = new Dispatcher($this->app);
-
-        $this->app->dbPool->create('core', $this->config['db']['core']['masters']['admin']);
-        $this->app->dbPool->create('insert', $this->config['db']['core']['masters']['insert']);
-        $this->app->dbPool->create('select', $this->config['db']['core']['masters']['select']);
-        $this->app->dbPool->create('update', $this->config['db']['core']['masters']['update']);
-        $this->app->dbPool->create('delete', $this->config['db']['core']['masters']['delete']);
-        $this->app->dbPool->create('schema', $this->config['db']['core']['masters']['schema']);
-
-        /* Checking csrf token, if a csrf token is required at all has to be decided in the route or controller */
-        if ($request->getData('CSRF') !== null
-            && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getData('CSRF'))
-        ) {
-            $response->header->status = RequestStatusCode::R_403;
-
-            return;
-        }
-
-        /** @var \phpOMS\DataStorage\Database\Connection\ConnectionAbstract $con */
-        $con = $this->app->dbPool->get();
-        DataMapperFactory::db($con);
-
-        $this->app->cachePool    = new CachePool();
-        $this->app->appSettings  = new CoreSettings();
-        $this->app->eventManager = new EventManager($this->app->dispatcher);
-        $this->app->eventManager->importFromFile(__DIR__ . '/Hooks.php');
-
-        $this->app->accountManager = new AccountManager($this->app->sessionManager);
-        $this->app->l11nServer     = LocalizationMapper::get()->where('id', 1)->execute();
-
-        $this->app->orgId = $this->getApplicationOrganization($request, $this->config['app']);
-        $pageView->setData('orgId', $this->app->orgId);
-
-        $aid                       = Auth::authenticate($this->app->sessionManager);
-        $request->header->account  = $aid;
-        $response->header->account = $aid;
-
-        $account = $this->loadAccount($request);
-
-        if (!($account instanceof NullAccount)) {
-            $response->header->l11n = $account->l11n;
-        } elseif ($this->app->sessionManager->get('language') !== null) {
-            $response->header->l11n
-                ->loadFromLanguage(
-                    $this->app->sessionManager->get('language'),
-                    $this->app->sessionManager->get('country') ?? '*'
-                );
-        } elseif ($this->app->cookieJar->get('language') !== null) {
-            $response->header->l11n
-                ->loadFromLanguage(
-                    $this->app->cookieJar->get('language'),
-                    $this->app->cookieJar->get('country') ?? '*'
-                );
-        }
-
-        UriFactory::setQuery('/lang', $response->getLanguage());
-        $response->header->set('content-language', $response->getLanguage(), true);
-
-        // Cache general settings
-        $this->app->appSettings->get(null, [
-            SettingsEnum::LOGGING_STATUS, SettingsEnum::CLI_ACTIVE,
-        ]);
-
-        $appStatus = (int) ($this->app->appSettings->get(null, SettingsEnum::LOGIN_STATUS)->content ?? 0);
-        if ($appStatus === ApplicationStatus::READ_ONLY ||  $appStatus === ApplicationStatus::DISABLED) {
-            if (!$account->hasPermission(PermissionType::CREATE | PermissionType::MODIFY, module: 'Admin', type: PermissionCategory::APP)) {
-                if ($request->getRouteVerb() !== RouteVerb::GET) {
-                    // Application is in read only mode or completely disabled
-                    // If read only mode is active only GET requests are allowed
-                    // A user who is part of the admin group is excluded from this rule
-                    $response->header->status = RequestStatusCode::R_405;
-
-                    return;
-                }
-
-                $this->app->dbPool->remove('admin');
-                $this->app->dbPool->remove('insert');
-                $this->app->dbPool->remove('update');
-                $this->app->dbPool->remove('delete');
-                $this->app->dbPool->remove('schema');
-            }
-        }
-
-        if (!empty($uris = $request->uri->getQuery('r'))) {
-            $this->handleBatchRequest($uris, $request, $response);
-
-            return;
-        }
-
-        $this->app->moduleManager->initRequestModules($request);
-
-        // add tpl loading
-        $this->app->router->add(
-            '/api/tpl/.*',
-            function () use ($account, $request, $response): void {
-                $appName = \ucfirst($request->getData('app') ?? 'Backend');
-                $app     = new class() extends ApplicationAbstract
-                {
-                };
-
-                $app->appName        = $appName;
-                $app->dbPool         = $this->app->dbPool;
-                $app->orgId          = $this->app->orgId;
-                $app->accountManager = $this->app->accountManager;
-                $app->appSettings    = $this->app->appSettings;
-                $app->l11nManager    = new L11nManager($app->appName);
-                $app->moduleManager  = new ModuleManager($app, __DIR__ . '/../../Modules/');
-                $app->dispatcher     = new Dispatcher($app);
-                $app->eventManager   = new EventManager($app->dispatcher);
-                $app->router         = new WebRouter();
-
-                $app->eventManager->importFromFile(__DIR__ . '/../' . $appName . '/Hooks.php');
-                $app->router->importFromFile(__DIR__ . '/../' . $appName . '/Routes.php');
-
-                $route = \str_replace('/api/tpl', '/' . $appName, $request->uri->getRoute());
-
-                $view = new View();
-                $view->setTemplate('/Web/Api/index');
-
-                $response->set('Content', $view);
-                $response->get('Content')->setData('head', new Head());
-
-                $app->l11nManager->loadLanguage(
-                    $response->getLanguage(),
-                    '0',
-                    include __DIR__ . '/../' . $appName . '/lang/' . $response->getLanguage() . '.lang.php'
-                );
-
-                $routed = $app->router->route(
-                    $route,
-                    $request->getData('CSRF'),
-                    $request->getRouteVerb(),
-                    $appName,
-                    $this->app->orgId,
-                    $account,
-                    $request->getData()
-                );
-
-                $response->get('Content')->setData('dispatch', $app->dispatcher->dispatch($routed, $request, $response));
-            },
-            RouteVerb::GET
-        );
-
-        $routed = $this->app->router->route(
-            $request->uri->getRoute(),
-            $request->getData('CSRF'),
-            $request->getRouteVerb(),
-            $this->app->appName,
-            $this->app->orgId,
-            $account,
-            $request->getData()
-        );
-
-        $dispatched = $this->app->dispatcher->dispatch($routed, $request, $response);
-
-        if (empty($dispatched)) {
-            $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
-            $response->header->status = RequestStatusCode::R_404;
-            $response->set($request->uri->__toString(), [
-                'status'   => \phpOMS\Message\NotificationLevel::ERROR,
-                'title'    => '',
-                'message'  => '',
-                'response' => [],
-            ]);
-        }
-
-        $pageView->addData('dispatch', $dispatched);
-    }
-
-    private function loadAccount(HttpRequest $request): Account
-    {
-        $account = AccountMapper::getWithPermissions($request->header->account);
-        $this->app->accountManager->add($account);
-
-        return $account;
-    }
-
-    private function handleBatchRequest(string $uris, HttpRequest $request, HttpResponse $response): void
-    {
-        $request_r = clone $request;
-        $uris      = \json_decode($uris, true);
-
-        foreach ($uris as $uri) {
-            $modules = $this->app->moduleManager->getRoutedModules($request_r);
-            $this->app->moduleManager->initModule($modules);
-
-            $this->app->dispatcher->dispatch(
-                $this->app->router->route(
-                    $request->uri->getRoute(),
-                    $request->getData('CSRF') ?? null
-                ),
-                $request,
-                $response
-            );
-        }
-    }
-
-    private function getApplicationOrganization(HttpRequest $request, array $config): int
-    {
-        return (int) ($request->getData('u') ?? ($config['domains'][$request->uri->host]['org'] ?? $config['default']['org']));
-    }
-
-    private function loadLanguageFromPath(string $language, string $path): void
-    {
-        /* Load theme language */
-        if (($absPath = \realpath($path)) === false) {
-            throw new PathException($path);
-        }
-
-        /** @noinspection PhpIncludeInspection */
-        $themeLanguage = include $absPath;
-        $this->app->l11nManager->loadLanguage($language, '0', $themeLanguage);
     }
 }
diff --git a/app/web/Applications/Backend/Application.php b/app/web/Applications/Backend/Application.php
old mode 100644
new mode 100755
index e69de29..0bd546b
--- a/app/web/Applications/Backend/Application.php
+++ b/app/web/Applications/Backend/Application.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Karaka
+ *
+ * PHP Version 8.1
+ *
+ * @package   Applications\Backend
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://karaka.app
+ */
+declare(strict_types=1);
+
+namespace Applications\Backend;
+
+use phpOMS\Account\Account;
+use phpOMS\Account\AccountManager;
+use phpOMS\Account\PermissionType;
+use phpOMS\Asset\AssetType;
+use phpOMS\Auth\Auth;
+use phpOMS\DataStorage\Cache\CachePool;
+use phpOMS\DataStorage\Cookie\CookieJar;
+use phpOMS\DataStorage\Database\DatabasePool;
+use phpOMS\DataStorage\Database\DatabaseStatus;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
+use phpOMS\DataStorage\Session\HttpSession;
+use phpOMS\Dispatcher\Dispatcher;
+use phpOMS\Event\EventManager;
+use phpOMS\Localization\L11nManager;
+use phpOMS\Message\Http\HttpRequest;
+use phpOMS\Message\Http\HttpResponse;
+use phpOMS\Message\Http\RequestMethod;
+use phpOMS\Message\Http\RequestStatusCode;
+use phpOMS\Model\Html\Head;
+use phpOMS\Router\RouteVerb;
+use phpOMS\Router\WebRouter;
+use phpOMS\Uri\UriFactory;
+use phpOMS\Views\View;
+use WebApplication;
+
+final class Application
+{
+    private WebApplication $app;
+
+    private array $config;
+
+    public function __construct(WebApplication $app, array $config)
+    {
+        $this->app          = $app;
+        $this->app->appName = 'Backend';
+        $this->config       = $config;
+        UriFactory::setQuery('/app', \strtolower($this->app->appName));
+    }
+
+    public function run(HttpRequest $request, HttpResponse $response) : void
+    {
+
+    }
+}
diff --git a/app/web/Applications/E500/Application.php b/app/web/Applications/E500/Application.php
old mode 100644
new mode 100755
index 6ec0fdb..e54797c
--- a/app/web/Applications/E500/Application.php
+++ b/app/web/Applications/E500/Application.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Karaka
+ *
+ * PHP Version 8.1
+ *
+ * @package   Applications\E500
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://karaka.app
+ */
 declare(strict_types=1);
 
 namespace Applications\E500;
diff --git a/app/web/Applications/E500/lang/en.lang.php b/app/web/Applications/E500/lang/en.lang.php
new file mode 100644
index 0000000..f2e8952
--- /dev/null
+++ b/app/web/Applications/E500/lang/en.lang.php
@@ -0,0 +1,7 @@
+<?php
+declare(strict_types=1);
+
+return [[
+    'ErrorMessage' => 'Error 500 - Unexpected error',
+    'Description'  => 'Something unexpected happened but don\'t fear we already got informed about this error.',
+]];
diff --git a/app/web/Applications/Frontend/Application.php b/app/web/Applications/Frontend/Application.php
old mode 100644
new mode 100755
index e69de29..383041e
--- a/app/web/Applications/Frontend/Application.php
+++ b/app/web/Applications/Frontend/Application.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Karaka
+ *
+ * PHP Version 8.1
+ *
+ * @package   Applications\Frontend
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://karaka.app
+ */
+declare(strict_types=1);
+
+namespace Applications\Frontend;
+
+use Models\CoreSettings;
+use phpOMS\Account\Account;
+use phpOMS\Account\NullAccount;
+use phpOMS\Account\AccountManager;
+use phpOMS\Asset\AssetType;
+use phpOMS\Auth\Auth;
+use phpOMS\DataStorage\Cache\CachePool;
+use phpOMS\DataStorage\Cookie\CookieJar;
+use phpOMS\DataStorage\Database\DatabasePool;
+use phpOMS\DataStorage\Session\HttpSession;
+use phpOMS\Dispatcher\Dispatcher;
+use phpOMS\Event\EventManager;
+use phpOMS\Localization\L11nManager;
+use phpOMS\Localization\Localization;
+use phpOMS\Message\Http\HttpRequest;
+use phpOMS\Message\Http\HttpResponse;
+use phpOMS\Message\Http\RequestMethod;
+use phpOMS\Message\Http\RequestStatusCode;
+use phpOMS\Model\Html\Head;
+use phpOMS\Router\RouteVerb;
+use phpOMS\Router\WebRouter;
+use phpOMS\Uri\UriFactory;
+use phpOMS\Views\View;
+use WebApplication;
+
+final class Application
+{
+    private WebApplication $app;
+
+    private array $config;
+
+    public function __construct(WebApplication $app, array $config)
+    {
+        $this->app          = $app;
+        $this->app->appName = 'Frontend';
+        $this->config       = $config;
+        UriFactory::setQuery('/app', \strtolower($this->app->appName));
+    }
+
+    public function run(HttpRequest $request, HttpResponse $response) : void
+    {
+        $this->app->l11nManager    = new L11nManager($this->app->appName);
+        $this->app->dbPool         = new DatabasePool();
+        $this->app->sessionManager = new HttpSession(0);
+        $this->app->cookieJar      = new CookieJar();
+        $this->app->dispatcher     = new Dispatcher($this->app);
+
+        $this->app->router = new WebRouter();
+        $this->app->router->importFromFile(__DIR__ . '/Routes.php');
+        $this->app->router->add(
+            '/backend/e403',
+            function() use ($request, $response) {
+                $view = new View($this->app->l11nManager, $request, $response);
+                $view->setTemplate('/Web/Backend/Error/403_inline');
+                $response->header->status = RequestStatusCode::R_403;
+
+                return $view;
+            },
+            RouteVerb::GET
+        );
+
+        /* CSRF token OK? */
+        if ($request->getData('CSRF') !== null
+            && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getData('CSRF'))
+        ) {
+            $response->header->status = RequestStatusCode::R_403;
+
+            return;
+        }
+
+        $this->app->cachePool      = new CachePool();
+        $this->app->appSettings    = new CoreSettings();
+        $this->app->eventManager   = new EventManager($this->app->dispatcher);
+        $this->app->accountManager = new AccountManager($this->app->sessionManager);
+        $this->app->l11nServer     = new Localization();
+
+        $aid                       = Auth::authenticate($this->app->sessionManager);
+        $request->header->account  = $aid;
+        $response->header->account = $aid;
+
+        $account = $this->loadAccount($request);
+
+        if ($this->app->sessionManager->get('language') !== null) {
+            $response->header->l11n
+                ->loadFromLanguage(
+                    $this->app->sessionManager->get('language'),
+                    $this->app->sessionManager->get('country') ?? '*'
+                );
+        } elseif ($this->app->cookieJar->get('language') !== null) {
+            $response->header->l11n
+                ->loadFromLanguage(
+                    $this->app->cookieJar->get('language'),
+                    $this->app->cookieJar->get('country') ?? '*'
+                );
+        }
+
+        if (!\in_array($response->getLanguage(), $this->config['language'])) {
+            $response->header->l11n->setLanguage($this->app->l11nServer->getLanguage());
+        }
+
+        $pageView = new FrontendView($this->app->l11nManager, $request, $response);
+        $head     = new Head();
+
+        $pageView->setData('orgId', $this->app->orgId);
+        $pageView->setData('head', $head);
+        $response->set('Content', $pageView);
+
+        /* Backend only allows GET */
+        if ($request->getMethod() !== RequestMethod::GET) {
+            $this->create406Response($response, $pageView);
+
+            return;
+        }
+
+        UriFactory::setQuery('/lang', $response->getLanguage());
+
+        $this->app->loadLanguageFromPath(
+            $response->getLanguage(),
+            __DIR__ . '/lang/' . $response->getLanguage() . '.lang.php'
+        );
+
+        $response->header->set('content-language', $response->getLanguage(), true);
+
+        /* Create html head */
+        $this->initResponseHead($head, $request, $response);
+
+        $this->createDefaultPageView($request, $response, $pageView);
+
+        $dispatched = $this->app->dispatcher->dispatch(
+            $this->app->router->route(
+                $request->uri->getRoute(),
+                $request->getData('CSRF'),
+                $request->getRouteVerb(),
+                $this->app->appName,
+                $this->app->orgId,
+                $account,
+                $request->getData()
+            ),
+            $request,
+            $response
+        );
+        $pageView->addData('dispatch', $dispatched);
+    }
+
+    private function createDefaultPageView(HttpRequest $request, HttpResponse $response, FrontendView $pageView) : void
+    {
+        $pageView->setTemplate('/Applications/Frontend/index');
+    }
+
+    private function create403Response(HttpResponse $response, View $pageView) : void
+    {
+        $response->header->status = RequestStatusCode::R_403;
+        $pageView->setTemplate('/Applications/Frontend/Error/403');
+        $this->app->loadLanguageFromPath(
+            $response->getLanguage(),
+            __DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
+        );
+    }
+
+    private function create406Response(HttpResponse $response, View $pageView) : void
+    {
+        $response->header->status = RequestStatusCode::R_406;
+        $pageView->setTemplate('/Applications/Frontend/Error/406');
+        $this->app->loadLanguageFromPath(
+            $response->getLanguage(),
+            __DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
+        );
+    }
+
+    private function create503Response(HttpResponse $response, View $pageView) : void
+    {
+        $response->header->status = RequestStatusCode::R_503;
+        $pageView->setTemplate('/Applications/Frontend/Error/503');
+        $this->app->loadLanguageFromPath(
+            $response->getLanguage(),
+            __DIR__ . '/Error/lang/' . $response->getLanguage() . '.lang.php'
+        );
+    }
+
+    private function loadAccount(HttpRequest $request) : Account
+    {
+        $account = new NullAccount();
+        $this->app->accountManager->add($account);
+
+        return $account;
+    }
+
+    private function initResponseHead(Head $head, HttpRequest $request, HttpResponse $response) : void
+    {
+        /* Load assets */
+        $head->addAsset(AssetType::CSS, 'Resources/fonts/fontawesome/css/font-awesome.min.css?v=1.0.0');
+        $head->addAsset(AssetType::CSS, 'Resources/fonts/linearicons/css/style.css?v=1.0.0');
+        $head->addAsset(AssetType::CSS, 'Resources/fonts/lineicons/css/lineicons.css?v=1.0.0');
+        $head->addAsset(AssetType::CSS, 'cssOMS/styles.css?v=1.0.0');
+        $head->addAsset(AssetType::CSS, 'Resources/fonts/Roboto/roboto.css?v=1.0.0');
+
+        // Framework
+        $head->addAsset(AssetType::JS, 'jsOMS/Utils/oLib.js?v=1.0.0');
+        $head->addAsset(AssetType::JS, 'jsOMS/UnhandledException.js?v=1.0.0');
+        $head->addAsset(AssetType::JS, 'Applications/Frontend/js/frontend.js?v=1.0.0', ['type' => 'module']);
+
+        $script = '';
+        $response->header->set(
+            'content-security-policy',
+            'base-uri \'self\'; script-src \'self\' blob: \'sha256-'
+            . \base64_encode(\hash('sha256', $script, true))
+            . '\'; worker-src \'self\'',
+            true
+        );
+
+        if ($request->hasData('debug')) {
+            $head->addAsset(AssetType::CSS, 'cssOMS/debug.css?v=1.0.0');
+            \phpOMS\DataStorage\Database\Query\Builder::$log = true;
+        }
+
+        $css = \file_get_contents(__DIR__ . '/css/small.css');
+        if ($css === false) {
+            $css = '';
+        }
+
+        $css = \preg_replace('!\s+!', ' ', $css);
+        $head->setStyle('core', $css ?? '');
+        $head->title = 'Karaka Frontend';
+    }
+}
diff --git a/app/web/Applications/Frontend/Error/lang/en.lang.php b/app/web/Applications/Frontend/Error/lang/en.lang.php
new file mode 100644
index 0000000..f2e8952
--- /dev/null
+++ b/app/web/Applications/Frontend/Error/lang/en.lang.php
@@ -0,0 +1,7 @@
+<?php
+declare(strict_types=1);
+
+return [[
+    'ErrorMessage' => 'Error 500 - Unexpected error',
+    'Description'  => 'Something unexpected happened but don\'t fear we already got informed about this error.',
+]];
diff --git a/app/web/Applications/Frontend/FrontendView.php b/app/web/Applications/Frontend/FrontendView.php
new file mode 100644
index 0000000..d9194dd
--- /dev/null
+++ b/app/web/Applications/Frontend/FrontendView.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Karaka
+ *
+ * PHP Version 8.1
+ *
+ * @package   Web\Backend
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://karaka.app
+ */
+declare(strict_types=1);
+
+namespace Applications\Frontend;
+
+use phpOMS\Localization\L11nManager;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use phpOMS\Views\View;
+
+class FrontendView extends View
+{
+    public function __construct(L11nManager $l11n = null, RequestAbstract $request = null, ResponseAbstract $response = null)
+    {
+        parent::__construct($l11n, $request, $response);
+    }
+}
diff --git a/app/web/content/about.en.md b/app/web/Applications/Frontend/content/about.de.md
old mode 100644
new mode 100755
similarity index 100%
rename from app/web/content/about.en.md
rename to app/web/Applications/Frontend/content/about.de.md
diff --git a/app/web/content/terms.de.md b/app/web/Applications/Frontend/content/about.en.md
old mode 100644
new mode 100755
similarity index 100%
rename from app/web/content/terms.de.md
rename to app/web/Applications/Frontend/content/about.en.md
diff --git a/app/web/content/terms.en.md b/app/web/Applications/Frontend/content/terms.de.md
old mode 100644
new mode 100755
similarity index 100%
rename from app/web/content/terms.en.md
rename to app/web/Applications/Frontend/content/terms.de.md
diff --git a/app/web/css/styles.css b/app/web/Applications/Frontend/content/terms.en.md
old mode 100644
new mode 100755
similarity index 100%
rename from app/web/css/styles.css
rename to app/web/Applications/Frontend/content/terms.en.md
diff --git a/app/web/css/clean.css b/app/web/Applications/Frontend/css/clean.css
old mode 100644
new mode 100755
similarity index 100%
rename from app/web/css/clean.css
rename to app/web/Applications/Frontend/css/clean.css
diff --git a/app/web/css/small.css b/app/web/Applications/Frontend/css/small.css
old mode 100644
new mode 100755
similarity index 56%
rename from app/web/css/small.css
rename to app/web/Applications/Frontend/css/small.css
index 6017bdb..1848315
--- a/app/web/css/small.css
+++ b/app/web/Applications/Frontend/css/small.css
@@ -11,4 +11,14 @@ body {
     background: #fff;
     display: flex;
     flex-direction: column;
-}
\ No newline at end of file
+}
+
+nav {
+    overflow-y: auto;
+    font-size: 0.8em;
+    color: rgba(0, 0, 0, 0.8);
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    user-select: none;
+}
diff --git a/app/web/js/app.js b/app/web/Applications/Frontend/css/styles.css
old mode 100644
new mode 100755
similarity index 100%
rename from app/web/js/app.js
rename to app/web/Applications/Frontend/css/styles.css
diff --git a/app/web/css/vars.css b/app/web/Applications/Frontend/css/vars.css
old mode 100644
new mode 100755
similarity index 100%
rename from app/web/css/vars.css
rename to app/web/Applications/Frontend/css/vars.css
diff --git a/app/web/tpl/index.tpl.php b/app/web/Applications/Frontend/index.tpl.php
similarity index 55%
rename from app/web/tpl/index.tpl.php
rename to app/web/Applications/Frontend/index.tpl.php
index b3c6d55..0496d90 100644
--- a/app/web/tpl/index.tpl.php
+++ b/app/web/Applications/Frontend/index.tpl.php
@@ -5,7 +5,7 @@
  *
  * PHP Version 8.1
  *
- * @package   Web\Backend
+ * @package   Applications\Frontend
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
@@ -15,15 +15,6 @@ declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
 
-/** @var Web\Backend\BackendView $this */
-$nav = $this->getData('nav');
-
-$nav->setTemplate('/Modules/Navigation/Theme/Backend/top');
-$top = $nav->render();
-
-$nav->setTemplate('/Modules/Navigation/Theme/Backend/side');
-$side = $nav->render();
-
 /** @var phpOMS\Model\Html\Head $head */
 $head = $this->getData('head');
 
@@ -39,13 +30,11 @@ $dispatch = $this->getData('dispatch') ?? [];
     <meta name="msapplication-navbutton-color" content="#343a40">
     <meta name="apple-mobile-web-app-status-bar-style" content="#343a40">
     <meta name="description" content="<?= $this->getHtml(':meta', '0', '0'); ?>">
-    <base href="<?= UriFactory::build('{/base}'); ?>/">
-
     <?= $head->meta->render(); ?>
 
-    <link rel="manifest" href="<?= UriFactory::build('Web/Backend/manifest.json'); ?>">
-    <link rel="manifest" href="<?= UriFactory::build('Web/Backend/manifest.webmanifest'); ?>">
-    <link rel="shortcut icon" href="<?= UriFactory::build('Web/Backend/img/favicon.ico?v=1.0.0'); ?>" type="image/x-icon">
+    <base href="<?= UriFactory::build('{/base}'); ?>/">
+
+    <link rel="shortcut icon" href="<?= UriFactory::build('Applications/Frontend/img/favicon.ico?v=1.0.0'); ?>" type="image/x-icon">
 
     <title><?= $this->printHtml($head->title); ?></title>
 
@@ -55,19 +44,25 @@ $dispatch = $this->getData('dispatch') ?? [];
     <script><?= $head->renderScript(); ?></script>
 </head>
 <body>
-<?php
-$c = 0;
-foreach ($dispatch as $view) {
-    if (!($view instanceof \phpOMS\Views\NullView)
-        && $view instanceof \phpOMS\Contract\RenderableInterface
-    ) {
-        ++$c;
-        echo $view->render();
-    }
-}
+	<?php include __DIR__ . '/tpl/nav.tpl.php'; ?>
+    <main>
+        <div id="content" class="container-fluid" role="main">
+            <?php
+            $c = 0;
+            foreach ($dispatch as $view) {
+                if (!($view instanceof \phpOMS\Views\NullView)
+                    && $view instanceof \phpOMS\Contract\RenderableInterface
+                ) {
+                    ++$c;
+                    echo $view->render();
+                }
+            }
 
-if ($c === 0) {
-    echo '<div class="emptyPage"></div>';
-}
-?>
-<?= $head->renderAssetsLate(); ?>
\ No newline at end of file
+            if ($c === 0) {
+                echo '<div class="emptyPage"></div>';
+            }
+            ?>
+        </div>
+    </main>
+    <?php include __DIR__ . '/tpl/footer.tpl.php'; ?>
+<?= $head->renderAssetsLate(); ?>
diff --git a/app/web/lang/de.lang.php b/app/web/Applications/Frontend/js/frontend.js
old mode 100644
new mode 100755
similarity index 100%
rename from app/web/lang/de.lang.php
rename to app/web/Applications/Frontend/js/frontend.js
diff --git a/app/web/Applications/Frontend/lang/en.lang.php b/app/web/Applications/Frontend/lang/en.lang.php
new file mode 100644
index 0000000..d567c8f
--- /dev/null
+++ b/app/web/Applications/Frontend/lang/en.lang.php
@@ -0,0 +1,5 @@
+<?php
+declare(strict_types=1);
+
+return [[
+]];
diff --git a/app/web/Applications/Frontend/tpl/footer.tpl.php b/app/web/Applications/Frontend/tpl/footer.tpl.php
new file mode 100644
index 0000000..8a76453
--- /dev/null
+++ b/app/web/Applications/Frontend/tpl/footer.tpl.php
@@ -0,0 +1,3 @@
+<footer>
+	footer
+</footer>
\ No newline at end of file
diff --git a/app/web/Applications/Frontend/tpl/nav.tpl.php b/app/web/Applications/Frontend/tpl/nav.tpl.php
new file mode 100644
index 0000000..42bad58
--- /dev/null
+++ b/app/web/Applications/Frontend/tpl/nav.tpl.php
@@ -0,0 +1,2 @@
+<nav>ttt
+</nav>
\ No newline at end of file
diff --git a/app/web/Controllers/ApiController.php b/app/web/Controllers/ApiController.php
old mode 100644
new mode 100755
diff --git a/app/web/Controllers/FrontController.php b/app/web/Controllers/FrontController.php
old mode 100644
new mode 100755
diff --git a/app/web/Install/Application.php b/app/web/Install/Application.php
old mode 100644
new mode 100755
diff --git a/app/web/Install/InstallAbstract.php b/app/web/Install/InstallAbstract.php
old mode 100644
new mode 100755
index c2be1bc..23372b4
--- a/app/web/Install/InstallAbstract.php
+++ b/app/web/Install/InstallAbstract.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 
 namespace Install;
 
-use Models\CoreSettings;
 use Models\Account;
 use Models\AccountCredentialMapper;
 use Models\Group;
@@ -22,9 +21,6 @@ use Models\GroupMapper;
 use Models\GroupPermission;
 use Models\GroupPermissionMapper;
 use Models\PermissionCategory;
-use Models\ModuleStatusUpdateType;
-use Models\NullAccount;
-use phpOMS\Account\AccountManager;
 use phpOMS\Account\AccountStatus;
 use phpOMS\Account\AccountType;
 use phpOMS\Account\GroupStatus;
@@ -32,48 +28,11 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\DataStorage\Database\Connection\ConnectionAbstract;
 use phpOMS\DataStorage\Database\Connection\ConnectionFactory;
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
-use phpOMS\DataStorage\Session\HttpSession;
-use phpOMS\Dispatcher\Dispatcher;
-use phpOMS\Event\EventManager;
-use phpOMS\Localization\Localization;
-use phpOMS\Message\Http\HttpRequest;
-use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\RequestAbstract;
-use phpOMS\Module\ModuleManager;
-use phpOMS\System\File\Local\Directory;
-use phpOMS\System\MimeType;
-use phpOMS\Uri\HttpUri;
-use phpOMS\Utils\IO\Zip\Zip;
-use phpOMS\Utils\TestUtils;
 
-/**
- * Application class.
- *
- * @package Install
- * @license OMS License 1.0
- * @link    https://karaka.app
- * @since   1.0.0
- */
 abstract class InstallAbstract extends ApplicationAbstract
 {
-    /**
-     * Module manager
-     *
-     * @var null|ModuleManager
-     * @since 1.0.0
-     */
-    protected static ?ModuleManager $mManager = null;
-
-    /**
-     * Setup general handlers for the application.
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     * @codeCoverageIgnore
-     */
     protected function setupHandlers() : void
     {
         \set_exception_handler(['\phpOMS\UnhandledHandler', 'exceptionHandler']);
@@ -82,71 +41,23 @@ abstract class InstallAbstract extends ApplicationAbstract
         \mb_internal_encoding('UTF-8');
     }
 
-    /**
-     * Clear old install
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function clearOld() : void
     {
-        \file_put_contents(__DIR__ . '/../Cli/Routes.php', '<?php return [];');
-        \file_put_contents(__DIR__ . '/../Cli/Hooks.php', '<?php return [];');
-
-        $dirs = \scandir(__DIR__ . '/../Web');
-        if ($dirs === false) {
-            return; // @codeCoverageIgnore
-        }
-
-        foreach ($dirs as $dir) {
-            if ($dir === '.' || $dir === '..'
-                || $dir === 'Exception'
-                || $dir === 'WebApplication.php'
-            ) {
-                continue;
-            }
-
-            Directory::delete(__DIR__ . '/../Web/' . $dir);
-        }
+        \file_put_contents(__DIR__ . '/../Routes.php', '<?php return [];');
+        \file_put_contents(__DIR__ . '/../Hooks.php', '<?php return [];');
     }
 
-    /**
-     * Check if has certain php extensions enabled
-     *
-     * @return bool
-     *
-     * @since 1.0.0
-     */
     protected static function hasPhpExtensions() : bool
     {
         return \extension_loaded('pdo')
             && \extension_loaded('mbstring');
     }
 
-    /**
-     * Check if database connection is correct and working
-     *
-     * @param RequestAbstract $request Request
-     *
-     * @return bool
-     *
-     * @since 1.0.0
-     */
     protected static function testDbConnection(RequestAbstract $request) : bool
     {
         return true;
     }
 
-    /**
-     * Create database connection
-     *
-     * @param RequestAbstract $request Request
-     *
-     * @return ConnectionAbstract
-     *
-     * @since 1.0.0
-     */
     protected static function setupDatabaseConnection(RequestAbstract $request) : ConnectionAbstract
     {
         return ConnectionFactory::create([
@@ -159,30 +70,12 @@ abstract class InstallAbstract extends ApplicationAbstract
         ]);
     }
 
-    /**
-     * Install/setup configuration
-     *
-     * @param RequestAbstract $request Request
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function installConfigFile(RequestAbstract $request) : void
     {
         self::editConfigFile($request);
         self::editHtaccessFile($request);
     }
 
-    /**
-     * Modify config file
-     *
-     * @param RequestAbstract $request Request
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function editConfigFile(RequestAbstract $request) : void
     {
         $db     = $request->getData('dbtype');
@@ -200,23 +93,20 @@ abstract class InstallAbstract extends ApplicationAbstract
         $subdir = $request->getData('websubdir');
         $tld    = $request->getData('domain');
 
-        $tldOrg     = 1;
-        $defaultOrg = 1;
+        $pageType = $request->getData('installtype');
+
+        $defaultApp = 'Frontend';
+        if ($pageType === 'oem') {
+            $defaultApp = 'Backend';
+        }
+
+        $defaultAppLower = \strtolower($defaultApp);
 
         $config = include __DIR__ . '/Templates/config.tpl.php';
 
         \file_put_contents(__DIR__ . '/../config.php', $config);
     }
 
-    /**
-     * Modify htaccess file
-     *
-     * @param RequestAbstract $request Request
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function editHtaccessFile(RequestAbstract $request) : void
     {
         $fullTLD = $request->getData('domain');
@@ -226,31 +116,14 @@ abstract class InstallAbstract extends ApplicationAbstract
         $config = include __DIR__ . '/Templates/htaccess.tpl.php';
 
         \file_put_contents(__DIR__ . '/../.htaccess', $config);
+        \file_put_contents(__DIR__ . '/../../server/config.json', \json_encode($config, \JSON_PRETTY_PRINT));
     }
 
-    /**
-     * Install core functionality
-     *
-     * @param ConnectionAbstract $db Database connection
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function installCore(ConnectionAbstract $db) : void
     {
         self::createBaseTables($db);
     }
 
-    /**
-     * Create module table
-     *
-     * @param ConnectionAbstract $db Database connection
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function createBaseTables(ConnectionAbstract $db) : void
     {
         $path = __DIR__ . '/db.json';
@@ -269,30 +142,12 @@ abstract class InstallAbstract extends ApplicationAbstract
         }
     }
 
-    /**
-     * Install basic groups
-     *
-     * @param ConnectionAbstract $db Database connection
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function installGroups(ConnectionAbstract $db) : void
     {
         self::installMainGroups($db);
         self::installGroupPermissions($db);
     }
 
-    /**
-     * Create basic groups in db
-     *
-     * @param ConnectionAbstract $db Database connection
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function installMainGroups(ConnectionAbstract $db) : void
     {
         $guest = new Group('guest');
@@ -308,15 +163,6 @@ abstract class InstallAbstract extends ApplicationAbstract
         GroupMapper::create()->execute($admin);
     }
 
-    /**
-     * Set permissions of basic groups
-     *
-     * @param ConnectionAbstract $db Database connection
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function installGroupPermissions(ConnectionAbstract $db) : void
     {
         $searchPermission = new GroupPermission(
@@ -334,75 +180,20 @@ abstract class InstallAbstract extends ApplicationAbstract
         GroupPermissionMapper::create()->execute($adminPermission);
     }
 
-    /**
-     * Install users
-     *
-     * @param RequestAbstract    $request Request
-     * @param ConnectionAbstract $db      Database connection
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function installUsers(RequestAbstract $request, ConnectionAbstract $db) : void
     {
         self::installMainUser($request, $db);
     }
 
-    /**
-     * Install applications
-     *
-     * @param RequestAbstract    $request Request
-     * @param ConnectionAbstract $db      Database connection
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function installApplications(RequestAbstract $request, ConnectionAbstract $db) : void
     {
-        if (self::$mManager === null) {
-            return;
-        }
-
-        $apps  = $request->getDataList('apps');
-        $theme = 'Default';
-
-        /** @var \Modules\CMS\Controller\ApiController $module */
-        $module = self::$mManager->get('CMS');
-
-        foreach ($apps as $app) {
-            $temp                  = new HttpRequest(new HttpUri(''));
-            $temp->header->account = 1;
-            $temp->setData('name', \basename($app));
-            $temp->setData('theme', $theme);
-
-            Zip::pack(__DIR__ . '/../' . $app, __DIR__ . '/' . \basename($app) . '.zip');
-
-            TestUtils::setMember($temp, 'files', [
-                [
-                    'name'     => \basename($app) . '.zip',
-                    'type'     => MimeType::M_ZIP,
-                    'tmp_name' => __DIR__ . '/' . \basename($app) . '.zip',
-                    'error'    => \UPLOAD_ERR_OK,
-                    'size'     => \filesize(__DIR__ . '/' . \basename($app) . '.zip'),
-                ],
-            ]);
-
-            $module->apiApplicationInstall($temp, new HttpResponse());
+        if ($request->getData('installtype') === 'orm') {
+            \copy(__DIR__ . '/Templates/ORMRoutes.php', __DIR__ . '/../Routes.php');
+        } else {
+            \copy(__DIR__ . '/Templates/DistRoutes.php', __DIR__ . '/../Routes.php');
         }
     }
 
-    /**
-     * Setup root user in database
-     *
-     * @param RequestAbstract    $request Request
-     * @param ConnectionAbstract $db      Database connection
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
     protected static function installMainUser(RequestAbstract $request, ConnectionAbstract $db) : void
     {
         $account = new Account();
diff --git a/app/web/Install/Templates/DistRoutes.php b/app/web/Install/Templates/DistRoutes.php
new file mode 100644
index 0000000..ceb5533
--- /dev/null
+++ b/app/web/Install/Templates/DistRoutes.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+return [
+    '.*?/about'        => 'FrontController:aboutView',
+    '.*?/imprint'      => 'FrontController:imprintView',
+    '.*?/terms'        => 'FrontController:termsView',
+    '.*?/privacy'      => 'FrontController:privacyView',
+    '.*?/contact'      => 'FrontController:contactView',
+
+    '^/*$'             => 'FrontController:frontView',
+    '.*?/login'        => 'FrontController:loginView',
+
+    '.*?/api/download' => 'ApiController:downloadView',
+];
diff --git a/app/web/Install/Templates/ORMRoutes.php b/app/web/Install/Templates/ORMRoutes.php
new file mode 100644
index 0000000..ceb5533
--- /dev/null
+++ b/app/web/Install/Templates/ORMRoutes.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+return [
+    '.*?/about'        => 'FrontController:aboutView',
+    '.*?/imprint'      => 'FrontController:imprintView',
+    '.*?/terms'        => 'FrontController:termsView',
+    '.*?/privacy'      => 'FrontController:privacyView',
+    '.*?/contact'      => 'FrontController:contactView',
+
+    '^/*$'             => 'FrontController:frontView',
+    '.*?/login'        => 'FrontController:loginView',
+
+    '.*?/api/download' => 'ApiController:downloadView',
+];
diff --git a/app/web/Install/Templates/config.tpl.php b/app/web/Install/Templates/config.tpl.php
index 6fd0f19..9612b9e 100755
--- a/app/web/Install/Templates/config.tpl.php
+++ b/app/web/Install/Templates/config.tpl.php
@@ -137,33 +137,23 @@ return [
     'page'     => [
         'root'  => '${subdir}',
         'https' => false,
+        'type' => '${pageType}',
     ],
     'app'      => [
         'path'    => __DIR__,
         'default' => [
-            'app'   => 'Backend',
-            'id'    => 'backend',
+            'app'   => '${defaultApp}',
+            'id'    => '${defaultAppLower}',
             'lang'  => 'en',
-            'theme' => 'Backend',
-            'org'   => ${defaultOrg},
         ],
         'domains' => [
             '${tld}' => [
-                'app'   => 'Backend',
-                'id'    => 'backend',
+                'app'   => '${defaultApp}',
+                'id'    => '${defaultAppLower}',
                 'lang'  => 'en',
-                'theme' => 'Backend',
-                'org'   => ${tldOrg},
             ],
         ],
     ],
-    'socket'   => [
-        'master' => [
-            'host'  => '${tld}',
-            'limit' => 300,
-            'port'  => 4310,
-        ],
-    ],
     'language' => [
         'en', 'de', 'it',
     ],
diff --git a/app/web/Install/WebApplication.php b/app/web/Install/WebApplication.php
new file mode 100755
index 0000000..0e1fc3f
--- /dev/null
+++ b/app/web/Install/WebApplication.php
@@ -0,0 +1,193 @@
+<?php
+
+/**
+ * Karaka
+ *
+ * PHP Version 8.1
+ *
+ * @package   Install
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://karaka.app
+ */
+
+declare(strict_types=1);
+
+namespace Install;
+
+use phpOMS\DataStorage\Database\DatabaseStatus;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
+use phpOMS\Dispatcher\Dispatcher;
+use phpOMS\Localization\ISO639x1Enum;
+use phpOMS\Localization\Localization;
+use phpOMS\Log\FileLogger;
+use phpOMS\Message\Http\HttpRequest;
+use phpOMS\Message\Http\HttpResponse;
+use phpOMS\Message\Http\RequestStatusCode;
+use phpOMS\Router\RouteVerb;
+use phpOMS\Router\WebRouter;
+use phpOMS\System\MimeType;
+use phpOMS\Uri\UriFactory;
+use phpOMS\Views\View;
+
+final class WebApplication extends InstallAbstract
+{
+    public function __construct()
+    {
+        $this->setupHandlers();
+
+        if (!\is_dir(__DIR__ . '/../Logs')) {
+            \mkdir(__DIR__ . '/../Logs');
+        }
+
+        $this->logger = FileLogger::getInstance(__DIR__ . '/../Logs', false);
+        $request      = $this->initRequest();
+        $response     = $this->initResponse($request, ['en', 'de']);
+
+        UriFactory::setupUriBuilder($request->uri);
+
+        $this->run($request, $response);
+
+        $response->header->push();
+        echo $response->getBody();
+    }
+
+    private function initRequest() : HttpRequest
+    {
+        $request = HttpRequest::createFromSuperglobals();
+
+        $rootPath = $request->uri->getPath();
+        $offset   = \strripos($rootPath, '/');
+        $rootPath = \substr($rootPath, -$offset);
+
+        $subDirDepth = \substr_count($rootPath, '/');
+
+        $request->createRequestHashs($subDirDepth);
+        $request->uri->setRootPath($rootPath);
+        UriFactory::setupUriBuilder($request->uri);
+
+        $langCode = \strtolower($request->uri->getPathElement(0));
+        $request->header->l11n->setLanguage(
+            empty($langCode) || !ISO639x1Enum::isValidValue($langCode) ? 'en' : $langCode
+        );
+        UriFactory::setQuery('/lang', $request->getLanguage());
+
+        return $request;
+    }
+
+    private function initResponse(HttpRequest $request, array $languages) : HttpResponse
+    {
+        $response = new HttpResponse(new Localization());
+        $response->header->set('content-type', 'text/html; charset=utf-8');
+        $response->header->set('x-xss-protection', '1; mode=block');
+        $response->header->set('x-content-type-options', 'nosniff');
+        $response->header->set('x-frame-options', 'SAMEORIGIN');
+        $response->header->set('referrer-policy', 'same-origin');
+
+        if ($request->isHttps()) {
+            $response->header->set('strict-transport-security', 'max-age=31536000');
+        }
+
+        $response->header->l11n->setLanguage(
+            !\in_array($request->getLanguage(), $languages) ? 'en' : $request->getLanguage()
+        );
+
+        return $response;
+    }
+
+    private function run(HttpRequest $request, HttpResponse $response) : void
+    {
+        $this->dispatcher = new Dispatcher($this);
+        $this->router     = new WebRouter();
+
+        $this->setupRoutes();
+        $response->header->set('content-language', $response->getLanguage(), true);
+        UriFactory::setQuery('/lang', $response->getLanguage());
+
+        $this->dispatcher->dispatch(
+            $this->router->route(
+                $request->uri->getRoute(),
+                $request->getData('CSRF'),
+                $request->getRouteVerb()
+            ),
+            $request,
+            $response
+        );
+    }
+
+    private function setupRoutes() : void
+    {
+        $this->router->add('^.*', '\Install\WebApplication::installView', RouteVerb::GET);
+        $this->router->add('^.*', '\Install\WebApplication::installRequest', RouteVerb::PUT);
+    }
+
+    public static function installView(HttpRequest $request, HttpResponse $response) : void
+    {
+        $view = new View(null, $request, $response);
+        $view->setTemplate('/Install/index');
+        $response->set('Content', $view);
+    }
+
+    public static function installRequest(HttpRequest $request, HttpResponse $response) : void
+    {
+        $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
+
+        if (!empty(self::validateRequest($request))) {
+            $response->header->status = RequestStatusCode::R_400;
+            return;
+        }
+
+        $db = self::setupDatabaseConnection($request);
+        $db->connect();
+
+        if ($db->getStatus() !== DatabaseStatus::OK) {
+            $response->header->status = RequestStatusCode::R_400;
+            return;
+        }
+
+        DataMapperFactory::db($db);
+
+        self::clearOld();
+        self::installConfigFile($request);
+        self::installCore($db);
+        self::installGroups($db);
+        self::installUsers($request, $db);
+        self::installApplications($request, $db);
+
+        $response->header->status = RequestStatusCode::R_200;
+    }
+
+    private static function validateRequest(HttpRequest $request) : array
+    {
+        $valid = [];
+
+        if (($valid['php_extensions'] = !self::hasPhpExtensions())
+            || ($valid['iDbHost'] = empty($request->getData('dbhost')))
+            || ($valid['iDbType'] = empty($request->getData('dbtype')))
+            || ($valid['iDbPort'] = empty($request->getData('dbport')))
+            || ($valid['iDbName'] = empty($request->getData('dbname')))
+            || ($valid['iSchemaUser'] = empty($request->getData('schemauser')))
+            //|| ($valid['iSchemaPassword'] = empty($request->getData('schemapassword')))
+            || ($valid['iCreateUser'] = empty($request->getData('createuser')))
+            //|| ($valid['iCreatePassword'] = empty($request->getData('createpassword')))
+            || ($valid['iSelectUser'] = empty($request->getData('selectuser')))
+            //|| ($valid['iSelectPassword'] = empty($request->getData('selectpassword')))
+            || ($valid['iDeleteUser'] = empty($request->getData('deleteuser')))
+            //|| ($valid['iDeletePassword'] = empty($request->getData('deletepassword')))
+            || ($valid['iDbName'] = !self::testDbConnection($request))
+            || ($valid['iInstallType'] = empty($request->getData('installtype')))
+            || ($valid['iOrgName'] = empty($request->getData('orgname')))
+            || ($valid['iAdminName'] = empty($request->getData('adminname')))
+            //|| ($valid['iAdminPassword'] = empty($request->getData('adminpassword')))
+            || ($valid['iAdminEmail'] = empty($request->getData('adminemail')))
+            || ($valid['iDomain'] = empty($request->getData('domain')))
+            || ($valid['iWebSubdir'] = empty($request->getData('websubdir')))
+            || ($valid['iDefaultLang'] = empty($request->getData('defaultlang')))
+        ) {
+            return $valid;
+        }
+
+        return [];
+    }
+}
diff --git a/app/web/Install/config.json b/app/web/Install/config.json
deleted file mode 100644
index 0e0dcd2..0000000
--- a/app/web/Install/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-
-}
\ No newline at end of file
diff --git a/app/web/Install/db.sqlite b/app/web/Install/db.sqlite
old mode 100644
new mode 100755
diff --git a/app/web/Install/index.php b/app/web/Install/index.php
index bc9768d..198145e 100755
--- a/app/web/Install/index.php
+++ b/app/web/Install/index.php
@@ -17,10 +17,9 @@ declare(strict_types=1);
 
 //<editor-fold desc="Require/Include">
 require_once __DIR__ . '/../phpOMS/Autoloader.php';
-$config = require_once __DIR__ . '/../config.php';
 //</editor-fold>
 
-$App = new \Install\WebApplication($config);
+$App = new \Install\WebApplication();
 
 if (\ob_get_level() > 0) {
     \ob_end_flush();
diff --git a/app/web/Install/index.tpl.php b/app/web/Install/index.tpl.php
index 0ddac94..2894275 100755
--- a/app/web/Install/index.tpl.php
+++ b/app/web/Install/index.tpl.php
@@ -27,18 +27,12 @@ declare(strict_types=1);
             <img alt="Logo" src="img/logo.png" class="logo" width="50">
             <h1>Welcome</h1>
             <div>
-                <p>Karaka is a WebApp written in PHP and JavaScript supporting various database
-                and caching technologies. Many modules/extensions provide functionality for businesses,
-                education facilities, healthcare facilities and organizations in general.<p>
+                <p>The Online Resource Watcher allows you to watch online resources such as websites, PDFs etc. for changes and receive an email if the resource changes. It's also possible to watch local resources which can be helpful for monitoring file changes on shared files and drives in a company network.<p>
 
                 <p>In the following pages you'll be guided through the installation process for the WebApp.
                 Most of the customization can be done after installation such as configuring localization,
                 installing additional modules, creating organization etc.</p>
 
-                <p>In case you don't want to use this web installation tool you can also use the console
-                installation tool. Just navigate in your shell to the install directory and then into
-                Console the subdirectory. There you simply run the install script and are good to go.</p>
-
                 <p>In case you encounter any problems during the installation process please feel free to
                 ask for help on our website or contact our support email at
                 <strong>test.email@karaka.de</strong></p>
@@ -88,7 +82,7 @@ declare(strict_types=1);
                 features. All critical elements must be fixed before you can continue with the installation.</p>
 
                 <p>For help please check our <a href="https://karaka.app">Installation Guide</a>.</p>
-                <?php $isOK = \version_compare('8.0.0', \PHP_VERSION) < 1 && \extension_loaded('pdo'); ?>
+                <?php $isOK = \version_compare('8.1.0', \PHP_VERSION) < 1 && \extension_loaded('pdo'); ?>
                 <table>
                     <thead>
                         <tr>
@@ -98,16 +92,15 @@ declare(strict_types=1);
                             <th>Your Environment
                     <tbody>
                         <tr>
-                            <td class="<?= \version_compare('8.0.0', \PHP_VERSION) < 1 ? 'OK' : 'FAILED'; ?>"><?= \version_compare('8.0.0', \PHP_VERSION) < 1 ? 'OK' : 'FAILED'; ?>
+                            <td class="<?= \version_compare('8.1.0', \PHP_VERSION) < 1 ? 'OK' : 'FAILED'; ?>"><?= \version_compare('8.1.0', \PHP_VERSION) < 1 ? 'OK' : 'FAILED'; ?>
                             <td>Critcal
-                            <td>PHP version >= 8.0.0
+                            <td>PHP version >= 8.1.0
                             <td><?= \PHP_VERSION; ?>
                         <tr>
                             <td class="<?= ($filePerm = \is_writable(__DIR__ . '/../Install')
-                                && \is_writable(__DIR__ . '/../Modules')
-                                && \is_writable(__DIR__ . '/../Modules/Media/Files')
-                                && \is_writable(__DIR__ . '/../Web')
-                                && \is_writable(__DIR__ . '/../Console')) ? 'OK' : 'FAILED'; ?>">
+                                && \is_writable(__DIR__ . '/../../server')
+                                && \is_writable(__DIR__ . '/../../server/data')
+                                && \is_writable(__DIR__ . '/../')) ? 'OK' : 'FAILED'; ?>">
                                 <?= $filePerm ? 'OK' : 'FAILED'; ?>
                             <td>Critcal
                             <td><strong>File permissions <?php if ($filePerm) : ?><?php else : ?>(<span class="FAILED">write permissions required!</span>)<?php endif; ?></strong>
@@ -115,28 +108,18 @@ declare(strict_types=1);
                         <tr>
                             <td>
                             <td>Critcal
-                            <td>/Install
+                            <td>./
+                            <td class="<?= \is_writable(__DIR__ . '/../') ? 'OK' : 'FAILED'; ?>"><?= \decoct(\fileperms(__DIR__ . '/../') & 0777); ?>
+                        <tr>
+                            <td>
+                            <td>Critcal
+                            <td>./Install
                             <td class="<?= \is_writable(__DIR__ . '/../Install') ? 'OK' : 'FAILED'; ?>"><?= \decoct(\fileperms(__DIR__ . '/../Install') & 0777); ?>
                         <tr>
                             <td>
                             <td>Critcal
-                            <td>/Modules
-                            <td class="<?= \is_writable(__DIR__ . '/../Modules') ? 'OK' : 'FAILED'; ?>"><?= \decoct(\fileperms(__DIR__ . '/../Modules') & 0777); ?>
-                        <tr>
-                            <td>
-                            <td>Critcal
-                            <td>/Modules
-                            <td class="<?= \is_writable(__DIR__ . '/../Modules/Media/Files') ? 'OK' : 'FAILED'; ?>"><?= \decoct(\fileperms(__DIR__ . '/../Modules/Media/Files') & 0777); ?>
-                        <tr>
-                            <td>
-                            <td>Critcal
-                            <td>/Web
-                            <td class="<?= \is_writable(__DIR__ . '/../Web') ? 'OK' : 'FAILED'; ?>"><?= \decoct(\fileperms(__DIR__ . '/../Web') & 0777); ?>
-                        <tr>
-                            <td>
-                            <td>Critcal
-                            <td>/Console
-                            <td class="<?= \is_writable(__DIR__ . '/../Console') ? 'OK' : 'FAILED'; ?>"><?= \decoct(\fileperms(__DIR__ . '/../Console') & 0777); ?>
+                            <td>./../../server
+                            <td class="<?= \is_writable(__DIR__ . '/../../server') ? 'OK' : 'FAILED'; ?>"><?= \decoct(\fileperms(__DIR__ . '/../../server') & 0777); ?>
                         <tr>
                             <td class="<?= \extension_loaded('pdo') ? 'OK' : 'FAILED'; ?>"><?= \extension_loaded('pdo') ? 'OK' : 'FAILED'; ?>
                             <td>Critcal
@@ -215,14 +198,12 @@ declare(strict_types=1);
                         <li><label for="iDbType">Type</label>
                         <li><select id="iDbType" name="dbtype">
                                 <option value="mysql" selected>MySQL
-                                <option value="postgresql">PostgreSQL
-                                <option value="mssql">MSSQL
                             </select>
                         <li><label for="iDbPort">Port</label>
                         <li><input id="iDbPort" name="dbport" type="number" value="3306" required>
                         <li><label for="iDbName">Database</label>
                         <li><strong class="FAILED">Please make sure that you have created this database. Please also make sure that this database is empty!</strong>
-                        <li><input id="iDbName" name="dbname" type="text" value="oms" required>
+                        <li><input id="iDbName" name="dbname" type="text" value="oms_orw" required>
                     </ul>
                 </form>
 
@@ -300,6 +281,11 @@ declare(strict_types=1);
             <div>
                 <p>The following configuration options are general WebApp settings.</p>
                 <ul>
+                    <li><label for="iInstallType">Installation Type</label>
+                    <li><select id="iInstallType" name="installtype" form="installForm" required>
+                            <option value="oem" selected>OEM
+                            <option value="dist">Distributor
+                        </select>
                     <li><label for="iOrgName">Organization Name</label>
                     <li><input id="iOrgName" name="orgname" type="text" value="Karaka" form="installForm" required>
                     <li><label for="iAdminName">Admin Login</label>
diff --git a/app/web/Models/Account.php b/app/web/Models/Account.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/AccountCredentialMapper.php b/app/web/Models/AccountCredentialMapper.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/AccountMapper.php b/app/web/Models/AccountMapper.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/AccountPermission.php b/app/web/Models/AccountPermission.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/AccountPermissionMapper.php b/app/web/Models/AccountPermissionMapper.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/GroupPermission.php b/app/web/Models/GroupPermission.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/GroupPermissionMapper.php b/app/web/Models/GroupPermissionMapper.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/LocalizationMapper.php b/app/web/Models/LocalizationMapper.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/NullAccount.php b/app/web/Models/NullAccount.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/PermissionCategory.php b/app/web/Models/PermissionCategory.php
old mode 100644
new mode 100755
diff --git a/app/web/Models/SettingsEnum.php b/app/web/Models/SettingsEnum.php
old mode 100644
new mode 100755
diff --git a/app/web/Resources b/app/web/Resources
index 8caf616..7555fe8 160000
--- a/app/web/Resources
+++ b/app/web/Resources
@@ -1 +1 @@
-Subproject commit 8caf616b7d25355ab14768c242a1b5d57bfc2f94
+Subproject commit 7555fe814f03d567fb04ada35535817727382ed4
diff --git a/app/web/Routes.php b/app/web/Routes.php
old mode 100644
new mode 100755
diff --git a/app/web/WebApplication.php b/app/web/WebApplication.php
old mode 100644
new mode 100755
index 6c0df97..1bf15f1
--- a/app/web/WebApplication.php
+++ b/app/web/WebApplication.php
@@ -25,6 +25,7 @@ class WebApplication extends ApplicationAbstract
             $this->logger = FileLogger::getInstance($config['log']['file']['path'], false);
 
             UriFactory::setQuery('/prefix', '');
+            UriFactory::setQuery('/backend', 'backend/');
             UriFactory::setQuery('/api', 'api/');
             $applicationName = $this->getApplicationName(HttpUri::fromCurrent(), $config['app'], $config['page']['root']);
             $request         = $this->initRequest($config['page']['root'], $config['app']);
diff --git a/app/web/cssOMS b/app/web/cssOMS
index a4c1e7e..5d64c8c 160000
--- a/app/web/cssOMS
+++ b/app/web/cssOMS
@@ -1 +1 @@
-Subproject commit a4c1e7e8b2def04fb761027de2d8473cbe38850b
+Subproject commit 5d64c8c66010e6c58647d8d5439083b52690933d
diff --git a/app/web/humans.txt b/app/web/humans.txt
old mode 100644
new mode 100755
diff --git a/app/web/index.php b/app/web/index.php
old mode 100644
new mode 100755
diff --git a/app/web/jsOMS b/app/web/jsOMS
index e3aef73..ddb28a7 160000
--- a/app/web/jsOMS
+++ b/app/web/jsOMS
@@ -1 +1 @@
-Subproject commit e3aef7338ab615b8520f4fcbe82572fbf71b0934
+Subproject commit ddb28a71425c3d94d6f6fa09b6f696f9eae33fb4
diff --git a/app/web/phpOMS b/app/web/phpOMS
index d631e4c..bc3b915 160000
--- a/app/web/phpOMS
+++ b/app/web/phpOMS
@@ -1 +1 @@
-Subproject commit d631e4ce622bf1bd3dc2130efab4570005b5cfb6
+Subproject commit bc3b9154e9ac0097efbcd4aa97f103ae518409b9
diff --git a/app/web/robots.txt b/app/web/robots.txt
old mode 100644
new mode 100755
diff --git a/app/web/tpl/backend/bill-list.tpl.php b/app/web/tpl/backend/bill-list.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/bill-profile.tpl.php b/app/web/tpl/backend/bill-profile.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/dashboard.tpl.php b/app/web/tpl/backend/dashboard.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/global-bill-list.tpl.php b/app/web/tpl/backend/global-bill-list.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/global-dashboard.tpl.php b/app/web/tpl/backend/global-dashboard.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/global-org-list.tpl.php b/app/web/tpl/backend/global-org-list.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/global-user-list.tpl.php b/app/web/tpl/backend/global-user-list.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/org-settings.tpl.php b/app/web/tpl/backend/org-settings.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/org-user-list.tpl.php b/app/web/tpl/backend/org-user-list.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/password-forgot.tpl.php b/app/web/tpl/backend/password-forgot.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/password-reset.tpl.php b/app/web/tpl/backend/password-reset.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/register.tpl.php b/app/web/tpl/backend/register.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/resource-list.tpl.php b/app/web/tpl/backend/resource-list.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/backend/resource-profile.tpl.php b/app/web/tpl/backend/resource-profile.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/landing/footer.tpl.php b/app/web/tpl/landing/footer.tpl.php
deleted file mode 100644
index 4776699..0000000
--- a/app/web/tpl/landing/footer.tpl.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<footer>
-    <div class="floater">
-    </div>
-</footer>
\ No newline at end of file
diff --git a/app/web/tpl/landing/header.tpl.php b/app/web/tpl/landing/header.tpl.php
deleted file mode 100644
index 2c5dc01..0000000
--- a/app/web/tpl/landing/header.tpl.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<nav id="navTop">
-    <div class="floater">
-        <ul id="navMain">
-            <li><?= $this->lang['Home']; ?></li>
-            <li><?= $this->lang['Pricing']; ?></li>
-            <li><?= $this->lang['Components']; ?></li>
-        </ul>
-
-        <ul id="navSecondary">
-            <li id="navEleLanguage">...</li>
-            <li id="navEleLogin"><?= $this->lang['LogIn']; ?></li>
-            <li id="navEleSignUp"><?= $this->lang['SignUp']; ?></li>
-        </ul>
-    </div>
-</nav>
\ No newline at end of file
diff --git a/app/web/tpl/landing/landing.de.tpl.php b/app/web/tpl/landing/landing.de.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/landing/landing.en.tpl.php b/app/web/tpl/landing/landing.en.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/landing/pricing.de.tpl.php b/app/web/tpl/landing/pricing.de.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/tpl/landing/pricing.en.tpl.php b/app/web/tpl/landing/pricing.en.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/app/web/lang/en.lang.php b/setup/README.md
similarity index 100%
rename from app/web/lang/en.lang.php
rename to setup/README.md
diff --git a/setup/config.sh b/setup/config.sh
new file mode 100644
index 0000000..23dfd1f
--- /dev/null
+++ b/setup/config.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Paths
+BASE_PATH="/var/www/html"
+ROOT_PATH="/var/www/html/OnlineResourceWatcherApp"
+
+# Web
+WEB_URL="http://karaka.de"
+MAIL_ADDR=""
+
+# Authentications
+DB_USER="root"
+DB_PASSWORD="root"
+
+DATE=$(date +%Y-%m-%d)
+VERSION_HASH=${DATE}
diff --git a/setup/demoSetup.php b/setup/demoSetup.php
new file mode 100644
index 0000000..bbc0bb5
--- /dev/null
+++ b/setup/demoSetup.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Karaka
+ *
+ * PHP Version 8.1
+ *
+ * @package   Karaka
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://karaka.app
+ */
+declare(strict_types=1);
+
+\ini_set('memory_limit', '2048M');
+\ini_set('display_errors', '1');
+\ini_set('display_startup_errors', '1');
+\error_reporting(\E_ALL);
+
+// For seeded test environment
+
+require_once __DIR__ . '/../app/web/phpOMS/Autoloader.php';
+
+/**
+ * This script is usefull when you want to manually install the app without resetting an old database/app or new empty database.
+ */
+
diff --git a/setup/setup.sh b/setup/setup.sh
new file mode 100755
index 0000000..f6328fe
--- /dev/null
+++ b/setup/setup.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+. config.sh
+
+echo "#################################################"
+echo "Remove old setup"
+echo "#################################################"
+#rm -r -f ${ROOT_PATH}/app/server/data
+#mkdir -p ${ROOT_PATH}/app/server/data
+
+echo "#################################################"
+echo "Setup database"
+echo "#################################################"
+mysql -e 'drop database if exists oms_orw;' -u ${DB_USER} --password="${DB_PASSWORD}"
+mysql -e 'create database oms_orw;' -u ${DB_USER} --password="${DB_PASSWORD}"
+
+echo "#################################################"
+echo "Setup demo application"
+echo "#################################################"
+php demoSetup.php
\ No newline at end of file