diff --git a/.htaccess b/.htaccess
index a9c317a..8f8fde7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -9,7 +9,7 @@ RewriteRule ^(api(/.*)?)$ /index.php?api=$1 [L,QSA]
 
 RewriteEngine On
 RewriteOptions AllowNoSlash
-RewriteRule ^((\.idea|\.git|src|test|core|docker|files)(/.*)?)$ /index.php?site=$1 [L,QSA]
+RewriteRule ^((\.idea|\.git|src|test|Site|Core|docker|files)(/.*)?)$ /index.php?site=$1 [L,QSA]
 
 FallbackResource /index.php
 
diff --git a/core/Api/ApiKeyAPI.class.php b/Core/API/ApiKeyAPI.class.php
similarity index 93%
rename from core/Api/ApiKeyAPI.class.php
rename to Core/API/ApiKeyAPI.class.php
index 852695f..99d7676 100644
--- a/core/Api/ApiKeyAPI.class.php
+++ b/Core/API/ApiKeyAPI.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Driver\SQL\Condition\Compare;
-  use Objects\Context;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Objects\Context;
 
   abstract class ApiKeyAPI extends Request {
 
@@ -33,14 +33,14 @@ namespace Api {
   }
 }
 
-namespace Api\ApiKey {
+namespace Core\API\ApiKey {
 
-  use Api\ApiKeyAPI;
-  use Api\Parameter\Parameter;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondAnd;
-  use Objects\Context;
-  use Objects\DatabaseEntity\ApiKey;
+  use Core\API\ApiKeyAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondAnd;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\ApiKey;
 
   class Create extends ApiKeyAPI {
 
diff --git a/core/Api/ContactAPI.class.php b/Core/API/ContactAPI.class.php
similarity index 94%
rename from core/Api/ContactAPI.class.php
rename to Core/API/ContactAPI.class.php
index e60a00d..59d863a 100644
--- a/core/Api/ContactAPI.class.php
+++ b/Core/API/ContactAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class ContactAPI extends Request {
 
@@ -15,7 +15,7 @@ namespace Api {
     }
 
     protected function sendMail(string $name, ?string $fromEmail, string $subject, string $message, ?string $to = null): bool {
-      $request = new \Api\Mail\Send($this->context);
+      $request = new \Core\API\Mail\Send($this->context);
       $this->success = $request->execute(array(
         "subject" => $subject,
         "body" => $message,
@@ -34,17 +34,17 @@ namespace Api {
   }
 }
 
-namespace Api\Contact {
+namespace Core\API\Contact {
 
-  use Api\ContactAPI;
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Api\VerifyCaptcha;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondNot;
-  use Driver\SQL\Expression\CaseWhen;
-  use Driver\SQL\Expression\Sum;
-  use Objects\Context;
+  use Core\API\ContactAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\API\VerifyCaptcha;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondNot;
+  use Core\Driver\SQL\Expression\CaseWhen;
+  use Core\Driver\SQL\Expression\Sum;
+  use Core\Objects\Context;
 
   class Request extends ContactAPI {
 
diff --git a/core/Api/GroupsAPI.class.php b/Core/API/GroupsAPI.class.php
similarity index 94%
rename from core/Api/GroupsAPI.class.php
rename to Core/API/GroupsAPI.class.php
index cefc7f3..7823482 100644
--- a/core/Api/GroupsAPI.class.php
+++ b/Core/API/GroupsAPI.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Driver\SQL\Condition\Compare;
-  use Objects\Context;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Objects\Context;
 
   abstract class GroupsAPI extends Request {
 
@@ -25,13 +25,13 @@ namespace Api {
   }
 }
 
-namespace Api\Groups {
+namespace Core\API\Groups {
 
-  use Api\GroupsAPI;
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Objects\Context;
-  use Objects\DatabaseEntity\Group;
+  use Core\API\GroupsAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\Group;
 
   class Fetch extends GroupsAPI {
 
diff --git a/core/Api/LanguageAPI.class.php b/Core/API/LanguageAPI.class.php
similarity index 89%
rename from core/Api/LanguageAPI.class.php
rename to Core/API/LanguageAPI.class.php
index af07fd6..ea2f59b 100644
--- a/core/Api/LanguageAPI.class.php
+++ b/Core/API/LanguageAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class LanguageAPI extends Request {
     public function __construct(Context $context, bool $externalCall = false, array $params = array()) {
@@ -11,15 +11,15 @@ namespace Api {
   }
 }
 
-namespace Api\Language {
+namespace Core\API\Language {
 
-  use Api\LanguageAPI;
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondOr;
-  use Objects\Context;
-  use Objects\DatabaseEntity\Language;
+  use Core\API\LanguageAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondOr;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\Language;
 
   class Get extends LanguageAPI {
 
diff --git a/core/Api/LogsAPI.class.php b/Core/API/LogsAPI.class.php
similarity index 89%
rename from core/Api/LogsAPI.class.php
rename to Core/API/LogsAPI.class.php
index 21df92b..afa05a2 100644
--- a/core/Api/LogsAPI.class.php
+++ b/Core/API/LogsAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class LogsAPI extends Request {
     public function __construct(Context $context, bool $externalCall = false, array $params = array()) {
@@ -12,17 +12,17 @@ namespace Api {
 
 }
 
-namespace Api\Logs {
+namespace Core\API\Logs {
 
-  use Api\LogsAPI;
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Driver\Logger\Logger;
-  use Driver\SQL\Column\Column;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondIn;
-  use Objects\Context;
-  use Objects\DatabaseEntity\SystemLog;
+  use Core\API\LogsAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\Driver\Logger\Logger;
+  use Core\Driver\SQL\Column\Column;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondIn;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\SystemLog;
 
   class Get extends LogsAPI {
 
@@ -82,7 +82,7 @@ namespace Api\Logs {
       }
 
       // get all log entries from filesystem (if database failed)
-      $logPath = realpath(implode(DIRECTORY_SEPARATOR, [WEBROOT, "core", "Logs"]));
+      $logPath = realpath(implode(DIRECTORY_SEPARATOR, [WEBROOT, "Core", "Logs"]));
       if ($logPath) {
         $index = 1;
         foreach (scandir($logPath) as $fileName) {
diff --git a/core/Api/MailAPI.class.php b/Core/API/MailAPI.class.php
similarity index 94%
rename from core/Api/MailAPI.class.php
rename to Core/API/MailAPI.class.php
index 222f2f5..79d3476 100644
--- a/core/Api/MailAPI.class.php
+++ b/Core/API/MailAPI.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\ConnectionData;
-  use Objects\Context;
+  use Core\Objects\ConnectionData;
+  use Core\Objects\Context;
 
   abstract class MailAPI extends Request {
 
@@ -12,7 +12,7 @@ namespace Api {
     }
 
     protected function getMailConfig(): ?ConnectionData {
-      $req = new \Api\Settings\Get($this->context);
+      $req = new \Core\API\Settings\Get($this->context);
       $this->success = $req->execute(array("key" => "^mail_"));
       $this->lastError = $req->getLastError();
 
@@ -40,19 +40,19 @@ namespace Api {
   }
 }
 
-namespace Api\Mail {
+namespace Core\API\Mail {
 
-  use Api\MailAPI;
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
+  use Core\API\MailAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
   use DateTimeInterface;
-  use Driver\SQL\Column\Column;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondIn;
-  use External\PHPMailer\Exception;
-  use External\PHPMailer\PHPMailer;
-  use Objects\Context;
-  use Objects\DatabaseEntity\GpgKey;
+  use Core\Driver\SQL\Column\Column;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondIn;
+  use Core\External\PHPMailer\Exception;
+  use Core\External\PHPMailer\PHPMailer;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\GpgKey;
 
   class Test extends MailAPI {
 
@@ -66,7 +66,7 @@ namespace Api\Mail {
     public function _execute(): bool {
 
       $receiver = $this->getParam("receiver");
-      $req = new \Api\Mail\Send($this->context);
+      $req = new \Core\API\Mail\Send($this->context);
       $this->success = $req->execute(array(
         "to" => $receiver,
         "subject" => "Test E-Mail",
diff --git a/core/Api/NewsAPI.class.php b/Core/API/NewsAPI.class.php
similarity index 94%
rename from core/Api/NewsAPI.class.php
rename to Core/API/NewsAPI.class.php
index 830681f..9d889fd 100644
--- a/core/Api/NewsAPI.class.php
+++ b/Core/API/NewsAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class NewsAPI extends Request {
     public function __construct(Context $context, bool $externalCall = false, array $params = array()) {
@@ -12,14 +12,14 @@ namespace Api {
   }
 }
 
-namespace Api\News {
+namespace Core\API\News {
 
-  use Api\NewsAPI;
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Driver\SQL\Condition\Compare;
-  use Objects\Context;
-  use Objects\DatabaseEntity\News;
+  use Core\API\NewsAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\News;
 
   class Get extends NewsAPI {
 
diff --git a/core/Api/NotificationsAPI.class.php b/Core/API/NotificationsAPI.class.php
similarity index 93%
rename from core/Api/NotificationsAPI.class.php
rename to Core/API/NotificationsAPI.class.php
index 73f31b0..4135401 100644
--- a/core/Api/NotificationsAPI.class.php
+++ b/Core/API/NotificationsAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class NotificationsAPI extends Request {
     public function __construct(Context $context, bool $externalCall = false, array $params = array()) {
@@ -11,19 +11,19 @@ namespace Api {
   }
 }
 
-namespace Api\Notifications {
+namespace Core\API\Notifications {
 
-  use Api\NotificationsAPI;
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Driver\SQL\Column\Column;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondIn;
-  use Driver\SQL\Query\Select;
-  use Objects\Context;
-  use Objects\DatabaseEntity\Group;
-  use Objects\DatabaseEntity\Notification;
-  use Objects\DatabaseEntity\User;
+  use Core\API\NotificationsAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\Driver\SQL\Column\Column;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondIn;
+  use Core\Driver\SQL\Query\Select;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\Group;
+  use Core\Objects\DatabaseEntity\Notification;
+  use Core\Objects\DatabaseEntity\User;
 
   class Create extends NotificationsAPI {
 
diff --git a/core/Api/Parameter/ArrayType.class.php b/Core/API/Parameter/ArrayType.class.php
similarity index 98%
rename from core/Api/Parameter/ArrayType.class.php
rename to Core/API/Parameter/ArrayType.class.php
index 7e0e1ff..133ca4f 100644
--- a/core/Api/Parameter/ArrayType.class.php
+++ b/Core/API/Parameter/ArrayType.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api\Parameter;
+namespace Core\API\Parameter;
 
 class ArrayType extends Parameter {
 
diff --git a/core/Api/Parameter/Parameter.class.php b/Core/API/Parameter/Parameter.class.php
similarity index 99%
rename from core/Api/Parameter/Parameter.class.php
rename to Core/API/Parameter/Parameter.class.php
index 167322e..a4ba667 100644
--- a/core/Api/Parameter/Parameter.class.php
+++ b/Core/API/Parameter/Parameter.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api\Parameter;
+namespace Core\API\Parameter;
 
 use DateTime;
 
diff --git a/core/Api/Parameter/StringType.class.php b/Core/API/Parameter/StringType.class.php
similarity index 96%
rename from core/Api/Parameter/StringType.class.php
rename to Core/API/Parameter/StringType.class.php
index 4bca3f0..2d4188a 100644
--- a/core/Api/Parameter/StringType.class.php
+++ b/Core/API/Parameter/StringType.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api\Parameter;
+namespace Core\API\Parameter;
 
 class StringType extends Parameter {
 
diff --git a/core/Api/PermissionAPI.class.php b/Core/API/PermissionAPI.class.php
similarity index 91%
rename from core/Api/PermissionAPI.class.php
rename to Core/API/PermissionAPI.class.php
index 4a024e0..6821bb1 100644
--- a/core/Api/PermissionAPI.class.php
+++ b/Core/API/PermissionAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class PermissionAPI extends Request {
 
@@ -21,20 +21,20 @@ namespace Api {
   }
 }
 
-namespace Api\Permission {
+namespace Core\API\Permission {
 
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Api\PermissionAPI;
-  use Driver\SQL\Column\Column;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondIn;
-  use Driver\SQL\Condition\CondLike;
-  use Driver\SQL\Condition\CondNot;
-  use Driver\SQL\Strategy\UpdateStrategy;
-  use Objects\Context;
-  use Objects\DatabaseEntity\Group;
-  use Objects\DatabaseEntity\User;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\API\PermissionAPI;
+  use Core\Driver\SQL\Column\Column;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondIn;
+  use Core\Driver\SQL\Condition\CondLike;
+  use Core\Driver\SQL\Condition\CondNot;
+  use Core\Driver\SQL\Strategy\UpdateStrategy;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\Group;
+  use Core\Objects\DatabaseEntity\User;
 
   class Check extends PermissionAPI {
 
diff --git a/core/Api/Request.class.php b/Core/API/Request.class.php
similarity index 98%
rename from core/Api/Request.class.php
rename to Core/API/Request.class.php
index 32b50f1..3b6294d 100644
--- a/core/Api/Request.class.php
+++ b/Core/API/Request.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Api;
+namespace Core\API;
 
-use Driver\Logger\Logger;
-use Objects\Context;
+use Core\Driver\Logger\Logger;
+use Core\Objects\Context;
 use PhpMqtt\Client\MqttClient;
 
 /**
@@ -223,8 +223,8 @@ abstract class Request {
       }
 
       // Check for permission
-      if (!($this instanceof \Api\Permission\Save)) {
-        $req = new \Api\Permission\Check($this->context);
+      if (!($this instanceof \API\Permission\Save)) {
+        $req = new \Core\API\Permission\Check($this->context);
         $this->success = $req->execute(array("method" => $this->getMethod()));
         $this->lastError = $req->getLastError();
         if (!$this->success) {
diff --git a/core/Api/RoutesAPI.class.php b/Core/API/RoutesAPI.class.php
similarity index 95%
rename from core/Api/RoutesAPI.class.php
rename to Core/API/RoutesAPI.class.php
index f2d3093..0d63af1 100644
--- a/core/Api/RoutesAPI.class.php
+++ b/Core/API/RoutesAPI.class.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Api\Routes\GenerateCache;
-  use Driver\SQL\Condition\Compare;
-  use Objects\Context;
+  use Core\API\Routes\GenerateCache;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Objects\Context;
 
   abstract class RoutesAPI extends Request {
 
     const ACTIONS = array("redirect_temporary", "redirect_permanently", "static", "dynamic");
-    const ROUTER_CACHE_CLASS = "\\Cache\\RouterCache";
+    const ROUTER_CACHE_CLASS = "\\Core\\Cache\\RouterCache";
 
     protected string $routerCachePath;
 
@@ -61,18 +61,18 @@ namespace Api {
   }
 }
 
-namespace Api\Routes {
+namespace Core\API\Routes {
 
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Api\RoutesAPI;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondBool;
-  use Objects\Context;
-  use Objects\Router\DocumentRoute;
-  use Objects\Router\RedirectRoute;
-  use Objects\Router\Router;
-  use Objects\Router\StaticFileRoute;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\API\RoutesAPI;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondBool;
+  use Core\Objects\Context;
+  use Core\Objects\Router\DocumentRoute;
+  use Core\Objects\Router\RedirectRoute;
+  use Core\Objects\Router\Router;
+  use Core\Objects\Router\StaticFileRoute;
 
   class Fetch extends RoutesAPI {
 
diff --git a/core/Api/Search.class.php b/Core/API/Search.class.php
similarity index 87%
rename from core/Api/Search.class.php
rename to Core/API/Search.class.php
index b4ecd2b..eb4661b 100644
--- a/core/Api/Search.class.php
+++ b/Core/API/Search.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Api;
+namespace Core\API;
 
-use Api\Parameter\StringType;
-use Objects\Context;
-use Objects\Search\Searchable;
-use Objects\Search\SearchQuery;
+use Core\API\Parameter\StringType;
+use Core\Objects\Context;
+use Core\Objects\Search\Searchable;
+use Core\Objects\Search\SearchQuery;
 
 class Search extends Request {
 
diff --git a/core/Api/SettingsAPI.class.php b/Core/API/SettingsAPI.class.php
similarity index 74%
rename from core/Api/SettingsAPI.class.php
rename to Core/API/SettingsAPI.class.php
index e5d254b..b44e5f2 100644
--- a/core/Api/SettingsAPI.class.php
+++ b/Core/API/SettingsAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class SettingsAPI extends Request {
     public function __construct(Context $context, bool $externalCall = false, array $params = array()) {
@@ -11,18 +11,19 @@ namespace Api {
   }
 }
 
-namespace Api\Settings {
+namespace Core\API\Settings {
 
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Api\SettingsAPI;
-  use Driver\SQL\Column\Column;
-  use Driver\SQL\Condition\CondBool;
-  use Driver\SQL\Condition\CondIn;
-  use Driver\SQL\Condition\CondNot;
-  use Driver\SQL\Condition\CondRegex;
-  use Driver\SQL\Strategy\UpdateStrategy;
-  use Objects\Context;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\API\SettingsAPI;
+  use Core\Configuration\Settings;
+  use Core\Driver\SQL\Column\Column;
+  use Core\Driver\SQL\Condition\CondBool;
+  use Core\Driver\SQL\Condition\CondIn;
+  use Core\Driver\SQL\Condition\CondNot;
+  use Core\Driver\SQL\Condition\CondRegex;
+  use Core\Driver\SQL\Strategy\UpdateStrategy;
+  use Core\Objects\Context;
 
   class Get extends SettingsAPI {
 
@@ -161,4 +162,33 @@ namespace Api\Settings {
       return $this->success;
     }
   }
+
+  class GenerateJWT extends SettingsAPI {
+
+    public function __construct(Context $context, bool $externalCall = false) {
+      parent::__construct($context, $externalCall, [
+        "type" => new StringType("type", 32, true, "HS512")
+      ]);
+    }
+
+    protected function _execute(): bool {
+      $algorithm = $this->getParam("type");
+      if (!Settings::isJwtAlgorithmSupported($algorithm)) {
+        return $this->createError("Algorithm is not supported");
+      }
+
+      $settings = $this->context->getSettings();
+      if (!$settings->generateJwtKey($algorithm)) {
+        return $this->createError("Error generating JWT-Key: " . $settings->getLogger()->getLastMessage());
+      }
+
+      $saveRequest = $settings->saveJwtKey($this->context);
+      if (!$saveRequest->success()) {
+        return $this->createError("Error saving JWT-Key: " . $saveRequest->getLastError());
+      }
+
+      $this->result["jwt_public_key"] = $settings->getJwtPublicKey(false)?->getKeyMaterial();
+      return true;
+    }
+  }
 }
\ No newline at end of file
diff --git a/core/Api/Stats.class.php b/Core/API/Stats.class.php
similarity index 91%
rename from core/Api/Stats.class.php
rename to Core/API/Stats.class.php
index 5e18fa8..d59f819 100644
--- a/core/Api/Stats.class.php
+++ b/Core/API/Stats.class.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Api;
+namespace Core\API;
 
 use DateTime;
-use Driver\SQL\Condition\Compare;
-use Driver\SQL\Condition\CondBool;
-use Objects\Context;
-use Objects\DatabaseEntity\User;
+use Core\Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Condition\CondBool;
+use Core\Objects\Context;
+use Core\Objects\DatabaseEntity\User;
 
 class Stats extends Request {
 
@@ -38,7 +38,7 @@ class Stats extends Request {
   }
 
   private function checkSettings(): bool {
-    $req = new \Api\Settings\Get($this->context);
+    $req = new \Core\API\Settings\Get($this->context);
     $this->success = $req->execute(array("key" => "^(mail_enabled|recaptcha_enabled)$"));
     $this->lastError = $req->getLastError();
 
@@ -71,7 +71,7 @@ class Stats extends Request {
   public function _execute(): bool {
     $userCount = $this->getUserCount();
     $pageCount = $this->getPageCount();
-    $req = new \Api\Visitors\Stats($this->context);
+    $req = new \Core\API\Visitors\Stats($this->context);
     $this->success = $req->execute(array("type"=>"monthly"));
     $this->lastError = $req->getLastError();
     if (!$this->success) {
diff --git a/core/Api/Swagger.class.php b/Core/API/Swagger.class.php
similarity index 84%
rename from core/Api/Swagger.class.php
rename to Core/API/Swagger.class.php
index 3191bb7..03ccc2b 100644
--- a/core/Api/Swagger.class.php
+++ b/Core/API/Swagger.class.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Api;
+namespace Core\API;
 
-use Api\Parameter\StringType;
-use Objects\Context;
-use Objects\DatabaseEntity\User;
+use Core\API\Parameter\StringType;
+use Core\Objects\Context;
+use Core\Objects\DatabaseEntity\User;
 
 class Swagger extends Request {
 
@@ -23,25 +23,32 @@ class Swagger extends Request {
 
     // first load all direct classes
     $classes = [];
-    $basePath = realpath(WEBROOT . "/core/Api/");
-    foreach (scandir($basePath) as $fileName) {
-      $fullPath = $basePath . "/" . $fileName;
-      if (is_file($fullPath) && endsWith($fileName, ".class.php")) {
-        require_once $fullPath;
-        $apiName = explode(".", $fileName)[0];
-        $className = "\\Api\\$apiName";
-        if (!class_exists($className)) {
-          var_dump("Class not exist: $className");
-          continue;
-        }
+    $apiDirs = ["Core", "Site"];
+    foreach ($apiDirs as $apiDir) {
+      $basePath = realpath(WEBROOT . "/$apiDir/Api/");
+      if (!$basePath) {
+        continue;
+      }
 
-        $reflection = new \ReflectionClass($className);
-        if (!$reflection->isSubclassOf(Request::class) || $reflection->isAbstract()) {
-          continue;
-        }
+      foreach (scandir($basePath) as $fileName) {
+        $fullPath = $basePath . "/" . $fileName;
+        if (is_file($fullPath) && endsWith($fileName, ".class.php")) {
+          require_once $fullPath;
+          $apiName = explode(".", $fileName)[0];
+          $className = "\\API\\$apiName";
+          if (!class_exists($className)) {
+            var_dump("Class not exist: $className");
+            continue;
+          }
 
-        $endpoint = "/" . strtolower($apiName);
-        $classes[$endpoint] = $reflection;
+          $reflection = new \ReflectionClass($className);
+          if (!$reflection->isSubclassOf(Request::class) || $reflection->isAbstract()) {
+            continue;
+          }
+
+          $endpoint = "/" . strtolower($apiName);
+          $classes[$endpoint] = $reflection;
+        }
       }
     }
 
diff --git a/core/Api/TemplateAPI.class.php b/Core/API/TemplateAPI.class.php
similarity index 84%
rename from core/Api/TemplateAPI.class.php
rename to Core/API/TemplateAPI.class.php
index a13c15e..39a7edc 100644
--- a/core/Api/TemplateAPI.class.php
+++ b/Core/API/TemplateAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class TemplateAPI extends Request {
     function __construct(Context $context, bool $externalCall = false, array $params = array()) {
@@ -13,13 +13,13 @@ namespace Api {
 
 }
 
-namespace Api\Template {
+namespace Core\API\Template {
 
-  use Api\Parameter\ArrayType;
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Api\TemplateAPI;
-  use Objects\Context;
+  use Core\API\Parameter\ArrayType;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\API\TemplateAPI;
+  use Core\Objects\Context;
   use Twig\Environment;
   use Twig\Error\LoaderError;
   use Twig\Error\RuntimeError;
@@ -45,8 +45,8 @@ namespace Api\Template {
         return $this->createError("Invalid template file extension. Allowed: " . implode(",", $allowedExtensions));
       }
 
-      $templateDir = WEBROOT . "/core/Templates/";
-      $templateCache = WEBROOT . "/core/Cache/Templates/";
+      $templateDir = WEBROOT . "/Core/Templates/";
+      $templateCache = WEBROOT . "/Core/Cache/Templates/";
       $path = realpath($templateDir . $templateFile);
       if (!startsWith($path, realpath($templateDir))) {
         return $this->createError("Template file not in template directory");
diff --git a/core/Api/TfaAPI.class.php b/Core/API/TfaAPI.class.php
similarity index 95%
rename from core/Api/TfaAPI.class.php
rename to Core/API/TfaAPI.class.php
index a3a366c..a78b335 100644
--- a/core/Api/TfaAPI.class.php
+++ b/Core/API/TfaAPI.class.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
-  use Objects\TwoFactor\AuthenticationData;
-  use Objects\TwoFactor\KeyBasedTwoFactorToken;
+  use Core\Objects\Context;
+  use Core\Objects\TwoFactor\AuthenticationData;
+  use Core\Objects\TwoFactor\KeyBasedTwoFactorToken;
 
   abstract class TfaAPI extends Request {
 
@@ -54,16 +54,16 @@ namespace Api {
   }
 }
 
-namespace Api\TFA {
+namespace Core\API\TFA {
 
-  use Api\Parameter\StringType;
-  use Api\TfaAPI;
-  use Driver\SQL\Condition\Compare;
-  use Objects\Context;
-  use Objects\TwoFactor\AttestationObject;
-  use Objects\TwoFactor\AuthenticationData;
-  use Objects\TwoFactor\KeyBasedTwoFactorToken;
-  use Objects\TwoFactor\TimeBasedTwoFactorToken;
+  use Core\API\Parameter\StringType;
+  use Core\API\TfaAPI;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Objects\Context;
+  use Core\Objects\TwoFactor\AttestationObject;
+  use Core\Objects\TwoFactor\AuthenticationData;
+  use Core\Objects\TwoFactor\KeyBasedTwoFactorToken;
+  use Core\Objects\TwoFactor\TimeBasedTwoFactorToken;
 
   // General
   class Remove extends TfaAPI {
@@ -110,7 +110,7 @@ namespace Api\TFA {
       if ($this->success && $token->isConfirmed()) {
         // send an email
         $settings = $this->context->getSettings();
-        $req = new \Api\Template\Render($this->context);
+        $req = new \Core\API\Template\Render($this->context);
         $this->success = $req->execute([
           "file" => "mail/2fa_remove.twig",
           "parameters" => [
@@ -123,7 +123,7 @@ namespace Api\TFA {
         if ($this->success) {
           $body = $req->getResult()["html"];
           $gpg = $currentUser->getGPG();
-          $req = new \Api\Mail\Send($this->context);
+          $req = new \Core\API\Mail\Send($this->context);
           $this->success = $req->execute([
             "to" => $currentUser->getEmail(),
             "subject" => "[Security Lab] 2FA-Authentication removed",
diff --git a/core/Api/UserAPI.class.php b/Core/API/UserAPI.class.php
similarity index 98%
rename from core/Api/UserAPI.class.php
rename to Core/API/UserAPI.class.php
index 8159036..5f62faa 100644
--- a/core/Api/UserAPI.class.php
+++ b/Core/API/UserAPI.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
   use Cassandra\Date;
-  use Driver\SQL\Condition\Compare;
-  use Objects\Context;
-  use Objects\DatabaseEntity\Language;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\Language;
 
   abstract class UserAPI extends Request {
 
@@ -77,7 +77,7 @@ namespace Api {
     protected function insertUser($username, $email, $password, $confirmed, $fullName = "") {
       $sql = $this->context->getSQL();
 
-      $user = new \Objects\DatabaseEntity\User();
+      $user = new \Core\Objects\DatabaseEntity\User();
       $user->language = Language::DEFAULT_LANGUAGE(false);
       $user->registeredAt = new \DateTime();
       $user->password = $this->hashPassword($password);
@@ -151,27 +151,27 @@ namespace Api {
 
 }
 
-namespace Api\User {
+namespace Core\API\User {
 
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Api\Template\Render;
-  use Api\UserAPI;
-  use Api\VerifyCaptcha;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\API\Template\Render;
+  use Core\API\UserAPI;
+  use Core\API\VerifyCaptcha;
   use DateTime;
-  use Driver\SQL\Column\Column;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Condition\CondBool;
-  use Driver\SQL\Condition\CondIn;
-  use Driver\SQL\Condition\CondNot;
-  use Driver\SQL\Expression\JsonArrayAgg;
+  use Core\Driver\SQL\Column\Column;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Condition\CondBool;
+  use Core\Driver\SQL\Condition\CondIn;
+  use Core\Driver\SQL\Condition\CondNot;
+  use Core\Driver\SQL\Expression\JsonArrayAgg;
   use ImagickException;
-  use Objects\Context;
-  use Objects\DatabaseEntity\DatabaseEntityHandler;
-  use Objects\DatabaseEntity\GpgKey;
-  use Objects\DatabaseEntity\TwoFactorToken;
-  use Objects\TwoFactor\KeyBasedTwoFactorToken;
-  use Objects\DatabaseEntity\User;
+  use Core\Objects\Context;
+  use Core\Objects\DatabaseEntity\DatabaseEntityHandler;
+  use Core\Objects\DatabaseEntity\GpgKey;
+  use Core\Objects\DatabaseEntity\TwoFactorToken;
+  use Core\Objects\TwoFactor\KeyBasedTwoFactorToken;
+  use Core\Objects\DatabaseEntity\User;
 
   class Create extends UserAPI {
 
@@ -534,7 +534,7 @@ namespace Api\User {
 
         if ($this->success) {
           $messageBody = $req->getResult()["html"];
-          $request = new \Api\Mail\Send($this->context);
+          $request = new \Core\API\Mail\Send($this->context);
           $this->success = $request->execute(array(
             "to" => $email,
             "subject" => "[$siteName] Account Invitation",
@@ -863,7 +863,7 @@ namespace Api\User {
 
         if ($this->success) {
           $messageBody = $req->getResult()["html"];
-          $request = new \Api\Mail\Send($this->context);
+          $request = new \Core\API\Mail\Send($this->context);
           $this->success = $request->execute(array(
             "to" => $email,
             "subject" => "[$siteName] E-Mail Confirmation",
@@ -1146,7 +1146,7 @@ namespace Api\User {
             $gpgFingerprint = $user["gpg_fingerprint"];
           }
 
-          $request = new \Api\Mail\Send($this->context);
+          $request = new \Core\API\Mail\Send($this->context);
           $this->success = $request->execute(array(
             "to" => $email,
             "subject" => "[$siteName] Password Reset",
@@ -1272,7 +1272,7 @@ namespace Api\User {
 
       if ($this->success) {
         $messageBody = $req->getResult()["html"];
-        $request = new \Api\Mail\Send($this->context);
+        $request = new \Core\API\Mail\Send($this->context);
         $this->success = $request->execute(array(
           "to" => $email,
           "subject" => "[$siteName] E-Mail Confirmation",
@@ -1517,7 +1517,7 @@ namespace Api\User {
         Best Regards<br>
         ilum:e Security Lab";
 
-      $sendMail = new \Api\Mail\Send($this->context);
+      $sendMail = new \Core\API\Mail\Send($this->context);
       $this->success = $sendMail->execute(array(
         "to" => $currentUser->getEmail(),
         "subject" => "Security Lab - Confirm GPG-Key",
diff --git a/core/Api/VerifyCaptcha.class.php b/Core/API/VerifyCaptcha.class.php
similarity index 95%
rename from core/Api/VerifyCaptcha.class.php
rename to Core/API/VerifyCaptcha.class.php
index 486a5d4..6db6bb2 100644
--- a/core/Api/VerifyCaptcha.class.php
+++ b/Core/API/VerifyCaptcha.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Api;
+namespace Core\API;
 
-use Api\Parameter\StringType;
-use Objects\Context;
+use Core\API\Parameter\StringType;
+use Core\Objects\Context;
 
 class VerifyCaptcha extends Request {
 
diff --git a/core/Api/VisitorsAPI.class.php b/Core/API/VisitorsAPI.class.php
similarity index 89%
rename from core/Api/VisitorsAPI.class.php
rename to Core/API/VisitorsAPI.class.php
index 4fca437..6068bfc 100644
--- a/core/Api/VisitorsAPI.class.php
+++ b/Core/API/VisitorsAPI.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Api {
+namespace Core\API {
 
-  use Objects\Context;
+  use Core\Objects\Context;
 
   abstract class VisitorsAPI extends Request {
     public function __construct(Context $context, bool $externalCall = false, array $params = []) {
@@ -11,17 +11,17 @@ namespace Api {
   }
 }
 
-namespace Api\Visitors {
+namespace Core\API\Visitors {
 
-  use Api\Parameter\Parameter;
-  use Api\Parameter\StringType;
-  use Api\VisitorsAPI;
+  use Core\API\Parameter\Parameter;
+  use Core\API\Parameter\StringType;
+  use Core\API\VisitorsAPI;
   use DateTime;
-  use Driver\SQL\Condition\Compare;
-  use Driver\SQL\Expression\Add;
-  use Driver\SQL\Query\Select;
-  use Driver\SQL\Strategy\UpdateStrategy;
-  use Objects\Context;
+  use Core\Driver\SQL\Condition\Compare;
+  use Core\Driver\SQL\Expression\Add;
+  use Core\Driver\SQL\Query\Select;
+  use Core\Driver\SQL\Strategy\UpdateStrategy;
+  use Core\Objects\Context;
 
   class ProcessVisit extends VisitorsAPI {
     public function __construct(Context $context, bool $externalCall = false) {
diff --git a/Core/Cache/.gitignore b/Core/Cache/.gitignore
new file mode 100644
index 0000000..75c53ed
--- /dev/null
+++ b/Core/Cache/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitkeep
+!.gitignore
\ No newline at end of file
diff --git a/core/Cache/.gitkeep b/Core/Cache/.gitkeep
similarity index 100%
rename from core/Cache/.gitkeep
rename to Core/Cache/.gitkeep
diff --git a/core/Configuration/Configuration.class.php b/Core/Configuration/Configuration.class.php
similarity index 74%
rename from core/Configuration/Configuration.class.php
rename to Core/Configuration/Configuration.class.php
index 7461364..7275b01 100644
--- a/core/Configuration/Configuration.class.php
+++ b/Core/Configuration/Configuration.class.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Configuration;
+namespace Core\Configuration;
 
-use Objects\ConnectionData;
+use Core\Objects\ConnectionData;
 
 class Configuration {
 
+  const className = "\Site\Configuration\Database";
   private ?ConnectionData $database;
   private Settings $settings;
 
@@ -13,12 +14,12 @@ class Configuration {
     $this->database = null;
     $this->settings = Settings::loadDefaults();
 
-    $class = \Configuration\Database::class;
-    $path = getClassPath($class, ".class");
+    $className = self::className;
+    $path = getClassPath($className, ".class");
     if (file_exists($path) && is_readable($path)) {
       include_once $path;
-      if (class_exists($class)) {
-        $this->database = new \Configuration\Database();
+      if (class_exists($className)) {
+        $this->database = new $className();
       }
     }
   }
@@ -32,7 +33,9 @@ class Configuration {
   }
 
   public static function create(string $className, $data) {
-    $path = getClassPath("\\Configuration\\$className");
+    $path = getClassPath($className);
+    $classNameShort = explode("\\", $className);
+    $classNameShort = end($classNameShort);
 
     if ($data) {
       if (is_string($data)) {
@@ -40,9 +43,9 @@ class Configuration {
         $code = intendCode(
           "<?php
 
-          namespace Configuration;
+          namespace Core\Configuration;
 
-          class $className extends KeyData {
+          class $classNameShort extends KeyData {
           
             public function __construct() {
               parent::__construct($key);
@@ -67,9 +70,9 @@ class Configuration {
         $code = intendCode(
           "<?php
 
-          namespace Configuration;
+          namespace Site\Configuration;
 
-          class $className extends \\$superClass {
+          class $classNameShort extends \\$superClass {
 
             public function __construct() {
               parent::__construct($host, $port, $login, $password);$properties
@@ -95,7 +98,7 @@ class Configuration {
     return true;
   }
 
-  public function setDatabase(ConnectionData $connectionData) {
+  public function setDatabase(ConnectionData $connectionData): void {
     $this->database = $connectionData;
   }
 }
\ No newline at end of file
diff --git a/core/Configuration/CreateDatabase.class.php b/Core/Configuration/CreateDatabase.class.php
similarity index 74%
rename from core/Configuration/CreateDatabase.class.php
rename to Core/Configuration/CreateDatabase.class.php
index f59c3fb..5e8ff85 100644
--- a/core/Configuration/CreateDatabase.class.php
+++ b/Core/Configuration/CreateDatabase.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Configuration;
+namespace Core\Configuration;
 
-use Driver\SQL\SQL;
-use \Driver\SQL\Strategy\SetNullStrategy;
-use \Driver\SQL\Strategy\CascadeStrategy;
-use Objects\DatabaseEntity\DatabaseEntity;
+use Core\Driver\SQL\SQL;
+use Core\Driver\SQL\Strategy\SetNullStrategy;
+use Core\Driver\SQL\Strategy\CascadeStrategy;
+use Core\Objects\DatabaseEntity\DatabaseEntity;
 use PHPUnit\Util\Exception;
 
 class CreateDatabase extends DatabaseScript {
@@ -73,14 +73,14 @@ class CreateDatabase extends DatabaseScript {
       ->unique("request");
 
     $queries[] = $sql->insert("Route", ["request", "action", "target", "extra", "exact"])
-      ->addRow("/admin", "dynamic", "\\Documents\\Admin", NULL, false)
-      ->addRow("/register", "dynamic", "\\Documents\\Account", json_encode(["account/register.twig"]), true)
-      ->addRow("/confirmEmail", "dynamic", "\\Documents\\Account", json_encode(["account/confirm_email.twig"]), true)
-      ->addRow("/acceptInvite", "dynamic", "\\Documents\\Account", json_encode(["account/accept_invite.twig"]), true)
-      ->addRow("/resetPassword", "dynamic", "\\Documents\\Account", json_encode(["account/reset_password.twig"]), true)
-      ->addRow("/login", "dynamic", "\\Documents\\Account", json_encode(["account/login.twig"]), true)
-      ->addRow("/resendConfirmEmail", "dynamic", "\\Documents\\Account", json_encode(["account/resend_confirm_email.twig"]), true)
-      ->addRow("/debug", "dynamic", "\\Documents\\Info", NULL, true)
+      ->addRow("/admin", "dynamic", "\\Core\\Documents\\Admin", NULL, false)
+      ->addRow("/register", "dynamic", "\\Core\\Documents\\Account", json_encode(["account/register.twig"]), true)
+      ->addRow("/confirmEmail", "dynamic", "\\Core\\Documents\\Account", json_encode(["account/confirm_email.twig"]), true)
+      ->addRow("/acceptInvite", "dynamic", "\\Core\\Documents\\Account", json_encode(["account/accept_invite.twig"]), true)
+      ->addRow("/resetPassword", "dynamic", "\\Core\\Documents\\Account", json_encode(["account/reset_password.twig"]), true)
+      ->addRow("/login", "dynamic", "\\Core\\Documents\\Account", json_encode(["account/login.twig"]), true)
+      ->addRow("/resendConfirmEmail", "dynamic", "\\Core\\Documents\\Account", json_encode(["account/resend_confirm_email.twig"]), true)
+      ->addRow("/debug", "dynamic", "\\Core\\Documents\\Info", NULL, true)
       ->addRow("/", "static", "/static/welcome.html", NULL, true);
 
     $queries[] = $sql->createTable("Settings")
@@ -141,12 +141,13 @@ class CreateDatabase extends DatabaseScript {
       ->addString("replyTo", 64, true)
       ->addString("replyName", 32, true)
       ->addString("gpgFingerprint", 64, true)
-      ->addEnum("status", ["waiting","success","error"], false, 'waiting')
+      ->addEnum("status", ["waiting", "success", "error"], false, 'waiting')
       ->addInt("retryCount", false, 5)
       ->addDateTime("nextTry", false, $sql->now())
-      ->addString("errorMessage", NULL,  true)
+      ->addString("errorMessage", NULL, true)
       ->primaryKey("id");
-    $queries = array_merge($queries, \Configuration\Patch\EntityLog_2021_04_08::createTableLog($sql, "MailQueue", 30));
+
+    $queries = array_merge($queries, \Core\Configuration\Patch\EntityLog_2021_04_08::createTableLog($sql, "MailQueue", 30));
 
     $queries[] = $sql->insert("ApiPermission", array("method", "groups", "description"))
       ->addRow("ApiKey/create", array(), "Allows users to create API-Keys for themselves")
@@ -181,40 +182,46 @@ class CreateDatabase extends DatabaseScript {
   }
 
   private static function loadPatches(&$queries, $sql) {
-    $patchDirectory = './core/Configuration/Patch/';
-    if (file_exists($patchDirectory) && is_dir($patchDirectory)) {
-      $scan_arr = scandir($patchDirectory);
-      $files_arr = array_diff($scan_arr, array('.', '..'));
-      foreach ($files_arr as $file) {
-        $suffix = ".class.php";
-        if (endsWith($file, $suffix)) {
-          $className = substr($file, 0, strlen($file) - strlen($suffix));
-          $className = "\\Configuration\\Patch\\$className";
-          $method = "$className::createQueries";
-          $patchQueries = call_user_func($method, $sql);
-          foreach ($patchQueries as $query) $queries[] = $query;
+    $baseDirs = ["Core", "Site"];
+    foreach ($baseDirs as $baseDir) {
+      $patchDirectory = "./$baseDir/Configuration/Patch/";
+      if (file_exists($patchDirectory) && is_dir($patchDirectory)) {
+        $scan_arr = scandir($patchDirectory);
+        $files_arr = array_diff($scan_arr, array('.', '..'));
+        foreach ($files_arr as $file) {
+          $suffix = ".class.php";
+          if (endsWith($file, $suffix)) {
+            $className = substr($file, 0, strlen($file) - strlen($suffix));
+            $className = "\\$baseDir\\Configuration\\Patch\\$className";
+            $method = "$className::createQueries";
+            $patchQueries = call_user_func($method, $sql);
+            foreach ($patchQueries as $query) $queries[] = $query;
+          }
         }
       }
     }
   }
 
   public static function loadEntities(&$queries, $sql) {
-    $entityDirectory = './core/Objects/DatabaseEntity/';
-    if (file_exists($entityDirectory) && is_dir($entityDirectory)) {
-      $scan_arr = scandir($entityDirectory);
-      $files_arr = array_diff($scan_arr, array('.', '..'));
-      $handlers = [];
-      foreach ($files_arr as $file) {
-        $suffix = ".class.php";
-        if (endsWith($file, $suffix)) {
-          $className = substr($file, 0, strlen($file) - strlen($suffix));
-          if (!in_array($className, ["DatabaseEntity", "DatabaseEntityQuery", "DatabaseEntityHandler"])) {
-            $className = "\\Objects\\DatabaseEntity\\$className";
-            $reflectionClass = new \ReflectionClass($className);
-            if ($reflectionClass->isSubclassOf(DatabaseEntity::class)) {
-              $method = "$className::getHandler";
-              $handler = call_user_func($method, $sql);
-              $handlers[$handler->getTableName()] = $handler;
+    $handlers = [];
+    $baseDirs = ["Core", "Site"];
+    foreach ($baseDirs as $baseDir) {
+      $entityDirectory = "./$baseDir/Objects/DatabaseEntity/";
+      if (file_exists($entityDirectory) && is_dir($entityDirectory)) {
+        $scan_arr = scandir($entityDirectory);
+        $files_arr = array_diff($scan_arr, array('.', '..'));
+        foreach ($files_arr as $file) {
+          $suffix = ".class.php";
+          if (endsWith($file, $suffix)) {
+            $className = substr($file, 0, strlen($file) - strlen($suffix));
+            if (!in_array($className, ["DatabaseEntity", "DatabaseEntityQuery", "DatabaseEntityHandler"])) {
+              $className = "\\$baseDir\\Objects\\DatabaseEntity\\$className";
+              $reflectionClass = new \ReflectionClass($className);
+              if ($reflectionClass->isSubclassOf(DatabaseEntity::class)) {
+                $method = "$className::getHandler";
+                $handler = call_user_func($method, $sql);
+                $handlers[$handler->getTableName()] = $handler;
+              }
             }
           }
         }
diff --git a/core/Configuration/DatabaseScript.class.php b/Core/Configuration/DatabaseScript.class.php
similarity index 64%
rename from core/Configuration/DatabaseScript.class.php
rename to Core/Configuration/DatabaseScript.class.php
index 90d3018..93c69b4 100644
--- a/core/Configuration/DatabaseScript.class.php
+++ b/Core/Configuration/DatabaseScript.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Configuration;
+namespace Core\Configuration;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 abstract class DatabaseScript {
   public static abstract function createQueries(SQL $sql);
diff --git a/core/Configuration/Patch/EntityLog_2021_04_08.class.php b/Core/Configuration/Patch/EntityLog_2021_04_08.class.php
similarity index 89%
rename from core/Configuration/Patch/EntityLog_2021_04_08.class.php
rename to Core/Configuration/Patch/EntityLog_2021_04_08.class.php
index febf6fc..1c23d4d 100644
--- a/core/Configuration/Patch/EntityLog_2021_04_08.class.php
+++ b/Core/Configuration/Patch/EntityLog_2021_04_08.class.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Configuration\Patch;
+namespace Core\Configuration\Patch;
 
-use Configuration\DatabaseScript;
-use Driver\SQL\Column\IntColumn;
-use Driver\SQL\Condition\Compare;
-use Driver\SQL\Query\CreateProcedure;
-use Driver\SQL\SQL;
-use Driver\SQL\Type\CurrentColumn;
-use Driver\SQL\Type\CurrentTable;
-use Driver\SQL\Type\Trigger;
+use Core\Configuration\DatabaseScript;
+use Core\Driver\SQL\Column\IntColumn;
+use Core\Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Query\CreateProcedure;
+use Core\Driver\SQL\SQL;
+use Core\Driver\SQL\Type\CurrentColumn;
+use Core\Driver\SQL\Type\CurrentTable;
+use Core\Driver\SQL\Type\Trigger;
 
 class EntityLog_2021_04_08 extends DatabaseScript {
 
diff --git a/core/Configuration/Patch/SystemLog_2022_03_30.class.php b/Core/Configuration/Patch/SystemLog_2022_03_30.class.php
similarity index 75%
rename from core/Configuration/Patch/SystemLog_2022_03_30.class.php
rename to Core/Configuration/Patch/SystemLog_2022_03_30.class.php
index 3bcf5d5..ecc7ec9 100644
--- a/core/Configuration/Patch/SystemLog_2022_03_30.class.php
+++ b/Core/Configuration/Patch/SystemLog_2022_03_30.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Configuration\Patch;
+namespace Core\Configuration\Patch;
 
-use Configuration\DatabaseScript;
-use Driver\SQL\SQL;
+use Core\Configuration\DatabaseScript;
+use Core\Driver\SQL\SQL;
 
 class SystemLog_2022_03_30 extends DatabaseScript {
 
diff --git a/core/Configuration/Settings.class.php b/Core/Configuration/Settings.class.php
similarity index 87%
rename from core/Configuration/Settings.class.php
rename to Core/Configuration/Settings.class.php
index 8455ef7..ec3b42c 100644
--- a/core/Configuration/Settings.class.php
+++ b/Core/Configuration/Settings.class.php
@@ -4,11 +4,11 @@
  * Do not change settings here, they are dynamically loaded from database.
  */
 
-namespace Configuration;
+namespace Core\Configuration;
 
-use Driver\Logger\Logger;
-use Driver\SQL\Query\Insert;
-use Objects\Context;
+use Core\Driver\Logger\Logger;
+use Core\Driver\SQL\Query\Insert;
+use Core\Objects\Context;
 
 class Settings {
 
@@ -18,8 +18,8 @@ class Settings {
   // settings
   private string $siteName;
   private string $baseUrl;
-  private string $jwtPublicKey;
-  private string $jwtSecretKey;
+  private ?string $jwtPublicKey;
+  private ?string $jwtSecretKey;
   private string $jwtAlgorithm;
   private bool $registrationAllowed;
   private bool $recaptchaEnabled;
@@ -37,8 +37,13 @@ class Settings {
     $this->logger = new Logger("Settings");
   }
 
-  public function getJwtPublicKey(): \Firebase\JWT\Key {
-    return new \Firebase\JWT\Key($this->jwtPublicKey ?? $this->jwtSecretKey, $this->jwtAlgorithm);
+  public function getJwtPublicKey(bool $allowPrivate = true): ?\Firebase\JWT\Key {
+    if (empty($this->jwtPublicKey)) {
+      // we might have a symmetric key, should we instead return the private key?
+      return $allowPrivate ? new \Firebase\JWT\Key($this->jwtSecretKey, $this->jwtAlgorithm) : null;
+    } else {
+      return new \Firebase\JWT\Key($this->jwtPublicKey, $this->jwtAlgorithm);
+    }
   }
 
   public function getJwtSecretKey(): \Firebase\JWT\Key {
@@ -109,18 +114,24 @@ class Settings {
     return true;
   }
 
+  public static function isJwtAlgorithmSupported(string $algorithm): bool {
+    return in_array(strtoupper($algorithm), ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "EDDSA"]);
+  }
+
   public function saveJwtKey(Context $context) {
-    $req = new \Api\Settings\Set($context);
+    $req = new \Core\API\Settings\Set($context);
     $req->execute(array("settings" => array(
       "jwt_secret_key" => $this->jwtSecretKey,
       "jwt_public_key" => $this->jwtSecretKey,
       "jwt_algorithm" => $this->jwtAlgorithm,
     )));
+
+    return $req;
   }
 
   public function loadFromDatabase(Context $context): bool {
     $this->logger = new Logger("Settings", $context->getSQL());
-    $req = new \Api\Settings\Get($context);
+    $req = new \Core\API\Settings\Get($context);
     $success = $req->execute();
 
     if ($success) {
@@ -203,4 +214,8 @@ class Settings {
   public function getDomain(): string {
     return parse_url($this->getBaseUrl(), PHP_URL_HOST);
   }
+
+  public function getLogger(): Logger {
+    return $this->logger;
+  }
 }
\ No newline at end of file
diff --git a/core/Documents/Account.class.php b/Core/Documents/Account.class.php
similarity index 91%
rename from core/Documents/Account.class.php
rename to Core/Documents/Account.class.php
index 1d4d9fe..49e1df1 100644
--- a/core/Documents/Account.class.php
+++ b/Core/Documents/Account.class.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Documents;
+namespace Core\Documents;
 
-use Elements\TemplateDocument;
-use Objects\Router\Router;
+use Core\Elements\TemplateDocument;
+use Core\Objects\Router\Router;
 
 
 class Account extends TemplateDocument {
@@ -25,7 +25,7 @@ class Account extends TemplateDocument {
     if ($this->getTemplateName() === "account/reset_password.twig") {
       if (isset($_GET["token"]) && is_string($_GET["token"]) && !empty($_GET["token"])) {
         $this->parameters["view"]["token"] = $_GET["token"];
-        $req = new \Api\User\CheckToken($this->getContext());
+        $req = new \Core\API\User\CheckToken($this->getContext());
         $this->parameters["view"]["success"] = $req->execute(array("token" => $_GET["token"]));
         if ($this->parameters["view"]["success"]) {
           if (strcmp($req->getResult()["token"]["type"], "password_reset") !== 0) {
@@ -48,7 +48,7 @@ class Account extends TemplateDocument {
     } else if ($this->getTemplateName() === "account/accept_invite.twig") {
       if (isset($_GET["token"]) && is_string($_GET["token"]) && !empty($_GET["token"])) {
         $this->parameters["view"]["token"] = $_GET["token"];
-        $req = new \Api\User\CheckToken($this->getContext());
+        $req = new \Core\API\User\CheckToken($this->getContext());
         $this->parameters["view"]["success"] = $req->execute(array("token" => $_GET["token"]));
         if ($this->parameters["view"]["success"]) {
           if (strcmp($req->getResult()["token"]["type"], "invite") !== 0) {
diff --git a/core/Documents/Admin.class.php b/Core/Documents/Admin.class.php
similarity index 80%
rename from core/Documents/Admin.class.php
rename to Core/Documents/Admin.class.php
index 1a6ba0f..bf72ec4 100644
--- a/core/Documents/Admin.class.php
+++ b/Core/Documents/Admin.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Documents;
+namespace Core\Documents;
 
-use Elements\TemplateDocument;
-use Objects\Router\Router;
+use Core\Elements\TemplateDocument;
+use Core\Objects\Router\Router;
 
 class Admin extends TemplateDocument {
   public function __construct(Router $router) {
diff --git a/core/Documents/Info.class.php b/Core/Documents/Info.class.php
similarity index 80%
rename from core/Documents/Info.class.php
rename to Core/Documents/Info.class.php
index ea731fd..aeef703 100644
--- a/core/Documents/Info.class.php
+++ b/Core/Documents/Info.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Documents;
+namespace Core\Documents;
 
-use Elements\EmptyHead;
-use Elements\HtmlDocument;
-use Elements\SimpleBody;
-use Objects\Router\Router;
+use Core\Elements\EmptyHead;
+use Core\Elements\HtmlDocument;
+use Core\Elements\SimpleBody;
+use Core\Objects\Router\Router;
 
 class Info extends HtmlDocument {
   public function __construct(Router $router) {
diff --git a/core/Documents/Install.class.php b/Core/Documents/Install.class.php
similarity index 96%
rename from core/Documents/Install.class.php
rename to Core/Documents/Install.class.php
index d884adc..7d0b76b 100644
--- a/core/Documents/Install.class.php
+++ b/Core/Documents/Install.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Documents {
+namespace Core\Documents {
 
   use Documents\Install\InstallBody;
   use Documents\Install\InstallHead;
-  use Elements\HtmlDocument;
-  use Objects\Router\Router;
+  use Core\Elements\HtmlDocument;
+  use Core\Objects\Router\Router;
 
   class Install extends HtmlDocument {
     public function __construct(Router $router) {
@@ -17,19 +17,19 @@ namespace Documents {
 
 namespace Documents\Install {
 
-  use Configuration\Configuration;
-  use Configuration\CreateDatabase;
-  use Driver\SQL\Query\Commit;
-  use Driver\SQL\Query\RollBack;
-  use Driver\SQL\Query\StartTransaction;
-  use Driver\SQL\SQL;
-  use Elements\Body;
-  use Elements\Head;
-  use Elements\Link;
-  use Elements\Script;
-  use External\PHPMailer\Exception;
-  use External\PHPMailer\PHPMailer;
-  use Objects\ConnectionData;
+  use Core\Configuration\Configuration;
+  use Core\Configuration\CreateDatabase;
+  use Core\Driver\SQL\Query\Commit;
+  use Core\Driver\SQL\Query\RollBack;
+  use Core\Driver\SQL\Query\StartTransaction;
+  use Core\Driver\SQL\SQL;
+  use Core\Elements\Body;
+  use Core\Elements\Head;
+  use Core\Elements\Link;
+  use Core\Elements\Script;
+  use Core\External\PHPMailer\Exception;
+  use Core\External\PHPMailer\PHPMailer;
+  use Core\Objects\ConnectionData;
 
   class InstallHead extends Head {
 
@@ -131,9 +131,9 @@ namespace Documents\Install {
 
     private function getExternalDirectory(bool $absolute = true): string {
       if ($absolute) {
-        return implode(DIRECTORY_SEPARATOR, [WEBROOT, "core", "External"]);;
+        return implode(DIRECTORY_SEPARATOR, [WEBROOT, "Core", "External"]);
       } else {
-        return implode(DIRECTORY_SEPARATOR, ["core", "External"]);
+        return implode(DIRECTORY_SEPARATOR, ["Core", "External"]);
       }
     }
 
@@ -185,7 +185,7 @@ namespace Documents\Install {
       }
 
       if ($step === self::ADD_MAIL_SERVICE) {
-        $req = new \Api\Settings\Get($context);
+        $req = new \Core\API\Settings\Get($context);
         $success = $req->execute(array("key" => "^mail_enabled$"));
         if (!$success) {
           $this->errorString = $req->getLastError();
@@ -193,12 +193,12 @@ namespace Documents\Install {
         } else if (isset($req->getResult()["settings"]["mail_enabled"])) {
           $step = self::FINISH_INSTALLATION;
 
-          $req = new \Api\Settings\Set($context);
+          $req = new \Core\API\Settings\Set($context);
           $success = $req->execute(array("settings" => array("installation_completed" => "1")));
           if (!$success) {
             $this->errorString = $req->getLastError();
           } else {
-            $req = new \Api\Notifications\Create($context);
+            $req = new \Core\API\Notifications\Create($context);
             $req->execute(array(
                 "title" => "Welcome",
                 "message" => "Your Web-base was successfully installed. Check out the admin dashboard. Have fun!",
@@ -369,7 +369,7 @@ namespace Documents\Install {
           if ($success) {
             $context = $this->getDocument()->getContext();
             $config = $context->getConfig();
-            if (Configuration::create("Database", $connectionData) === false) {
+            if (Configuration::create(\Site\Configuration\Database::class, $connectionData) === false) {
               $success = false;
               $msg = "Unable to write database file";
             } else {
@@ -378,7 +378,7 @@ namespace Documents\Install {
                 $success = false;
                 $msg = "Unable to verify database connection after installation";
               } else {
-                $req = new \Api\Routes\GenerateCache($context);
+                $req = new \Core\API\Routes\GenerateCache($context);
                 if (!$req->execute()) {
                   $success = false;
                   $msg = "Unable to write route file: " . $req->getLastError();
@@ -430,7 +430,7 @@ namespace Documents\Install {
         $msg = "Please fill out the following inputs:<br>" .
           $this->createUnorderedList($missingInputs);
       } else {
-        $req = new \Api\User\Create($context);
+        $req = new \Core\API\User\Create($context);
         $success = $req->execute(array(
           'username' => $username,
           'email' => $email,
@@ -462,7 +462,7 @@ namespace Documents\Install {
       }
 
       if ($this->getParameter("skip") === "true") {
-        $req = new \Api\Settings\Set($context);
+        $req = new \Core\API\Settings\Set($context);
         $success = $req->execute(array("settings" => array("mail_enabled" => "0")));
         $msg = $req->getLastError();
       } else {
@@ -528,7 +528,7 @@ namespace Documents\Install {
           }
 
           if ($success) {
-            $req = new \Api\Settings\Set($context);
+            $req = new \Core\API\Settings\Set($context);
             $success = $req->execute(array("settings" => array(
               "mail_enabled" => "1",
               "mail_host" => "$address",
diff --git a/core/Driver/Logger/Logger.class.php b/Core/Driver/Logger/Logger.class.php
similarity index 93%
rename from core/Driver/Logger/Logger.class.php
rename to Core/Driver/Logger/Logger.class.php
index e059dd9..2062a46 100644
--- a/core/Driver/Logger/Logger.class.php
+++ b/Core/Driver/Logger/Logger.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\Logger;
+namespace Core\Driver\Logger;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 class Logger {
 
@@ -53,9 +53,9 @@ class Logger {
       $message .= "\n" . $this->getStackTrace();
     }
 
+    $this->lastMessage = $message;
+    $this->lastLevel = $severity;
     if ($this->unitTestMode) {
-      $this->lastMessage = $message;
-      $this->lastLevel = $severity;
       return;
     }
 
@@ -109,14 +109,6 @@ class Logger {
     return self::$INSTANCE;
   }
 
-  /**
-   * Calling this method will prevent the logger from persisting log messages (writing to database/file),
-   * and allow to access the last logged message via #getLastMessage() and #getLastLevel()
-   */
-  public function unitTestMode() {
-    $this->unitTestMode = true;
-  }
-
   public function getLastMessage(): ?string {
     return $this->lastMessage;
   }
@@ -124,4 +116,11 @@ class Logger {
   public function getLastLevel(): ?string {
     return $this->lastLevel;
   }
+
+  /**
+   * Calling this method will prevent the logger from persisting log messages (writing to database/file),
+   */
+  public function unitTestMode() {
+    $this->unitTestMode = true;
+  }
 }
\ No newline at end of file
diff --git a/core/Driver/SQL/Column/BigIntColumn.class.php b/Core/Driver/SQL/Column/BigIntColumn.class.php
similarity index 87%
rename from core/Driver/SQL/Column/BigIntColumn.class.php
rename to Core/Driver/SQL/Column/BigIntColumn.class.php
index a065f31..7bfe5bb 100644
--- a/core/Driver/SQL/Column/BigIntColumn.class.php
+++ b/Core/Driver/SQL/Column/BigIntColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class BigIntColumn extends IntColumn {
 
diff --git a/core/Driver/SQL/Column/BoolColumn.class.php b/Core/Driver/SQL/Column/BoolColumn.class.php
similarity index 83%
rename from core/Driver/SQL/Column/BoolColumn.class.php
rename to Core/Driver/SQL/Column/BoolColumn.class.php
index f4607bc..5501dd8 100644
--- a/core/Driver/SQL/Column/BoolColumn.class.php
+++ b/Core/Driver/SQL/Column/BoolColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class BoolColumn extends Column {
 
diff --git a/core/Driver/SQL/Column/Column.class.php b/Core/Driver/SQL/Column/Column.class.php
similarity index 86%
rename from core/Driver/SQL/Column/Column.class.php
rename to Core/Driver/SQL/Column/Column.class.php
index 56bfede..02c7198 100644
--- a/core/Driver/SQL/Column/Column.class.php
+++ b/Core/Driver/SQL/Column/Column.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
-use Driver\SQL\Expression\Expression;
+use Core\Driver\SQL\Expression\Expression;
 
 class Column extends Expression {
 
diff --git a/core/Driver/SQL/Column/DateTimeColumn.class.php b/Core/Driver/SQL/Column/DateTimeColumn.class.php
similarity index 85%
rename from core/Driver/SQL/Column/DateTimeColumn.class.php
rename to Core/Driver/SQL/Column/DateTimeColumn.class.php
index c082b3d..8e3a961 100644
--- a/core/Driver/SQL/Column/DateTimeColumn.class.php
+++ b/Core/Driver/SQL/Column/DateTimeColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class DateTimeColumn extends Column {
 
diff --git a/core/Driver/SQL/Column/DoubleColumn.class.php b/Core/Driver/SQL/Column/DoubleColumn.class.php
similarity index 89%
rename from core/Driver/SQL/Column/DoubleColumn.class.php
rename to Core/Driver/SQL/Column/DoubleColumn.class.php
index 3f7c5d6..9f6af33 100644
--- a/core/Driver/SQL/Column/DoubleColumn.class.php
+++ b/Core/Driver/SQL/Column/DoubleColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class DoubleColumn extends NumericColumn {
   public function __construct(string $name, bool $nullable, $defaultValue = NULL, ?int $totalDigits = null, ?int $decimalDigits = null) {
diff --git a/core/Driver/SQL/Column/EnumColumn.class.php b/Core/Driver/SQL/Column/EnumColumn.class.php
similarity index 92%
rename from core/Driver/SQL/Column/EnumColumn.class.php
rename to Core/Driver/SQL/Column/EnumColumn.class.php
index b38de1e..5a4e915 100644
--- a/core/Driver/SQL/Column/EnumColumn.class.php
+++ b/Core/Driver/SQL/Column/EnumColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class EnumColumn extends Column {
 
diff --git a/core/Driver/SQL/Column/FloatColumn.class.php b/Core/Driver/SQL/Column/FloatColumn.class.php
similarity index 89%
rename from core/Driver/SQL/Column/FloatColumn.class.php
rename to Core/Driver/SQL/Column/FloatColumn.class.php
index fa7408c..eca2e04 100644
--- a/core/Driver/SQL/Column/FloatColumn.class.php
+++ b/Core/Driver/SQL/Column/FloatColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class FloatColumn extends NumericColumn {
   public function __construct(string $name, bool $nullable, $defaultValue = NULL, ?int $totalDigits = null, ?int $decimalDigits = null) {
diff --git a/core/Driver/SQL/Column/IntColumn.class.php b/Core/Driver/SQL/Column/IntColumn.class.php
similarity index 93%
rename from core/Driver/SQL/Column/IntColumn.class.php
rename to Core/Driver/SQL/Column/IntColumn.class.php
index df0bf3e..463a782 100644
--- a/core/Driver/SQL/Column/IntColumn.class.php
+++ b/Core/Driver/SQL/Column/IntColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class IntColumn extends Column {
 
diff --git a/core/Driver/SQL/Column/JsonColumn.class.php b/Core/Driver/SQL/Column/JsonColumn.class.php
similarity index 84%
rename from core/Driver/SQL/Column/JsonColumn.class.php
rename to Core/Driver/SQL/Column/JsonColumn.class.php
index c89fa93..7ba8f69 100644
--- a/core/Driver/SQL/Column/JsonColumn.class.php
+++ b/Core/Driver/SQL/Column/JsonColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class JsonColumn extends Column {
 
diff --git a/core/Driver/SQL/Column/NumericColumn.class.php b/Core/Driver/SQL/Column/NumericColumn.class.php
similarity index 90%
rename from core/Driver/SQL/Column/NumericColumn.class.php
rename to Core/Driver/SQL/Column/NumericColumn.class.php
index 6c92eb0..0871e26 100644
--- a/core/Driver/SQL/Column/NumericColumn.class.php
+++ b/Core/Driver/SQL/Column/NumericColumn.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
-use Driver\SQL\Column\Column;
+use Core\Driver\SQL\Column\Column;
 
 class NumericColumn extends Column {
 
diff --git a/core/Driver/SQL/Column/SerialColumn.class.php b/Core/Driver/SQL/Column/SerialColumn.class.php
similarity index 84%
rename from core/Driver/SQL/Column/SerialColumn.class.php
rename to Core/Driver/SQL/Column/SerialColumn.class.php
index 14ffe2f..552dbc7 100644
--- a/core/Driver/SQL/Column/SerialColumn.class.php
+++ b/Core/Driver/SQL/Column/SerialColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class SerialColumn extends Column {
 
diff --git a/core/Driver/SQL/Column/StringColumn.class.php b/Core/Driver/SQL/Column/StringColumn.class.php
similarity index 90%
rename from core/Driver/SQL/Column/StringColumn.class.php
rename to Core/Driver/SQL/Column/StringColumn.class.php
index 3e266ea..53cc1a0 100644
--- a/core/Driver/SQL/Column/StringColumn.class.php
+++ b/Core/Driver/SQL/Column/StringColumn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Column;
+namespace Core\Driver\SQL\Column;
 
 class StringColumn extends Column {
 
diff --git a/core/Driver/SQL/Condition/Compare.class.php b/Core/Driver/SQL/Condition/Compare.class.php
similarity index 92%
rename from core/Driver/SQL/Condition/Compare.class.php
rename to Core/Driver/SQL/Condition/Compare.class.php
index c9df65b..9be64fd 100644
--- a/core/Driver/SQL/Condition/Compare.class.php
+++ b/Core/Driver/SQL/Condition/Compare.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class Compare extends Condition {
 
diff --git a/core/Driver/SQL/Condition/CondAnd.class.php b/Core/Driver/SQL/Condition/CondAnd.class.php
similarity index 86%
rename from core/Driver/SQL/Condition/CondAnd.class.php
rename to Core/Driver/SQL/Condition/CondAnd.class.php
index 86a9b59..7683df8 100644
--- a/core/Driver/SQL/Condition/CondAnd.class.php
+++ b/Core/Driver/SQL/Condition/CondAnd.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class CondAnd extends Condition {
 
diff --git a/core/Driver/SQL/Condition/CondBool.class.php b/Core/Driver/SQL/Condition/CondBool.class.php
similarity index 83%
rename from core/Driver/SQL/Condition/CondBool.class.php
rename to Core/Driver/SQL/Condition/CondBool.class.php
index 8d68941..3b2ead0 100644
--- a/core/Driver/SQL/Condition/CondBool.class.php
+++ b/Core/Driver/SQL/Condition/CondBool.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class CondBool extends Condition {
 
diff --git a/core/Driver/SQL/Condition/CondIn.class.php b/Core/Driver/SQL/Condition/CondIn.class.php
similarity index 89%
rename from core/Driver/SQL/Condition/CondIn.class.php
rename to Core/Driver/SQL/Condition/CondIn.class.php
index 4839d84..2ccd769 100644
--- a/core/Driver/SQL/Condition/CondIn.class.php
+++ b/Core/Driver/SQL/Condition/CondIn.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class CondIn extends Condition {
 
diff --git a/core/Driver/SQL/Condition/CondKeyword.class.php b/Core/Driver/SQL/Condition/CondKeyword.class.php
similarity index 93%
rename from core/Driver/SQL/Condition/CondKeyword.class.php
rename to Core/Driver/SQL/Condition/CondKeyword.class.php
index 9bf0e76..b639ec0 100644
--- a/core/Driver/SQL/Condition/CondKeyword.class.php
+++ b/Core/Driver/SQL/Condition/CondKeyword.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 abstract class CondKeyword extends Condition {
 
diff --git a/core/Driver/SQL/Condition/CondLike.class.php b/Core/Driver/SQL/Condition/CondLike.class.php
similarity index 82%
rename from core/Driver/SQL/Condition/CondLike.class.php
rename to Core/Driver/SQL/Condition/CondLike.class.php
index 1e7b949..686c7fb 100644
--- a/core/Driver/SQL/Condition/CondLike.class.php
+++ b/Core/Driver/SQL/Condition/CondLike.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class CondLike extends CondKeyword {
 
diff --git a/core/Driver/SQL/Condition/CondNot.class.php b/Core/Driver/SQL/Condition/CondNot.class.php
similarity index 86%
rename from core/Driver/SQL/Condition/CondNot.class.php
rename to Core/Driver/SQL/Condition/CondNot.class.php
index f978570..6d85798 100644
--- a/core/Driver/SQL/Condition/CondNot.class.php
+++ b/Core/Driver/SQL/Condition/CondNot.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class CondNot extends Condition {
 
diff --git a/core/Driver/SQL/Condition/CondNull.class.php b/Core/Driver/SQL/Condition/CondNull.class.php
similarity index 84%
rename from core/Driver/SQL/Condition/CondNull.class.php
rename to Core/Driver/SQL/Condition/CondNull.class.php
index 888ab71..0bfe768 100644
--- a/core/Driver/SQL/Condition/CondNull.class.php
+++ b/Core/Driver/SQL/Condition/CondNull.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class CondNull extends Condition {
 
diff --git a/core/Driver/SQL/Condition/CondOr.class.php b/Core/Driver/SQL/Condition/CondOr.class.php
similarity index 88%
rename from core/Driver/SQL/Condition/CondOr.class.php
rename to Core/Driver/SQL/Condition/CondOr.class.php
index d80614d..fa0f961 100644
--- a/core/Driver/SQL/Condition/CondOr.class.php
+++ b/Core/Driver/SQL/Condition/CondOr.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class CondOr extends Condition {
 
diff --git a/core/Driver/SQL/Condition/CondRegex.class.php b/Core/Driver/SQL/Condition/CondRegex.class.php
similarity index 83%
rename from core/Driver/SQL/Condition/CondRegex.class.php
rename to Core/Driver/SQL/Condition/CondRegex.class.php
index 1147bce..3e39208 100644
--- a/core/Driver/SQL/Condition/CondRegex.class.php
+++ b/Core/Driver/SQL/Condition/CondRegex.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 class CondRegex extends CondKeyword {
 
diff --git a/Core/Driver/SQL/Condition/Condition.class.php b/Core/Driver/SQL/Condition/Condition.class.php
new file mode 100644
index 0000000..d78da23
--- /dev/null
+++ b/Core/Driver/SQL/Condition/Condition.class.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Core\Driver\SQL\Condition;
+
+use Core\Driver\SQL\Expression\Expression;
+
+abstract class Condition extends Expression {
+  
+}
\ No newline at end of file
diff --git a/core/Driver/SQL/Condition/Exists.class.php b/Core/Driver/SQL/Condition/Exists.class.php
similarity index 78%
rename from core/Driver/SQL/Condition/Exists.class.php
rename to Core/Driver/SQL/Condition/Exists.class.php
index ab45af9..cd0cabc 100644
--- a/core/Driver/SQL/Condition/Exists.class.php
+++ b/Core/Driver/SQL/Condition/Exists.class.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Driver\SQL\Condition;
+namespace Core\Driver\SQL\Condition;
 
 
-use Driver\SQL\Query\Select;
+use Core\Driver\SQL\Query\Select;
 
 class Exists extends Condition
 {
diff --git a/Core/Driver/SQL/Constraint/Constraint.class.php b/Core/Driver/SQL/Constraint/Constraint.class.php
new file mode 100644
index 0000000..fe95506
--- /dev/null
+++ b/Core/Driver/SQL/Constraint/Constraint.class.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Core\Driver\SQL\Constraint;
+
+abstract class Constraint {
+
+  private array $columnNames;
+  private ?string $name;
+
+  public function __construct($columnNames, ?string $constraintName = NULL) {
+    $this->columnNames = (!is_array($columnNames) ? array($columnNames) : $columnNames);
+    $this->name = $constraintName;
+  }
+
+  public function getColumnNames(): array { return $this->columnNames; }
+  public function getName(): ?string { return $this->name; }
+  public function setName(string $name) { $this->name = $name; }
+}
\ No newline at end of file
diff --git a/core/Driver/SQL/Constraint/ForeignKey.class.php b/Core/Driver/SQL/Constraint/ForeignKey.class.php
similarity index 68%
rename from core/Driver/SQL/Constraint/ForeignKey.class.php
rename to Core/Driver/SQL/Constraint/ForeignKey.class.php
index 221001d..f4cef1a 100644
--- a/core/Driver/SQL/Constraint/ForeignKey.class.php
+++ b/Core/Driver/SQL/Constraint/ForeignKey.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Constraint;
+namespace Core\Driver\SQL\Constraint;
 
-use Driver\SQL\Strategy\Strategy;
+use Core\Driver\SQL\Strategy\Strategy;
 
 class ForeignKey extends Constraint {
 
@@ -10,8 +10,8 @@ class ForeignKey extends Constraint {
   private string $referencedColumn;
   private ?Strategy $strategy;
 
-  public function __construct(string $name, string $refTable, string $refColumn, ?Strategy $strategy = NULL) {
-    parent::__construct($name);
+  public function __construct(string $columnName, string $refTable, string $refColumn, ?Strategy $strategy = NULL) {
+    parent::__construct($columnName);
     $this->referencedTable = $refTable;
     $this->referencedColumn = $refColumn;
     $this->strategy = $strategy;
diff --git a/core/Driver/SQL/Constraint/PrimaryKey.class.php b/Core/Driver/SQL/Constraint/PrimaryKey.class.php
similarity index 82%
rename from core/Driver/SQL/Constraint/PrimaryKey.class.php
rename to Core/Driver/SQL/Constraint/PrimaryKey.class.php
index b7398df..60b04d6 100644
--- a/core/Driver/SQL/Constraint/PrimaryKey.class.php
+++ b/Core/Driver/SQL/Constraint/PrimaryKey.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Constraint;
+namespace Core\Driver\SQL\Constraint;
 
 class PrimaryKey extends Constraint {
 
diff --git a/core/Driver/SQL/Constraint/Unique.class.php b/Core/Driver/SQL/Constraint/Unique.class.php
similarity index 82%
rename from core/Driver/SQL/Constraint/Unique.class.php
rename to Core/Driver/SQL/Constraint/Unique.class.php
index c45d1fe..fea147f 100644
--- a/core/Driver/SQL/Constraint/Unique.class.php
+++ b/Core/Driver/SQL/Constraint/Unique.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Constraint;
+namespace Core\Driver\SQL\Constraint;
 
 class Unique extends Constraint {
 
diff --git a/core/Driver/SQL/Expression/Add.class.php b/Core/Driver/SQL/Expression/Add.class.php
similarity index 70%
rename from core/Driver/SQL/Expression/Add.class.php
rename to Core/Driver/SQL/Expression/Add.class.php
index 1d4df42..36f0912 100644
--- a/core/Driver/SQL/Expression/Add.class.php
+++ b/Core/Driver/SQL/Expression/Add.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Expression;
+namespace Core\Driver\SQL\Expression;
 
-use Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Condition\Compare;
 
 # TODO: change confusing class inheritance here
 class Add extends Compare {
diff --git a/core/Driver/SQL/Expression/CaseWhen.class.php b/Core/Driver/SQL/Expression/CaseWhen.class.php
similarity index 86%
rename from core/Driver/SQL/Expression/CaseWhen.class.php
rename to Core/Driver/SQL/Expression/CaseWhen.class.php
index 4c44941..386046b 100644
--- a/core/Driver/SQL/Expression/CaseWhen.class.php
+++ b/Core/Driver/SQL/Expression/CaseWhen.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Expression;
+namespace Core\Driver\SQL\Expression;
 
-use Driver\SQL\Condition\Condition;
+use Core\Driver\SQL\Condition\Condition;
 
 class CaseWhen extends Expression {
 
diff --git a/core/Driver/SQL/Expression/CurrentTimeStamp.class.php b/Core/Driver/SQL/Expression/CurrentTimeStamp.class.php
similarity index 57%
rename from core/Driver/SQL/Expression/CurrentTimeStamp.class.php
rename to Core/Driver/SQL/Expression/CurrentTimeStamp.class.php
index 0edfd45..36987ad 100644
--- a/core/Driver/SQL/Expression/CurrentTimeStamp.class.php
+++ b/Core/Driver/SQL/Expression/CurrentTimeStamp.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Expression;
+namespace Core\Driver\SQL\Expression;
 
 class CurrentTimeStamp extends Expression {
 
diff --git a/core/Driver/SQL/Expression/DateAdd.class.php b/Core/Driver/SQL/Expression/DateAdd.class.php
similarity index 87%
rename from core/Driver/SQL/Expression/DateAdd.class.php
rename to Core/Driver/SQL/Expression/DateAdd.class.php
index d8eafc6..65ff661 100644
--- a/core/Driver/SQL/Expression/DateAdd.class.php
+++ b/Core/Driver/SQL/Expression/DateAdd.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Expression;
+namespace Core\Driver\SQL\Expression;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 class DateAdd extends Expression {
 
diff --git a/core/Driver/SQL/Expression/DateSub.class.php b/Core/Driver/SQL/Expression/DateSub.class.php
similarity index 87%
rename from core/Driver/SQL/Expression/DateSub.class.php
rename to Core/Driver/SQL/Expression/DateSub.class.php
index f73e259..e0e2d2a 100644
--- a/core/Driver/SQL/Expression/DateSub.class.php
+++ b/Core/Driver/SQL/Expression/DateSub.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Expression;
+namespace Core\Driver\SQL\Expression;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 class DateSub extends Expression {
 
diff --git a/Core/Driver/SQL/Expression/Expression.class.php b/Core/Driver/SQL/Expression/Expression.class.php
new file mode 100644
index 0000000..0fba8f7
--- /dev/null
+++ b/Core/Driver/SQL/Expression/Expression.class.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Core\Driver\SQL\Expression;
+
+use Core\Driver\SQL\SQL;
+
+abstract class Expression {
+
+}
\ No newline at end of file
diff --git a/core/Driver/SQL/Expression/JsonArrayAgg.class.php b/Core/Driver/SQL/Expression/JsonArrayAgg.class.php
similarity index 89%
rename from core/Driver/SQL/Expression/JsonArrayAgg.class.php
rename to Core/Driver/SQL/Expression/JsonArrayAgg.class.php
index dc2ca57..c15858e 100644
--- a/core/Driver/SQL/Expression/JsonArrayAgg.class.php
+++ b/Core/Driver/SQL/Expression/JsonArrayAgg.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Expression;
+namespace Core\Driver\SQL\Expression;
 
 class JsonArrayAgg extends Expression {
 
diff --git a/core/Driver/SQL/Expression/Sum.class.php b/Core/Driver/SQL/Expression/Sum.class.php
similarity index 88%
rename from core/Driver/SQL/Expression/Sum.class.php
rename to Core/Driver/SQL/Expression/Sum.class.php
index 7b0a185..38c03fe 100644
--- a/core/Driver/SQL/Expression/Sum.class.php
+++ b/Core/Driver/SQL/Expression/Sum.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Expression;
+namespace Core\Driver\SQL\Expression;
 
 class Sum extends Expression {
 
diff --git a/core/Driver/SQL/Join.class.php b/Core/Driver/SQL/Join.class.php
similarity index 90%
rename from core/Driver/SQL/Join.class.php
rename to Core/Driver/SQL/Join.class.php
index 0739a63..5a2f7dc 100644
--- a/core/Driver/SQL/Join.class.php
+++ b/Core/Driver/SQL/Join.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Driver\SQL;
+namespace Core\Driver\SQL;
 
-use Driver\SQL\Column\Column;
-use Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Column\Column;
+use Core\Driver\SQL\Condition\Compare;
 
 class Join {
 
diff --git a/core/Driver/SQL/Keyword.class.php b/Core/Driver/SQL/Keyword.class.php
similarity index 75%
rename from core/Driver/SQL/Keyword.class.php
rename to Core/Driver/SQL/Keyword.class.php
index 75d5bda..dc139eb 100644
--- a/core/Driver/SQL/Keyword.class.php
+++ b/Core/Driver/SQL/Keyword.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL;
+namespace Core\Driver\SQL;
 
-use Driver\SQL\Expression\Expression;
+use Core\Driver\SQL\Expression\Expression;
 
 class Keyword extends Expression {
 
diff --git a/core/Driver/SQL/MySQL.class.php b/Core/Driver/SQL/MySQL.class.php
similarity index 93%
rename from core/Driver/SQL/MySQL.class.php
rename to Core/Driver/SQL/MySQL.class.php
index 0c27c00..e9c0f77 100644
--- a/core/Driver/SQL/MySQL.class.php
+++ b/Core/Driver/SQL/MySQL.class.php
@@ -1,34 +1,34 @@
 <?php
 
-namespace Driver\SQL;
+namespace Core\Driver\SQL;
 
-use \Api\Parameter\Parameter;
+use Core\API\Parameter\Parameter;
 
 use DateTime;
-use \Driver\SQL\Column\Column;
-use \Driver\SQL\Column\IntColumn;
-use Driver\SQL\Column\NumericColumn;
-use \Driver\SQL\Column\SerialColumn;
-use \Driver\SQL\Column\StringColumn;
-use \Driver\SQL\Column\EnumColumn;
-use \Driver\SQL\Column\DateTimeColumn;
-use Driver\SQL\Column\BoolColumn;
-use Driver\SQL\Column\JsonColumn;
+use Core\Driver\SQL\Column\Column;
+use Core\Driver\SQL\Column\IntColumn;
+use Core\Driver\SQL\Column\NumericColumn;
+use Core\Driver\SQL\Column\SerialColumn;
+use Core\Driver\SQL\Column\StringColumn;
+use Core\Driver\SQL\Column\EnumColumn;
+use Core\Driver\SQL\Column\DateTimeColumn;
+use Core\Driver\SQL\Column\BoolColumn;
+use Core\Driver\SQL\Column\JsonColumn;
 
-use Driver\SQL\Expression\Add;
-use Driver\SQL\Expression\CurrentTimeStamp;
-use Driver\SQL\Expression\DateAdd;
-use Driver\SQL\Expression\DateSub;
-use Driver\SQL\Expression\Expression;
-use Driver\SQL\Expression\JsonArrayAgg;
-use Driver\SQL\Query\CreateProcedure;
-use Driver\SQL\Query\CreateTrigger;
-use Driver\SQL\Query\Query;
-use Driver\SQL\Strategy\Strategy;
-use \Driver\SQL\Strategy\UpdateStrategy;
-use Driver\SQL\Type\CurrentColumn;
-use Driver\SQL\Type\CurrentTable;
-use Driver\SQL\Type\Trigger;
+use Core\Driver\SQL\Expression\Add;
+use Core\Driver\SQL\Expression\CurrentTimeStamp;
+use Core\Driver\SQL\Expression\DateAdd;
+use Core\Driver\SQL\Expression\DateSub;
+use Core\Driver\SQL\Expression\Expression;
+use Core\Driver\SQL\Expression\JsonArrayAgg;
+use Core\Driver\SQL\Query\CreateProcedure;
+use Core\Driver\SQL\Query\CreateTrigger;
+use Core\Driver\SQL\Query\Query;
+use Core\Driver\SQL\Strategy\Strategy;
+use Core\Driver\SQL\Strategy\UpdateStrategy;
+use Core\Driver\SQL\Type\CurrentColumn;
+use Core\Driver\SQL\Type\CurrentTable;
+use Core\Driver\SQL\Type\Trigger;
 
 class MySQL extends SQL {
 
diff --git a/core/Driver/SQL/PostgreSQL.class.php b/Core/Driver/SQL/PostgreSQL.class.php
similarity index 93%
rename from core/Driver/SQL/PostgreSQL.class.php
rename to Core/Driver/SQL/PostgreSQL.class.php
index 35f5733..da1b0c4 100644
--- a/core/Driver/SQL/PostgreSQL.class.php
+++ b/Core/Driver/SQL/PostgreSQL.class.php
@@ -1,35 +1,35 @@
 <?php
 
-namespace Driver\SQL;
+namespace Core\Driver\SQL;
 
-use \Api\Parameter\Parameter;
+use Core\API\Parameter\Parameter;
 
-use Driver\SQL\Column\Column;
-use \Driver\SQL\Column\IntColumn;
-use Driver\SQL\Column\NumericColumn;
-use \Driver\SQL\Column\SerialColumn;
-use \Driver\SQL\Column\StringColumn;
-use \Driver\SQL\Column\EnumColumn;
-use \Driver\SQL\Column\DateTimeColumn;
-use Driver\SQL\Column\BoolColumn;
-use Driver\SQL\Column\JsonColumn;
+use Core\Driver\SQL\Column\Column;
+use Core\Driver\SQL\Column\IntColumn;
+use Core\Driver\SQL\Column\NumericColumn;
+use Core\Driver\SQL\Column\SerialColumn;
+use Core\Driver\SQL\Column\StringColumn;
+use Core\Driver\SQL\Column\EnumColumn;
+use Core\Driver\SQL\Column\DateTimeColumn;
+use Core\Driver\SQL\Column\BoolColumn;
+use Core\Driver\SQL\Column\JsonColumn;
 
-use Driver\SQL\Condition\CondRegex;
-use Driver\SQL\Expression\Add;
-use Driver\SQL\Expression\CurrentTimeStamp;
-use Driver\SQL\Expression\DateAdd;
-use Driver\SQL\Expression\DateSub;
-use Driver\SQL\Expression\Expression;
-use Driver\SQL\Expression\JsonArrayAgg;
-use Driver\SQL\Query\CreateProcedure;
-use Driver\SQL\Query\CreateTrigger;
-use Driver\SQL\Query\Insert;
-use Driver\SQL\Query\Query;
-use Driver\SQL\Strategy\Strategy;
-use Driver\SQL\Strategy\UpdateStrategy;
-use Driver\SQL\Type\CurrentColumn;
-use Driver\SQL\Type\CurrentTable;
-use Driver\SQL\Type\Trigger;
+use Core\Driver\SQL\Condition\CondRegex;
+use Core\Driver\SQL\Expression\Add;
+use Core\Driver\SQL\Expression\CurrentTimeStamp;
+use Core\Driver\SQL\Expression\DateAdd;
+use Core\Driver\SQL\Expression\DateSub;
+use Core\Driver\SQL\Expression\Expression;
+use Core\Driver\SQL\Expression\JsonArrayAgg;
+use Core\Driver\SQL\Query\CreateProcedure;
+use Core\Driver\SQL\Query\CreateTrigger;
+use Core\Driver\SQL\Query\Insert;
+use Core\Driver\SQL\Query\Query;
+use Core\Driver\SQL\Strategy\Strategy;
+use Core\Driver\SQL\Strategy\UpdateStrategy;
+use Core\Driver\SQL\Type\CurrentColumn;
+use Core\Driver\SQL\Type\CurrentTable;
+use Core\Driver\SQL\Type\Trigger;
 
 class PostgreSQL extends SQL {
 
diff --git a/core/Driver/SQL/Query/AlterTable.class.php b/Core/Driver/SQL/Query/AlterTable.class.php
similarity index 83%
rename from core/Driver/SQL/Query/AlterTable.class.php
rename to Core/Driver/SQL/Query/AlterTable.class.php
index a5dcf1d..b65afb4 100644
--- a/core/Driver/SQL/Query/AlterTable.class.php
+++ b/Core/Driver/SQL/Query/AlterTable.class.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\Column\Column;
-use Driver\SQL\Column\EnumColumn;
-use Driver\SQL\Constraint\Constraint;
-use Driver\SQL\Constraint\ForeignKey;
-use Driver\SQL\Constraint\PrimaryKey;
-use Driver\SQL\PostgreSQL;
-use Driver\SQL\SQL;
+use Core\Driver\SQL\Column\Column;
+use Core\Driver\SQL\Column\EnumColumn;
+use Core\Driver\SQL\Constraint\Constraint;
+use Core\Driver\SQL\Constraint\ForeignKey;
+use Core\Driver\SQL\Constraint\PrimaryKey;
+use Core\Driver\SQL\PostgreSQL;
+use Core\Driver\SQL\SQL;
 
 class AlterTable extends Query {
 
@@ -107,10 +107,14 @@ class AlterTable extends Query {
       if ($action === "DROP") {
         if ($constraint instanceof PrimaryKey) {
           $query .= "PRIMARY KEY";
-        } else if ($constraint instanceof ForeignKey) {
-          // TODO: how can we pass the constraint name here?
-          $this->sql->setLastError("DROP CONSTRAINT foreign key is not supported yet.");
-          return null;
+        } else {
+          $constraintName = $constraint->getName();
+          if ($constraintName) {
+            $query .= "CONSTRAINT " . $this->sql->columnName($constraintName);
+          } else {
+            $this->sql->setLastError("Cannot DROP CONSTRAINT without a constraint name.");
+            return null;
+          }
         }
       } else if ($action === "ADD") {
         $query .= "CONSTRAINT ";
diff --git a/core/Driver/SQL/Query/Commit.class.php b/Core/Driver/SQL/Query/Commit.class.php
similarity index 76%
rename from core/Driver/SQL/Query/Commit.class.php
rename to Core/Driver/SQL/Query/Commit.class.php
index a6b9c34..4188fa0 100644
--- a/core/Driver/SQL/Query/Commit.class.php
+++ b/Core/Driver/SQL/Query/Commit.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 class Commit extends Query {
   public function __construct(SQL $sql) {
diff --git a/core/Driver/SQL/Query/CreateProcedure.class.php b/Core/Driver/SQL/Query/CreateProcedure.class.php
similarity index 92%
rename from core/Driver/SQL/Query/CreateProcedure.class.php
rename to Core/Driver/SQL/Query/CreateProcedure.class.php
index 7bf3d8e..6b19a24 100644
--- a/core/Driver/SQL/Query/CreateProcedure.class.php
+++ b/Core/Driver/SQL/Query/CreateProcedure.class.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\Column\Column;
-use Driver\SQL\SQL;
+use Core\Driver\SQL\Column\Column;
+use Core\Driver\SQL\SQL;
 
 class CreateProcedure extends Query {
 
diff --git a/core/Driver/SQL/Query/CreateTable.class.php b/Core/Driver/SQL/Query/CreateTable.class.php
similarity index 79%
rename from core/Driver/SQL/Query/CreateTable.class.php
rename to Core/Driver/SQL/Query/CreateTable.class.php
index 37aab82..f4aa6c0 100644
--- a/core/Driver/SQL/Query/CreateTable.class.php
+++ b/Core/Driver/SQL/Query/CreateTable.class.php
@@ -1,26 +1,26 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\Column\BigIntColumn;
-use Driver\SQL\Column\Column;
-use Driver\SQL\Column\DoubleColumn;
-use Driver\SQL\Column\FloatColumn;
-use Driver\SQL\Column\NumericColumn;
-use Driver\SQL\Column\SerialColumn;
-use Driver\SQL\Column\StringColumn;
-use Driver\SQL\Column\IntColumn;
-use Driver\SQL\Column\DateTimeColumn;
-use Driver\SQL\Column\EnumColumn;
-use Driver\SQL\Column\BoolColumn;
-use Driver\SQL\Column\JsonColumn;
+use Core\Driver\SQL\Column\BigIntColumn;
+use Core\Driver\SQL\Column\Column;
+use Core\Driver\SQL\Column\DoubleColumn;
+use Core\Driver\SQL\Column\FloatColumn;
+use Core\Driver\SQL\Column\NumericColumn;
+use Core\Driver\SQL\Column\SerialColumn;
+use Core\Driver\SQL\Column\StringColumn;
+use Core\Driver\SQL\Column\IntColumn;
+use Core\Driver\SQL\Column\DateTimeColumn;
+use Core\Driver\SQL\Column\EnumColumn;
+use Core\Driver\SQL\Column\BoolColumn;
+use Core\Driver\SQL\Column\JsonColumn;
 
-use Driver\SQL\Constraint\Constraint;
-use Driver\SQL\Constraint\PrimaryKey;
-use Driver\SQL\Constraint\Unique;
-use Driver\SQL\Constraint\ForeignKey;
-use Driver\SQL\SQL;
-use Driver\SQL\Strategy\Strategy;
+use Core\Driver\SQL\Constraint\Constraint;
+use Core\Driver\SQL\Constraint\PrimaryKey;
+use Core\Driver\SQL\Constraint\Unique;
+use Core\Driver\SQL\Constraint\ForeignKey;
+use Core\Driver\SQL\SQL;
+use Core\Driver\SQL\Strategy\Strategy;
 
 class CreateTable extends Query {
 
@@ -103,7 +103,9 @@ class CreateTable extends Query {
   }
 
   public function primaryKey(...$names): CreateTable {
-    $this->constraints[] = new PrimaryKey($names);
+    $pk = new PrimaryKey($names);
+    $pk->setName(strtolower("pk_{$this->tableName}"));
+    $this->constraints[] = $pk;
     return $this;
   }
 
@@ -112,8 +114,10 @@ class CreateTable extends Query {
     return $this;
   }
 
-  public function foreignKey(string $name, string $refTable, string $refColumn, ?Strategy $strategy = NULL): CreateTable {
-    $this->constraints[] = new ForeignKey($name, $refTable, $refColumn, $strategy);
+  public function foreignKey(string $column, string $refTable, string $refColumn, ?Strategy $strategy = NULL): CreateTable {
+    $fk = new ForeignKey($column, $refTable, $refColumn, $strategy);
+    $fk->setName(strtolower("fk_{$this->tableName}_${refTable}_${refColumn}"));
+    $this->constraints[] = $fk;
     return $this;
   }
 
diff --git a/core/Driver/SQL/Query/CreateTrigger.class.php b/Core/Driver/SQL/Query/CreateTrigger.class.php
similarity index 96%
rename from core/Driver/SQL/Query/CreateTrigger.class.php
rename to Core/Driver/SQL/Query/CreateTrigger.class.php
index 4f0344e..1552028 100644
--- a/core/Driver/SQL/Query/CreateTrigger.class.php
+++ b/Core/Driver/SQL/Query/CreateTrigger.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Api\User\Create;
-use Driver\SQL\SQL;
+use Core\API\User\Create;
+use Core\Driver\SQL\SQL;
 
 class CreateTrigger extends Query {
 
diff --git a/core/Driver/SQL/Query/Delete.class.php b/Core/Driver/SQL/Query/Delete.class.php
similarity index 88%
rename from core/Driver/SQL/Query/Delete.class.php
rename to Core/Driver/SQL/Query/Delete.class.php
index 5a5118a..2610c17 100644
--- a/core/Driver/SQL/Query/Delete.class.php
+++ b/Core/Driver/SQL/Query/Delete.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\Condition\CondOr;
-use Driver\SQL\SQL;
+use Core\Driver\SQL\Condition\CondOr;
+use Core\Driver\SQL\SQL;
 
 class Delete extends Query {
 
diff --git a/core/Driver/SQL/Query/Drop.php b/Core/Driver/SQL/Query/Drop.php
similarity index 88%
rename from core/Driver/SQL/Query/Drop.php
rename to Core/Driver/SQL/Query/Drop.php
index 74a1802..2c01597 100644
--- a/core/Driver/SQL/Query/Drop.php
+++ b/Core/Driver/SQL/Query/Drop.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 class Drop extends Query {
 
diff --git a/core/Driver/SQL/Query/Insert.class.php b/Core/Driver/SQL/Query/Insert.class.php
similarity index 95%
rename from core/Driver/SQL/Query/Insert.class.php
rename to Core/Driver/SQL/Query/Insert.class.php
index ca1ab23..339e3c0 100644
--- a/core/Driver/SQL/Query/Insert.class.php
+++ b/Core/Driver/SQL/Query/Insert.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\SQL;
-use Driver\SQL\Strategy\Strategy;
+use Core\Driver\SQL\SQL;
+use Core\Driver\SQL\Strategy\Strategy;
 
 class Insert extends Query {
 
diff --git a/core/Driver/SQL/Query/Query.class.php b/Core/Driver/SQL/Query/Query.class.php
similarity index 82%
rename from core/Driver/SQL/Query/Query.class.php
rename to Core/Driver/SQL/Query/Query.class.php
index 1fbe3b4..6a9fd82 100644
--- a/core/Driver/SQL/Query/Query.class.php
+++ b/Core/Driver/SQL/Query/Query.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\Expression\Expression;
-use Driver\SQL\SQL;
+use Core\Driver\SQL\Expression\Expression;
+use Core\Driver\SQL\SQL;
 
 abstract class Query extends Expression {
 
diff --git a/core/Driver/SQL/Query/RollBack.class.php b/Core/Driver/SQL/Query/RollBack.class.php
similarity index 76%
rename from core/Driver/SQL/Query/RollBack.class.php
rename to Core/Driver/SQL/Query/RollBack.class.php
index b2c8b72..36db2d3 100644
--- a/core/Driver/SQL/Query/RollBack.class.php
+++ b/Core/Driver/SQL/Query/RollBack.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 class RollBack extends Query {
   public function __construct(SQL $sql) {
diff --git a/core/Driver/SQL/Query/Select.class.php b/Core/Driver/SQL/Query/Select.class.php
similarity index 97%
rename from core/Driver/SQL/Query/Select.class.php
rename to Core/Driver/SQL/Query/Select.class.php
index 31ac8e4..942b1d6 100644
--- a/core/Driver/SQL/Query/Select.class.php
+++ b/Core/Driver/SQL/Query/Select.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\Condition\CondOr;
-use Driver\SQL\Expression\JsonArrayAgg;
-use Driver\SQL\Join;
-use Driver\SQL\SQL;
+use Core\Driver\SQL\Condition\CondOr;
+use Core\Driver\SQL\Expression\JsonArrayAgg;
+use Core\Driver\SQL\Join;
+use Core\Driver\SQL\SQL;
 
 class Select extends Query {
 
diff --git a/core/Driver/SQL/Query/StartTransaction.class.php b/Core/Driver/SQL/Query/StartTransaction.class.php
similarity index 78%
rename from core/Driver/SQL/Query/StartTransaction.class.php
rename to Core/Driver/SQL/Query/StartTransaction.class.php
index 753bceb..fc52012 100644
--- a/core/Driver/SQL/Query/StartTransaction.class.php
+++ b/Core/Driver/SQL/Query/StartTransaction.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 class StartTransaction extends Query {
   public function __construct(SQL $sql) {
diff --git a/core/Driver/SQL/Query/Truncate.class.php b/Core/Driver/SQL/Query/Truncate.class.php
similarity index 86%
rename from core/Driver/SQL/Query/Truncate.class.php
rename to Core/Driver/SQL/Query/Truncate.class.php
index 68ceb2c..bc027c6 100644
--- a/core/Driver/SQL/Query/Truncate.class.php
+++ b/Core/Driver/SQL/Query/Truncate.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\SQL;
+use Core\Driver\SQL\SQL;
 
 class Truncate extends Query {
 
diff --git a/core/Driver/SQL/Query/Update.class.php b/Core/Driver/SQL/Query/Update.class.php
similarity index 92%
rename from core/Driver/SQL/Query/Update.class.php
rename to Core/Driver/SQL/Query/Update.class.php
index 51698a1..697b3b2 100644
--- a/core/Driver/SQL/Query/Update.class.php
+++ b/Core/Driver/SQL/Query/Update.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Driver\SQL\Query;
+namespace Core\Driver\SQL\Query;
 
-use Driver\SQL\Condition\CondOr;
-use Driver\SQL\SQL;
+use Core\Driver\SQL\Condition\CondOr;
+use Core\Driver\SQL\SQL;
 
 class Update extends Query {
 
diff --git a/core/Driver/SQL/RowIterator.class.php b/Core/Driver/SQL/RowIterator.class.php
similarity index 96%
rename from core/Driver/SQL/RowIterator.class.php
rename to Core/Driver/SQL/RowIterator.class.php
index 3f3d031..437d34c 100644
--- a/core/Driver/SQL/RowIterator.class.php
+++ b/Core/Driver/SQL/RowIterator.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL;
+namespace Core\Driver\SQL;
 
 abstract class RowIterator implements \Iterator {
 
diff --git a/core/Driver/SQL/SQL.class.php b/Core/Driver/SQL/SQL.class.php
similarity index 90%
rename from core/Driver/SQL/SQL.class.php
rename to Core/Driver/SQL/SQL.class.php
index e61b4e4..3d16292 100644
--- a/core/Driver/SQL/SQL.class.php
+++ b/Core/Driver/SQL/SQL.class.php
@@ -1,43 +1,43 @@
 <?php
 
-namespace Driver\SQL;
+namespace Core\Driver\SQL;
 
-use Driver\Logger\Logger;
-use Driver\SQL\Column\Column;
-use Driver\SQL\Condition\Compare;
-use Driver\SQL\Condition\CondAnd;
-use Driver\SQL\Condition\CondBool;
-use Driver\SQL\Condition\CondIn;
-use Driver\SQL\Condition\Condition;
-use Driver\SQL\Condition\CondKeyword;
-use Driver\SQL\Condition\CondNot;
-use Driver\Sql\Condition\CondNull;
-use Driver\SQL\Condition\CondOr;
-use Driver\SQL\Condition\Exists;
-use Driver\SQL\Constraint\Constraint;
-use Driver\SQL\Constraint\Unique;
-use Driver\SQL\Constraint\PrimaryKey;
-use Driver\SQL\Constraint\ForeignKey;
-use Driver\SQL\Expression\CaseWhen;
-use Driver\SQL\Expression\CurrentTimeStamp;
-use Driver\SQL\Expression\Expression;
-use Driver\SQL\Expression\Sum;
-use Driver\SQL\Query\AlterTable;
-use Driver\SQL\Query\CreateProcedure;
-use Driver\SQL\Query\CreateTable;
-use Driver\SQL\Query\CreateTrigger;
-use Driver\SQL\Query\Delete;
-use Driver\SQL\Query\Drop;
-use Driver\SQL\Query\Insert;
-use Driver\SQL\Query\Query;
-use Driver\SQL\Query\Select;
-use Driver\SQL\Query\Truncate;
-use Driver\SQL\Query\Update;
-use Driver\SQL\Strategy\CascadeStrategy;
-use Driver\SQL\Strategy\SetDefaultStrategy;
-use Driver\SQL\Strategy\SetNullStrategy;
-use Driver\SQL\Strategy\Strategy;
-use Objects\ConnectionData;
+use Core\Driver\Logger\Logger;
+use Core\Driver\SQL\Column\Column;
+use Core\Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Condition\CondAnd;
+use Core\Driver\SQL\Condition\CondBool;
+use Core\Driver\SQL\Condition\CondIn;
+use Core\Driver\SQL\Condition\Condition;
+use Core\Driver\SQL\Condition\CondKeyword;
+use Core\Driver\SQL\Condition\CondNot;
+use Core\Driver\Sql\Condition\CondNull;
+use Core\Driver\SQL\Condition\CondOr;
+use Core\Driver\SQL\Condition\Exists;
+use Core\Driver\SQL\Constraint\Constraint;
+use Core\Driver\SQL\Constraint\Unique;
+use Core\Driver\SQL\Constraint\PrimaryKey;
+use Core\Driver\SQL\Constraint\ForeignKey;
+use Core\Driver\SQL\Expression\CaseWhen;
+use Core\Driver\SQL\Expression\CurrentTimeStamp;
+use Core\Driver\SQL\Expression\Expression;
+use Core\Driver\SQL\Expression\Sum;
+use Core\Driver\SQL\Query\AlterTable;
+use Core\Driver\SQL\Query\CreateProcedure;
+use Core\Driver\SQL\Query\CreateTable;
+use Core\Driver\SQL\Query\CreateTrigger;
+use Core\Driver\SQL\Query\Delete;
+use Core\Driver\SQL\Query\Drop;
+use Core\Driver\SQL\Query\Insert;
+use Core\Driver\SQL\Query\Query;
+use Core\Driver\SQL\Query\Select;
+use Core\Driver\SQL\Query\Truncate;
+use Core\Driver\SQL\Query\Update;
+use Core\Driver\SQL\Strategy\CascadeStrategy;
+use Core\Driver\SQL\Strategy\SetDefaultStrategy;
+use Core\Driver\SQL\Strategy\SetNullStrategy;
+use Core\Driver\SQL\Strategy\Strategy;
+use Core\Objects\ConnectionData;
 
 abstract class SQL {
 
@@ -190,6 +190,7 @@ abstract class SQL {
 
   public function getConstraintDefinition(Constraint $constraint): ?string {
     $columnName = $this->columnName($constraint->getColumnNames());
+
     if ($constraint instanceof PrimaryKey) {
       return "PRIMARY KEY ($columnName)";
     } else if ($constraint instanceof Unique) {
diff --git a/core/Driver/SQL/Strategy/CascadeStrategy.class.php b/Core/Driver/SQL/Strategy/CascadeStrategy.class.php
similarity index 70%
rename from core/Driver/SQL/Strategy/CascadeStrategy.class.php
rename to Core/Driver/SQL/Strategy/CascadeStrategy.class.php
index b72f5db..0be359f 100644
--- a/core/Driver/SQL/Strategy/CascadeStrategy.class.php
+++ b/Core/Driver/SQL/Strategy/CascadeStrategy.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Strategy;
+namespace Core\Driver\SQL\Strategy;
 
 class CascadeStrategy extends Strategy {
 
diff --git a/core/Driver/SQL/Strategy/SetDefaultStrategy.class.php b/Core/Driver/SQL/Strategy/SetDefaultStrategy.class.php
similarity index 71%
rename from core/Driver/SQL/Strategy/SetDefaultStrategy.class.php
rename to Core/Driver/SQL/Strategy/SetDefaultStrategy.class.php
index 8b5c77a..71a63ea 100644
--- a/core/Driver/SQL/Strategy/SetDefaultStrategy.class.php
+++ b/Core/Driver/SQL/Strategy/SetDefaultStrategy.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Strategy;
+namespace Core\Driver\SQL\Strategy;
 
 class SetDefaultStrategy extends Strategy {
 
diff --git a/core/Driver/SQL/Strategy/SetNullStrategy.class.php b/Core/Driver/SQL/Strategy/SetNullStrategy.class.php
similarity index 70%
rename from core/Driver/SQL/Strategy/SetNullStrategy.class.php
rename to Core/Driver/SQL/Strategy/SetNullStrategy.class.php
index 5d4f35a..444d197 100644
--- a/core/Driver/SQL/Strategy/SetNullStrategy.class.php
+++ b/Core/Driver/SQL/Strategy/SetNullStrategy.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Strategy;
+namespace Core\Driver\SQL\Strategy;
 
 class SetNullStrategy extends Strategy {
 
diff --git a/Core/Driver/SQL/Strategy/Strategy.class.php b/Core/Driver/SQL/Strategy/Strategy.class.php
new file mode 100644
index 0000000..edb4763
--- /dev/null
+++ b/Core/Driver/SQL/Strategy/Strategy.class.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Core\Driver\SQL\Strategy;
+
+abstract class Strategy {
+
+}
\ No newline at end of file
diff --git a/core/Driver/SQL/Strategy/UpdateStrategy.class.php b/Core/Driver/SQL/Strategy/UpdateStrategy.class.php
similarity index 92%
rename from core/Driver/SQL/Strategy/UpdateStrategy.class.php
rename to Core/Driver/SQL/Strategy/UpdateStrategy.class.php
index 6044415..5a7cf3e 100644
--- a/core/Driver/SQL/Strategy/UpdateStrategy.class.php
+++ b/Core/Driver/SQL/Strategy/UpdateStrategy.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Driver\SQL\Strategy;
+namespace Core\Driver\SQL\Strategy;
 
 class UpdateStrategy extends Strategy {
 
diff --git a/core/Driver/SQL/Type/CurrentColumn.php b/Core/Driver/SQL/Type/CurrentColumn.php
similarity index 66%
rename from core/Driver/SQL/Type/CurrentColumn.php
rename to Core/Driver/SQL/Type/CurrentColumn.php
index b95d86f..8081972 100644
--- a/core/Driver/SQL/Type/CurrentColumn.php
+++ b/Core/Driver/SQL/Type/CurrentColumn.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Driver\SQL\Type;
+namespace Core\Driver\SQL\Type;
 
 
-use Driver\SQL\Column\Column;
+use Core\Driver\SQL\Column\Column;
 
 class CurrentColumn extends Column {
 
diff --git a/core/Driver/SQL/Type/CurrentTable.class.php b/Core/Driver/SQL/Type/CurrentTable.class.php
similarity index 63%
rename from core/Driver/SQL/Type/CurrentTable.class.php
rename to Core/Driver/SQL/Type/CurrentTable.class.php
index f0a858a..458d239 100644
--- a/core/Driver/SQL/Type/CurrentTable.class.php
+++ b/Core/Driver/SQL/Type/CurrentTable.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Type;
+namespace Core\Driver\SQL\Type;
 
-use Driver\SQL\Column\StringColumn;
+use Core\Driver\SQL\Column\StringColumn;
 
 class CurrentTable extends StringColumn {
   public function __construct() {
diff --git a/core/Driver/SQL/Type/Trigger.class.php b/Core/Driver/SQL/Type/Trigger.class.php
similarity index 64%
rename from core/Driver/SQL/Type/Trigger.class.php
rename to Core/Driver/SQL/Type/Trigger.class.php
index 09ef168..7c063c2 100644
--- a/core/Driver/SQL/Type/Trigger.class.php
+++ b/Core/Driver/SQL/Type/Trigger.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Driver\SQL\Type;
+namespace Core\Driver\SQL\Type;
 
-use Driver\SQL\Keyword;
+use Core\Driver\SQL\Keyword;
 
 class Trigger extends Keyword {
   public function __construct() {
diff --git a/core/Elements/Body.class.php b/Core/Elements/Body.class.php
similarity index 82%
rename from core/Elements/Body.class.php
rename to Core/Elements/Body.class.php
index 196961a..4315e13 100644
--- a/core/Elements/Body.class.php
+++ b/Core/Elements/Body.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 abstract class Body extends View {
   public function __construct($document) {
diff --git a/core/Elements/Document.class.php b/Core/Elements/Document.class.php
similarity index 89%
rename from core/Elements/Document.class.php
rename to Core/Elements/Document.class.php
index 1a0f95a..b8c1ab8 100644
--- a/core/Elements/Document.class.php
+++ b/Core/Elements/Document.class.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
-use Configuration\Settings;
-use Driver\Logger\Logger;
-use Driver\SQL\SQL;
-use Objects\Context;
-use Objects\lang\LanguageModule;
-use Objects\Router\DocumentRoute;
-use Objects\Router\Router;
-use Objects\DatabaseEntity\User;
-use Objects\Search\Searchable;
-use Objects\Search\SearchQuery;
-use Objects\Search\SearchResult;
+use Core\Configuration\Settings;
+use Core\Driver\Logger\Logger;
+use Core\Driver\SQL\SQL;
+use Core\Objects\Context;
+use Core\Objects\lang\LanguageModule;
+use Core\Objects\Router\DocumentRoute;
+use Core\Objects\Router\Router;
+use Core\Objects\DatabaseEntity\User;
+use Core\Objects\Search\Searchable;
+use Core\Objects\Search\SearchQuery;
+use Core\Objects\Search\SearchResult;
 
 abstract class Document {
 
diff --git a/core/Elements/EmptyHead.class.php b/Core/Elements/EmptyHead.class.php
similarity index 93%
rename from core/Elements/EmptyHead.class.php
rename to Core/Elements/EmptyHead.class.php
index 2b877c0..f7bfc90 100644
--- a/core/Elements/EmptyHead.class.php
+++ b/Core/Elements/EmptyHead.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 class EmptyHead extends Head {
 
diff --git a/core/Elements/Head.class.php b/Core/Elements/Head.class.php
similarity index 99%
rename from core/Elements/Head.class.php
rename to Core/Elements/Head.class.php
index f615252..cbb8a08 100644
--- a/core/Elements/Head.class.php
+++ b/Core/Elements/Head.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 abstract class Head extends View {
 
diff --git a/core/Elements/HtmlDocument.class.php b/Core/Elements/HtmlDocument.class.php
similarity index 96%
rename from core/Elements/HtmlDocument.class.php
rename to Core/Elements/HtmlDocument.class.php
index cec2ce6..e6e69c6 100644
--- a/core/Elements/HtmlDocument.class.php
+++ b/Core/Elements/HtmlDocument.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
-use Objects\Router\Router;
+use Core\Objects\Router\Router;
 
 class HtmlDocument extends Document {
 
diff --git a/core/Elements/Link.class.php b/Core/Elements/Link.class.php
similarity index 97%
rename from core/Elements/Link.class.php
rename to Core/Elements/Link.class.php
index 1c4f19d..77ea1a1 100644
--- a/core/Elements/Link.class.php
+++ b/Core/Elements/Link.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 class Link extends StaticView {
 
diff --git a/core/Elements/Script.class.php b/Core/Elements/Script.class.php
similarity index 97%
rename from core/Elements/Script.class.php
rename to Core/Elements/Script.class.php
index 305d688..b967cac 100644
--- a/core/Elements/Script.class.php
+++ b/Core/Elements/Script.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 class Script extends StaticView {
 
diff --git a/core/Elements/SimpleBody.class.php b/Core/Elements/SimpleBody.class.php
similarity index 92%
rename from core/Elements/SimpleBody.class.php
rename to Core/Elements/SimpleBody.class.php
index 1c51ad0..9a210a3 100644
--- a/core/Elements/SimpleBody.class.php
+++ b/Core/Elements/SimpleBody.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 abstract class SimpleBody extends Body {
 
diff --git a/core/Elements/StaticView.class.php b/Core/Elements/StaticView.class.php
similarity index 84%
rename from core/Elements/StaticView.class.php
rename to Core/Elements/StaticView.class.php
index 8fc791c..050e5fb 100644
--- a/core/Elements/StaticView.class.php
+++ b/Core/Elements/StaticView.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 abstract class StaticView {
 
diff --git a/core/Elements/Style.class.php b/Core/Elements/Style.class.php
similarity index 91%
rename from core/Elements/Style.class.php
rename to Core/Elements/Style.class.php
index a7b34fe..89de595 100644
--- a/core/Elements/Style.class.php
+++ b/Core/Elements/Style.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 class Style extends StaticView {
 
diff --git a/core/Elements/TemplateDocument.class.php b/Core/Elements/TemplateDocument.class.php
similarity index 92%
rename from core/Elements/TemplateDocument.class.php
rename to Core/Elements/TemplateDocument.class.php
index 77004a9..e7ae1d5 100644
--- a/core/Elements/TemplateDocument.class.php
+++ b/Core/Elements/TemplateDocument.class.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
-use Objects\CustomTwigFunctions;
-use Objects\Router\DocumentRoute;
-use Objects\Router\Router;
-use Objects\Search\Searchable;
-use Objects\Search\SearchQuery;
-use Objects\Search\SearchResult;
+use Core\Objects\CustomTwigFunctions;
+use Core\Objects\Router\DocumentRoute;
+use Core\Objects\Router\Router;
+use Core\Objects\Search\Searchable;
+use Core\Objects\Search\SearchQuery;
+use Core\Objects\Search\SearchResult;
 use Twig\Environment;
 use Twig\Error\LoaderError;
 use Twig\Error\RuntimeError;
@@ -16,7 +16,7 @@ use Twig\Loader\FilesystemLoader;
 
 class TemplateDocument extends Document {
 
-  const TEMPLATE_PATH = WEBROOT . '/core/Templates';
+  const TEMPLATE_PATH = WEBROOT . '/Core/Templates';
 
   private string $templateName;
   protected array $parameters;
diff --git a/core/Elements/TemplateView.class.php b/Core/Elements/TemplateView.class.php
similarity index 96%
rename from core/Elements/TemplateView.class.php
rename to Core/Elements/TemplateView.class.php
index fc8adc4..fce9eee 100644
--- a/core/Elements/TemplateView.class.php
+++ b/Core/Elements/TemplateView.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 abstract class TemplateView extends View {
 
diff --git a/core/Elements/View.class.php b/Core/Elements/View.class.php
similarity index 99%
rename from core/Elements/View.class.php
rename to Core/Elements/View.class.php
index e8727ad..de3c3df 100644
--- a/core/Elements/View.class.php
+++ b/Core/Elements/View.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Elements;
+namespace Core\Elements;
 
 abstract class View extends StaticView {
 
diff --git a/core/External/.gitignore b/Core/External/.gitignore
similarity index 100%
rename from core/External/.gitignore
rename to Core/External/.gitignore
diff --git a/core/External/.htaccess b/Core/External/.htaccess
similarity index 100%
rename from core/External/.htaccess
rename to Core/External/.htaccess
diff --git a/core/External/PHPMailer/Exception.php b/Core/External/PHPMailer/Exception.php
similarity index 97%
rename from core/External/PHPMailer/Exception.php
rename to Core/External/PHPMailer/Exception.php
index 82a7cc7..f81f670 100644
--- a/core/External/PHPMailer/Exception.php
+++ b/Core/External/PHPMailer/Exception.php
@@ -19,7 +19,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-namespace External\PHPMailer;
+namespace Core\External\PHPMailer;
 
 /**
  * PHPMailer exception handler.
diff --git a/core/External/PHPMailer/OAuth.php b/Core/External/PHPMailer/OAuth.php
similarity index 99%
rename from core/External/PHPMailer/OAuth.php
rename to Core/External/PHPMailer/OAuth.php
index 7dfa9db..4539d90 100644
--- a/core/External/PHPMailer/OAuth.php
+++ b/Core/External/PHPMailer/OAuth.php
@@ -19,7 +19,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-namespace External\PHPMailer;
+namespace Core\External\PHPMailer;
 
 use League\OAuth2\Client\Grant\RefreshToken;
 use League\OAuth2\Client\Provider\AbstractProvider;
diff --git a/core/External/PHPMailer/PHPMailer.php b/Core/External/PHPMailer/PHPMailer.php
similarity index 99%
rename from core/External/PHPMailer/PHPMailer.php
rename to Core/External/PHPMailer/PHPMailer.php
index b6171f9..29f5bc5 100644
--- a/core/External/PHPMailer/PHPMailer.php
+++ b/Core/External/PHPMailer/PHPMailer.php
@@ -19,7 +19,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-namespace External\PHPMailer;
+namespace Core\External\PHPMailer;
 
 /**
  * PHPMailer - PHP email creation and transport class.
diff --git a/core/External/PHPMailer/POP3.php b/Core/External/PHPMailer/POP3.php
similarity index 99%
rename from core/External/PHPMailer/POP3.php
rename to Core/External/PHPMailer/POP3.php
index 9cc30b8..25e5fc3 100644
--- a/core/External/PHPMailer/POP3.php
+++ b/Core/External/PHPMailer/POP3.php
@@ -19,7 +19,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-namespace External\PHPMailer;
+namespace Core\External\PHPMailer;
 
 /**
  * PHPMailer POP-Before-SMTP Authentication Class.
diff --git a/core/External/PHPMailer/SMTP.php b/Core/External/PHPMailer/SMTP.php
similarity index 99%
rename from core/External/PHPMailer/SMTP.php
rename to Core/External/PHPMailer/SMTP.php
index 2a9e801..37d65fc 100644
--- a/core/External/PHPMailer/SMTP.php
+++ b/Core/External/PHPMailer/SMTP.php
@@ -19,7 +19,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-namespace External\PHPMailer;
+namespace Core\External\PHPMailer;
 
 /**
  * PHPMailer RFC821 SMTP email transport class.
diff --git a/core/External/ZipStream/BufferWriter.php b/Core/External/ZipStream/BufferWriter.php
similarity index 97%
rename from core/External/ZipStream/BufferWriter.php
rename to Core/External/ZipStream/BufferWriter.php
index 1b6ff58..327b3e9 100644
--- a/core/External/ZipStream/BufferWriter.php
+++ b/Core/External/ZipStream/BufferWriter.php
@@ -20,7 +20,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-namespace External\ZipStream {
+namespace Core\External\ZipStream {
   class BufferWriter implements Writer {
     private $stream = '';
     private $offset = 0;
diff --git a/core/External/ZipStream/File.php b/Core/External/ZipStream/File.php
similarity index 99%
rename from core/External/ZipStream/File.php
rename to Core/External/ZipStream/File.php
index 49d3e16..720058d 100644
--- a/core/External/ZipStream/File.php
+++ b/Core/External/ZipStream/File.php
@@ -20,7 +20,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-namespace External\ZipStream {
+namespace Core\External\ZipStream {
   class File {
     private $name;
     private $content = '';
diff --git a/core/External/ZipStream/FileStream.class.php b/Core/External/ZipStream/FileStream.class.php
similarity index 93%
rename from core/External/ZipStream/FileStream.class.php
rename to Core/External/ZipStream/FileStream.class.php
index b0cbb68..260a334 100644
--- a/core/External/ZipStream/FileStream.class.php
+++ b/Core/External/ZipStream/FileStream.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace External\ZipStream {
+namespace Core\External\ZipStream {
 
   use HashContext;
-  use Objects\AesStream;
+  use Core\Objects\AesStream;
 
   class FileStream extends File {
 
diff --git a/core/External/ZipStream/FileWriter.php b/Core/External/ZipStream/FileWriter.php
similarity index 97%
rename from core/External/ZipStream/FileWriter.php
rename to Core/External/ZipStream/FileWriter.php
index 5e83578..760d796 100644
--- a/core/External/ZipStream/FileWriter.php
+++ b/Core/External/ZipStream/FileWriter.php
@@ -20,7 +20,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-namespace External\ZipStream {
+namespace Core\External\ZipStream {
   class FileWriter implements Writer {
     private $offset = 0;
     private $fileHandle = false;
diff --git a/core/External/ZipStream/Writer.php b/Core/External/ZipStream/Writer.php
similarity index 96%
rename from core/External/ZipStream/Writer.php
rename to Core/External/ZipStream/Writer.php
index 33f64a8..a8e41e8 100644
--- a/core/External/ZipStream/Writer.php
+++ b/Core/External/ZipStream/Writer.php
@@ -20,7 +20,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-namespace External\ZipStream {
+namespace Core\External\ZipStream {
   interface Writer {
     public function write($data);
     public function close();
diff --git a/core/External/ZipStream/ZipStream.php b/Core/External/ZipStream/ZipStream.php
similarity index 99%
rename from core/External/ZipStream/ZipStream.php
rename to Core/External/ZipStream/ZipStream.php
index 5844ab3..05c40aa 100644
--- a/core/External/ZipStream/ZipStream.php
+++ b/Core/External/ZipStream/ZipStream.php
@@ -20,7 +20,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-namespace External\ZipStream {
+namespace Core\External\ZipStream {
   class ZipStream {
     private $writer = null;
     private array $files = [];
diff --git a/core/External/composer.json b/Core/External/composer.json
similarity index 100%
rename from core/External/composer.json
rename to Core/External/composer.json
diff --git a/core/External/composer.lock b/Core/External/composer.lock
similarity index 100%
rename from core/External/composer.lock
rename to Core/External/composer.lock
diff --git a/core/Logs/.htaccess b/Core/Logs/.htaccess
similarity index 100%
rename from core/Logs/.htaccess
rename to Core/Logs/.htaccess
diff --git a/core/Objects/AesStream.class.php b/Core/Objects/AesStream.class.php
similarity index 99%
rename from core/Objects/AesStream.class.php
rename to Core/Objects/AesStream.class.php
index dc8af7e..df37ec9 100644
--- a/core/Objects/AesStream.class.php
+++ b/Core/Objects/AesStream.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects;
+namespace Core\Objects;
 
 class AesStream {
 
diff --git a/core/Objects/ApiObject.class.php b/Core/Objects/ApiObject.class.php
similarity index 89%
rename from core/Objects/ApiObject.class.php
rename to Core/Objects/ApiObject.class.php
index c894aa1..036b7d3 100644
--- a/core/Objects/ApiObject.class.php
+++ b/Core/Objects/ApiObject.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects;
+namespace Core\Objects;
 
 abstract class ApiObject implements \JsonSerializable {
 
diff --git a/core/Objects/ConnectionData.class.php b/Core/Objects/ConnectionData.class.php
similarity index 97%
rename from core/Objects/ConnectionData.class.php
rename to Core/Objects/ConnectionData.class.php
index 30b10dc..3a620ca 100644
--- a/core/Objects/ConnectionData.class.php
+++ b/Core/Objects/ConnectionData.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects;
+namespace Core\Objects;
 
 class ConnectionData {
 
diff --git a/core/Objects/Context.class.php b/Core/Objects/Context.class.php
similarity index 92%
rename from core/Objects/Context.class.php
rename to Core/Objects/Context.class.php
index 1178ec0..4a38e5c 100644
--- a/core/Objects/Context.class.php
+++ b/Core/Objects/Context.class.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Objects;
+namespace Core\Objects;
 
-use Configuration\Configuration;
-use Configuration\Settings;
-use Driver\SQL\Condition\Compare;
-use Driver\SQL\Condition\CondLike;
-use Driver\SQL\Condition\CondOr;
-use Driver\SQL\SQL;
+use Core\Configuration\Configuration;
+use Core\Configuration\Settings;
+use Core\Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Condition\CondLike;
+use Core\Driver\SQL\Condition\CondOr;
+use Core\Driver\SQL\SQL;
 use Firebase\JWT\JWT;
-use Objects\DatabaseEntity\Language;
-use Objects\DatabaseEntity\Session;
-use Objects\DatabaseEntity\User;
-use Objects\Router\Router;
+use Core\Objects\DatabaseEntity\Language;
+use Core\Objects\DatabaseEntity\Session;
+use Core\Objects\DatabaseEntity\User;
+use Core\Objects\Router\Router;
 
 class Context {
 
@@ -146,7 +146,7 @@ class Context {
       }
 
       $cookie = $_COOKIE["PHPSESSID"];
-      $req = new \Api\Visitors\ProcessVisit($this);
+      $req = new \Core\API\Visitors\ProcessVisit($this);
       $req->execute(["cookie" => $cookie]);
     }
   }
diff --git a/core/Objects/CustomTwigFunctions.class.php b/Core/Objects/CustomTwigFunctions.class.php
similarity index 92%
rename from core/Objects/CustomTwigFunctions.class.php
rename to Core/Objects/CustomTwigFunctions.class.php
index 5399993..ba0934b 100644
--- a/core/Objects/CustomTwigFunctions.class.php
+++ b/Core/Objects/CustomTwigFunctions.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects;
+namespace Core\Objects;
 
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
diff --git a/core/Objects/DatabaseEntity/ApiKey.class.php b/Core/Objects/DatabaseEntity/ApiKey.class.php
similarity index 84%
rename from core/Objects/DatabaseEntity/ApiKey.class.php
rename to Core/Objects/DatabaseEntity/ApiKey.class.php
index a33e04a..7a99ff6 100644
--- a/core/Objects/DatabaseEntity/ApiKey.class.php
+++ b/Core/Objects/DatabaseEntity/ApiKey.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
 
 class ApiKey extends DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/Attribute/DefaultValue.class.php b/Core/Objects/DatabaseEntity/Attribute/DefaultValue.class.php
similarity index 87%
rename from core/Objects/DatabaseEntity/Attribute/DefaultValue.class.php
rename to Core/Objects/DatabaseEntity/Attribute/DefaultValue.class.php
index 37fe236..fe55c20 100644
--- a/core/Objects/DatabaseEntity/Attribute/DefaultValue.class.php
+++ b/Core/Objects/DatabaseEntity/Attribute/DefaultValue.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\DatabaseEntity\Attribute;
+namespace Core\Objects\DatabaseEntity\Attribute;
 
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class DefaultValue {
 
diff --git a/core/Objects/DatabaseEntity/Attribute/Enum.class.php b/Core/Objects/DatabaseEntity/Attribute/Enum.class.php
similarity index 83%
rename from core/Objects/DatabaseEntity/Attribute/Enum.class.php
rename to Core/Objects/DatabaseEntity/Attribute/Enum.class.php
index 084b286..6432f87 100644
--- a/core/Objects/DatabaseEntity/Attribute/Enum.class.php
+++ b/Core/Objects/DatabaseEntity/Attribute/Enum.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\DatabaseEntity\Attribute;
+namespace Core\Objects\DatabaseEntity\Attribute;
 
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class Enum {
 
diff --git a/core/Objects/DatabaseEntity/Attribute/Json.class.php b/Core/Objects/DatabaseEntity/Attribute/Json.class.php
similarity index 56%
rename from core/Objects/DatabaseEntity/Attribute/Json.class.php
rename to Core/Objects/DatabaseEntity/Attribute/Json.class.php
index 5ddfa56..3b656d4 100644
--- a/core/Objects/DatabaseEntity/Attribute/Json.class.php
+++ b/Core/Objects/DatabaseEntity/Attribute/Json.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\DatabaseEntity\Attribute;
+namespace Core\Objects\DatabaseEntity\Attribute;
 
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class Json {
 
diff --git a/core/Objects/DatabaseEntity/Attribute/Many.class.php b/Core/Objects/DatabaseEntity/Attribute/Many.class.php
similarity index 82%
rename from core/Objects/DatabaseEntity/Attribute/Many.class.php
rename to Core/Objects/DatabaseEntity/Attribute/Many.class.php
index bcfe223..aa66da4 100644
--- a/core/Objects/DatabaseEntity/Attribute/Many.class.php
+++ b/Core/Objects/DatabaseEntity/Attribute/Many.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\DatabaseEntity\Attribute;
+namespace Core\Objects\DatabaseEntity\Attribute;
 
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class Many {
 
diff --git a/core/Objects/DatabaseEntity/Attribute/MaxLength.class.php b/Core/Objects/DatabaseEntity/Attribute/MaxLength.class.php
similarity index 83%
rename from core/Objects/DatabaseEntity/Attribute/MaxLength.class.php
rename to Core/Objects/DatabaseEntity/Attribute/MaxLength.class.php
index a4571e3..4951ce0 100644
--- a/core/Objects/DatabaseEntity/Attribute/MaxLength.class.php
+++ b/Core/Objects/DatabaseEntity/Attribute/MaxLength.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\DatabaseEntity\Attribute;
+namespace Core\Objects\DatabaseEntity\Attribute;
 
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class MaxLength {
   private int $maxLength;
diff --git a/core/Objects/DatabaseEntity/Attribute/Transient.class.php b/Core/Objects/DatabaseEntity/Attribute/Transient.class.php
similarity index 58%
rename from core/Objects/DatabaseEntity/Attribute/Transient.class.php
rename to Core/Objects/DatabaseEntity/Attribute/Transient.class.php
index c6088f1..b9de20a 100644
--- a/core/Objects/DatabaseEntity/Attribute/Transient.class.php
+++ b/Core/Objects/DatabaseEntity/Attribute/Transient.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\DatabaseEntity\Attribute;
+namespace Core\Objects\DatabaseEntity\Attribute;
 
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class Transient {
 
diff --git a/core/Objects/DatabaseEntity/Attribute/Unique.class.php b/Core/Objects/DatabaseEntity/Attribute/Unique.class.php
similarity index 57%
rename from core/Objects/DatabaseEntity/Attribute/Unique.class.php
rename to Core/Objects/DatabaseEntity/Attribute/Unique.class.php
index bf9db29..4b69504 100644
--- a/core/Objects/DatabaseEntity/Attribute/Unique.class.php
+++ b/Core/Objects/DatabaseEntity/Attribute/Unique.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\DatabaseEntity\Attribute;
+namespace Core\Objects\DatabaseEntity\Attribute;
 
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class Unique {
 
diff --git a/core/Objects/DatabaseEntity/DatabaseEntity.class.php b/Core/Objects/DatabaseEntity/DatabaseEntity.class.php
similarity index 95%
rename from core/Objects/DatabaseEntity/DatabaseEntity.class.php
rename to Core/Objects/DatabaseEntity/DatabaseEntity.class.php
index 3c94bf3..58a406f 100644
--- a/core/Objects/DatabaseEntity/DatabaseEntity.class.php
+++ b/Core/Objects/DatabaseEntity/DatabaseEntity.class.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Driver\SQL\Condition\Compare;
-use Driver\SQL\Condition\Condition;
-use Driver\SQL\SQL;
+use Core\Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Condition\Condition;
+use Core\Driver\SQL\SQL;
 
 abstract class DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/DatabaseEntityHandler.php b/Core/Objects/DatabaseEntity/DatabaseEntityHandler.php
similarity index 92%
rename from core/Objects/DatabaseEntity/DatabaseEntityHandler.php
rename to Core/Objects/DatabaseEntity/DatabaseEntityHandler.php
index 12d2366..03bbf9e 100644
--- a/core/Objects/DatabaseEntity/DatabaseEntityHandler.php
+++ b/Core/Objects/DatabaseEntity/DatabaseEntityHandler.php
@@ -1,31 +1,30 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Driver\Logger\Logger;
-use Driver\SQL\Column\BoolColumn;
-use Driver\SQL\Column\DateTimeColumn;
-use Driver\SQL\Column\EnumColumn;
-use Driver\SQL\Column\IntColumn;
-use Driver\SQL\Column\JsonColumn;
-use Driver\SQL\Column\StringColumn;
-use Driver\SQL\Condition\Compare;
-use Driver\SQL\Condition\Condition;
-use Driver\SQL\Column\DoubleColumn;
-use Driver\SQL\Column\FloatColumn;
-use Driver\SQL\Constraint\ForeignKey;
-use Driver\SQL\Query\CreateTable;
-use Driver\SQL\Query\Select;
-use Driver\SQL\SQL;
-use Driver\SQL\Strategy\CascadeStrategy;
-use Driver\SQL\Strategy\SetNullStrategy;
-use Objects\DatabaseEntity\Attribute\Enum;
-use Objects\DatabaseEntity\Attribute\DefaultValue;
-use Objects\DatabaseEntity\Attribute\Json;
-use Objects\DatabaseEntity\Attribute\Many;
-use Objects\DatabaseEntity\Attribute\MaxLength;
-use Objects\DatabaseEntity\Attribute\Transient;
-use Objects\DatabaseEntity\Attribute\Unique;
+use Core\Driver\Logger\Logger;
+use Core\Driver\SQL\Column\BoolColumn;
+use Core\Driver\SQL\Column\DateTimeColumn;
+use Core\Driver\SQL\Column\EnumColumn;
+use Core\Driver\SQL\Column\IntColumn;
+use Core\Driver\SQL\Column\JsonColumn;
+use Core\Driver\SQL\Column\StringColumn;
+use Core\Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Condition\Condition;
+use Core\Driver\SQL\Column\DoubleColumn;
+use Core\Driver\SQL\Column\FloatColumn;
+use Core\Driver\SQL\Constraint\ForeignKey;
+use Core\Driver\SQL\Query\CreateTable;
+use Core\Driver\SQL\Query\Select;
+use Core\Driver\SQL\SQL;
+use Core\Driver\SQL\Strategy\CascadeStrategy;
+use Core\Driver\SQL\Strategy\SetNullStrategy;
+use Core\Objects\DatabaseEntity\Attribute\Enum;
+use Core\Objects\DatabaseEntity\Attribute\DefaultValue;
+use Core\Objects\DatabaseEntity\Attribute\Json;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\Objects\DatabaseEntity\Attribute\Transient;
+use Core\Objects\DatabaseEntity\Attribute\Unique;
 use PHPUnit\Util\Exception;
 
 class DatabaseEntityHandler {
@@ -134,7 +133,7 @@ class DatabaseEntityHandler {
       $this->properties[$propertyName] = $property;
 
       if ($isUnique) {
-        $this->constraints[] = new \Driver\SQL\Constraint\Unique($columnName);
+        $this->constraints[] = new \Core\Driver\SQL\Constraint\Unique($columnName);
       }
     }
   }
diff --git a/core/Objects/DatabaseEntity/DatabaseEntityQuery.class.php b/Core/Objects/DatabaseEntity/DatabaseEntityQuery.class.php
similarity index 96%
rename from core/Objects/DatabaseEntity/DatabaseEntityQuery.class.php
rename to Core/Objects/DatabaseEntity/DatabaseEntityQuery.class.php
index 00ba75d..53c5178 100644
--- a/core/Objects/DatabaseEntity/DatabaseEntityQuery.class.php
+++ b/Core/Objects/DatabaseEntity/DatabaseEntityQuery.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Driver\SQL\Condition\Condition;
-use Driver\SQL\Join;
-use Driver\SQL\Query\Select;
-use Driver\SQL\SQL;
+use Core\Driver\SQL\Condition\Condition;
+use Core\Driver\SQL\Join;
+use Core\Driver\SQL\Query\Select;
+use Core\Driver\SQL\SQL;
 
 /**
  * this class is similar to \Driver\SQL\Query\Select but with reduced functionality
diff --git a/core/Objects/DatabaseEntity/GpgKey.class.php b/Core/Objects/DatabaseEntity/GpgKey.class.php
similarity index 95%
rename from core/Objects/DatabaseEntity/GpgKey.class.php
rename to Core/Objects/DatabaseEntity/GpgKey.class.php
index 99c1099..c32139a 100644
--- a/core/Objects/DatabaseEntity/GpgKey.class.php
+++ b/Core/Objects/DatabaseEntity/GpgKey.class.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Driver\SQL\Expression\CurrentTimeStamp;
-use Objects\DatabaseEntity\Attribute\MaxLength;
-use Objects\DatabaseEntity\Attribute\DefaultValue;
+use Core\Driver\SQL\Expression\CurrentTimeStamp;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\Objects\DatabaseEntity\Attribute\DefaultValue;
 
 class GpgKey extends DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/Group.class.php b/Core/Objects/DatabaseEntity/Group.class.php
similarity index 79%
rename from core/Objects/DatabaseEntity/Group.class.php
rename to Core/Objects/DatabaseEntity/Group.class.php
index 9e9414f..529468b 100644
--- a/core/Objects/DatabaseEntity/Group.class.php
+++ b/Core/Objects/DatabaseEntity/Group.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
 
 class Group extends DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/Language.class.php b/Core/Objects/DatabaseEntity/Language.class.php
similarity index 92%
rename from core/Objects/DatabaseEntity/Language.class.php
rename to Core/Objects/DatabaseEntity/Language.class.php
index de68a85..23a7a4f 100644
--- a/core/Objects/DatabaseEntity/Language.class.php
+++ b/Core/Objects/DatabaseEntity/Language.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Objects\DatabaseEntity {
+namespace Core\Objects\DatabaseEntity {
 
-  use Driver\SQL\SQL;
-  use Objects\DatabaseEntity\Attribute\MaxLength;
-  use Objects\DatabaseEntity\Attribute\Transient;
-  use Objects\lang\LanguageModule;
+  use Core\Driver\SQL\SQL;
+  use Core\Objects\DatabaseEntity\Attribute\MaxLength;
+  use Core\Objects\DatabaseEntity\Attribute\Transient;
+  use Core\Objects\lang\LanguageModule;
 
   // TODO: language from cookie?
   class Language extends DatabaseEntity {
diff --git a/core/Objects/DatabaseEntity/News.class.php b/Core/Objects/DatabaseEntity/News.class.php
similarity index 72%
rename from core/Objects/DatabaseEntity/News.class.php
rename to Core/Objects/DatabaseEntity/News.class.php
index 2466527..b0c5f07 100644
--- a/core/Objects/DatabaseEntity/News.class.php
+++ b/Core/Objects/DatabaseEntity/News.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Api\Parameter\Parameter;
-use Driver\SQL\Expression\CurrentTimeStamp;
-use Objects\DatabaseEntity\Attribute\DefaultValue;
-use Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\API\Parameter\Parameter;
+use Core\Driver\SQL\Expression\CurrentTimeStamp;
+use Core\Objects\DatabaseEntity\Attribute\DefaultValue;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
 
 class News extends DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/Notification.class.php b/Core/Objects/DatabaseEntity/Notification.class.php
similarity index 68%
rename from core/Objects/DatabaseEntity/Notification.class.php
rename to Core/Objects/DatabaseEntity/Notification.class.php
index 9172d79..563226b 100644
--- a/core/Objects/DatabaseEntity/Notification.class.php
+++ b/Core/Objects/DatabaseEntity/Notification.class.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Api\Parameter\Parameter;
-use Driver\SQL\Expression\CurrentTimeStamp;
-use Objects\DatabaseEntity\Attribute\DefaultValue;
-use Objects\DatabaseEntity\Attribute\Enum;
-use Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\API\Parameter\Parameter;
+use Core\Driver\SQL\Expression\CurrentTimeStamp;
+use Core\Objects\DatabaseEntity\Attribute\DefaultValue;
+use Core\Objects\DatabaseEntity\Attribute\Enum;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
 
 class Notification extends DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/Session.class.php b/Core/Objects/DatabaseEntity/Session.class.php
similarity index 93%
rename from core/Objects/DatabaseEntity/Session.class.php
rename to Core/Objects/DatabaseEntity/Session.class.php
index 2f16c32..43534b9 100644
--- a/core/Objects/DatabaseEntity/Session.class.php
+++ b/Core/Objects/DatabaseEntity/Session.class.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
 use DateTime;
 use Exception;
 use Firebase\JWT\JWT;
-use Objects\Context;
-use Objects\DatabaseEntity\Attribute\DefaultValue;
-use Objects\DatabaseEntity\Attribute\Json;
-use Objects\DatabaseEntity\Attribute\MaxLength;
-use Objects\DatabaseEntity\Attribute\Transient;
+use Core\Objects\Context;
+use Core\Objects\DatabaseEntity\Attribute\DefaultValue;
+use Core\Objects\DatabaseEntity\Attribute\Json;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\Objects\DatabaseEntity\Attribute\Transient;
 
 class Session extends DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/SystemLog.class.php b/Core/Objects/DatabaseEntity/SystemLog.class.php
similarity index 70%
rename from core/Objects/DatabaseEntity/SystemLog.class.php
rename to Core/Objects/DatabaseEntity/SystemLog.class.php
index f514c73..8e14645 100644
--- a/core/Objects/DatabaseEntity/SystemLog.class.php
+++ b/Core/Objects/DatabaseEntity/SystemLog.class.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Api\Parameter\Parameter;
-use Driver\SQL\Expression\CurrentTimeStamp;
-use Objects\DatabaseEntity\Attribute\DefaultValue;
-use Objects\DatabaseEntity\Attribute\Enum;
-use Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\API\Parameter\Parameter;
+use Core\Driver\SQL\Expression\CurrentTimeStamp;
+use Core\Objects\DatabaseEntity\Attribute\DefaultValue;
+use Core\Objects\DatabaseEntity\Attribute\Enum;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
 
 class SystemLog extends DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/TwoFactorToken.class.php b/Core/Objects/DatabaseEntity/TwoFactorToken.class.php
similarity index 87%
rename from core/Objects/DatabaseEntity/TwoFactorToken.class.php
rename to Core/Objects/DatabaseEntity/TwoFactorToken.class.php
index e490efc..1351d7a 100644
--- a/core/Objects/DatabaseEntity/TwoFactorToken.class.php
+++ b/Core/Objects/DatabaseEntity/TwoFactorToken.class.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Driver\SQL\SQL;
-use Objects\DatabaseEntity\Attribute\Enum;
-use Objects\DatabaseEntity\Attribute\MaxLength;
-use Objects\TwoFactor\KeyBasedTwoFactorToken;
-use Objects\TwoFactor\TimeBasedTwoFactorToken;
+use Core\Driver\SQL\SQL;
+use Core\Objects\DatabaseEntity\Attribute\Enum;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\Objects\TwoFactor\KeyBasedTwoFactorToken;
+use Core\Objects\TwoFactor\TimeBasedTwoFactorToken;
 
 abstract class TwoFactorToken extends DatabaseEntity {
 
diff --git a/core/Objects/DatabaseEntity/User.class.php b/Core/Objects/DatabaseEntity/User.class.php
similarity index 87%
rename from core/Objects/DatabaseEntity/User.class.php
rename to Core/Objects/DatabaseEntity/User.class.php
index 27d896c..2b4c3ec 100644
--- a/core/Objects/DatabaseEntity/User.class.php
+++ b/Core/Objects/DatabaseEntity/User.class.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Objects\DatabaseEntity;
+namespace Core\Objects\DatabaseEntity;
 
-use Driver\SQL\Condition\Compare;
-use Driver\SQL\Expression\CurrentTimeStamp;
-use Driver\SQL\Join;
-use Driver\SQL\SQL;
-use Objects\DatabaseEntity\Attribute\DefaultValue;
-use Objects\DatabaseEntity\Attribute\MaxLength;
-use Objects\DatabaseEntity\Attribute\Transient;
-use Objects\DatabaseEntity\Attribute\Unique;
+use Core\Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Expression\CurrentTimeStamp;
+use Core\Driver\SQL\Join;
+use Core\Driver\SQL\SQL;
+use Core\Objects\DatabaseEntity\Attribute\DefaultValue;
+use Core\Objects\DatabaseEntity\Attribute\MaxLength;
+use Core\Objects\DatabaseEntity\Attribute\Transient;
+use Core\Objects\DatabaseEntity\Attribute\Unique;
 
 class User extends DatabaseEntity {
 
diff --git a/core/Objects/Router/AbstractRoute.class.php b/Core/Objects/Router/AbstractRoute.class.php
similarity index 93%
rename from core/Objects/Router/AbstractRoute.class.php
rename to Core/Objects/Router/AbstractRoute.class.php
index 19c0bc1..7e95b23 100644
--- a/core/Objects/Router/AbstractRoute.class.php
+++ b/Core/Objects/Router/AbstractRoute.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Objects\Router;
+namespace Core\Objects\Router;
 
-use Api\Parameter\Parameter;
+use Core\API\Parameter\Parameter;
 
 abstract class AbstractRoute {
 
@@ -43,13 +43,17 @@ abstract class AbstractRoute {
     return [$this->pattern, $this->exact];
   }
 
+  public function getClass(): \ReflectionClass {
+    return new \ReflectionClass($this);
+  }
+
   public function generateCache(): string {
-    $reflection = new \ReflectionClass($this);
-    $className = $reflection->getName();
+    $reflection = $this->getClass();
+    $className = $reflection->getShortName();
     $args = implode(", ", array_map(function ($arg) {
       return var_export($arg, true);
     }, $this->getArgs()));
-    return "new \\$className($args)";
+    return "new $className($args)";
   }
 
   public function match(string $url) {
diff --git a/core/Objects/Router/ApiRoute.class.php b/Core/Objects/Router/ApiRoute.class.php
similarity index 77%
rename from core/Objects/Router/ApiRoute.class.php
rename to Core/Objects/Router/ApiRoute.class.php
index 187e1cc..c601e72 100644
--- a/core/Objects/Router/ApiRoute.class.php
+++ b/Core/Objects/Router/ApiRoute.class.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Objects\Router;
+namespace Core\Objects\Router;
 
-use Api\Request;
+use Core\API\Request;
+use Core\Elements\TemplateDocument;
 use ReflectionClass;
 use ReflectionException;
 
@@ -20,7 +21,7 @@ class ApiRoute extends AbstractRoute {
   public function call(Router $router, array $params): string {
     if (empty($params["endpoint"])) {
       header("Content-Type: text/html");
-      $document = new \Elements\TemplateDocument($router, "swagger.twig");
+      $document = new TemplateDocument($router, "swagger.twig");
       return $document->load();
     } else if (!preg_match("/[a-zA-Z]+/", $params["endpoint"])) {
       http_response_code(400);
@@ -30,10 +31,10 @@ class ApiRoute extends AbstractRoute {
       $isNestedAPI = !empty($params["method"]);
       if ($isNestedAPI) {
         $apiMethod = ucfirst($params["method"]);
-        $parentClass = "\\Api\\${apiEndpoint}API";
-        $apiClass = "\\Api\\${apiEndpoint}\\${apiMethod}";
+        $parentClass = "\\API\\${apiEndpoint}API";
+        $apiClass = "\\API\\${apiEndpoint}\\${apiMethod}";
       } else {
-        $apiClass = "\\Api\\${apiEndpoint}";
+        $apiClass = "\\API\\${apiEndpoint}";
         $parentClass = $apiClass;
       }
 
@@ -43,9 +44,13 @@ class ApiRoute extends AbstractRoute {
         // first: check if the parent class exists, for example:
         // /stats => Stats.class.php
         // /mail/send => MailAPI.class.php
-        if ($this->checkClass($parentClass)) {
-          if (!$isNestedAPI || class_exists($apiClass)) {
-            $classFound = true;
+        foreach (["Site", "Core"] as $module) {
+          if ($this->checkClass("\\$module$parentClass")) {
+            if (!$isNestedAPI || class_exists("\\$module$apiClass")) {
+              $classFound = true;
+              $apiClass = "\\$module$apiClass";
+              break;
+            }
           }
         }
 
diff --git a/core/Objects/Router/DocumentRoute.class.php b/Core/Objects/Router/DocumentRoute.class.php
similarity index 93%
rename from core/Objects/Router/DocumentRoute.class.php
rename to Core/Objects/Router/DocumentRoute.class.php
index 0a3b730..f7c5450 100644
--- a/core/Objects/Router/DocumentRoute.class.php
+++ b/Core/Objects/Router/DocumentRoute.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Objects\Router;
+namespace Core\Objects\Router;
 
-use Elements\Document;
-use Objects\Context;
-use Objects\Search\Searchable;
-use Objects\Search\SearchQuery;
+use Core\Elements\Document;
+use Core\Objects\Context;
+use Core\Objects\Search\Searchable;
+use Core\Objects\Search\SearchQuery;
 use ReflectionException;
 
 class DocumentRoute extends AbstractRoute {
diff --git a/core/Objects/Router/EmptyRoute.class.php b/Core/Objects/Router/EmptyRoute.class.php
similarity index 88%
rename from core/Objects/Router/EmptyRoute.class.php
rename to Core/Objects/Router/EmptyRoute.class.php
index f7c7524..39af23c 100644
--- a/core/Objects/Router/EmptyRoute.class.php
+++ b/Core/Objects/Router/EmptyRoute.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\Router;
+namespace Core\Objects\Router;
 
 class EmptyRoute extends AbstractRoute {
 
diff --git a/core/Objects/Router/RedirectRoute.class.php b/Core/Objects/Router/RedirectRoute.class.php
similarity index 94%
rename from core/Objects/Router/RedirectRoute.class.php
rename to Core/Objects/Router/RedirectRoute.class.php
index f358ac9..d3e18c1 100644
--- a/core/Objects/Router/RedirectRoute.class.php
+++ b/Core/Objects/Router/RedirectRoute.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\Router;
+namespace Core\Objects\Router;
 
 class RedirectRoute extends AbstractRoute {
 
diff --git a/core/Objects/Router/Router.class.php b/Core/Objects/Router/Router.class.php
similarity index 89%
rename from core/Objects/Router/Router.class.php
rename to Core/Objects/Router/Router.class.php
index facb057..30509a9 100644
--- a/core/Objects/Router/Router.class.php
+++ b/Core/Objects/Router/Router.class.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Objects\Router;
+namespace Core\Objects\Router;
 
-use Driver\Logger\Logger;
-use Objects\Context;
+use Core\Driver\Logger\Logger;
+use Core\Objects\Context;
 
 class Router {
 
@@ -64,7 +64,7 @@ class Router {
     if ($route) {
       return $route->call($this, $params);
     } else {
-      $req = new \Api\Template\Render($this->context);
+      $req = new \Core\API\Template\Render($this->context);
       $res = $req->execute(["file" => "error_document.twig", "parameters" => $params]);
       if ($res) {
         return $req->getResult()["html"];
@@ -86,16 +86,24 @@ class Router {
   public function writeCache(string $file): bool {
 
     $routes = "";
+    $uses = [
+      "Core\Objects\Context",
+      "Core\Objects\Router\Router",
+    ];
+
     foreach ($this->routes as $route) {
       // do not generate cache for static api route
       if ($route instanceof ApiRoute) {
         continue;
       }
 
+      $class = $route->getClass();
       $constructor = $route->generateCache();
+      $uses[] = $class->getName();
       $routes .= "\n    \$this->addRoute($constructor);";
     }
 
+    $uses = implode("\n", array_map(function ($use) { return "use $use;"; }, array_unique($uses)));
     $date = (new \DateTime())->format("Y/m/d H:i:s");
     $code = "<?php
 
@@ -104,9 +112,8 @@ class Router {
  * This file is automatically generated by the RoutesAPI on $date.
  */
 
-namespace Cache;
-use Objects\Context;
-use Objects\Router\Router;
+namespace Core\Cache;
+$uses
 
 class RouterCache extends Router {
 
diff --git a/core/Objects/Router/StaticFileRoute.class.php b/Core/Objects/Router/StaticFileRoute.class.php
similarity index 95%
rename from core/Objects/Router/StaticFileRoute.class.php
rename to Core/Objects/Router/StaticFileRoute.class.php
index a6e58ba..d4a5251 100644
--- a/core/Objects/Router/StaticFileRoute.class.php
+++ b/Core/Objects/Router/StaticFileRoute.class.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Objects\Router;
+namespace Core\Objects\Router;
 
-use Objects\Context;
-use Objects\Search\Searchable;
-use Objects\Search\SearchQuery;
-use Objects\Search\SearchResult;
+use Core\Objects\Context;
+use Core\Objects\Search\Searchable;
+use Core\Objects\Search\SearchQuery;
+use Core\Objects\Search\SearchResult;
 
 class StaticFileRoute extends AbstractRoute {
 
diff --git a/core/Objects/Router/StaticRoute.class.php b/Core/Objects/Router/StaticRoute.class.php
similarity index 94%
rename from core/Objects/Router/StaticRoute.class.php
rename to Core/Objects/Router/StaticRoute.class.php
index ab43e65..1b38e73 100644
--- a/core/Objects/Router/StaticRoute.class.php
+++ b/Core/Objects/Router/StaticRoute.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\Router;
+namespace Core\Objects\Router;
 
 class StaticRoute extends AbstractRoute {
 
diff --git a/core/Objects/Search/SearchQuery.class.php b/Core/Objects/Search/SearchQuery.class.php
similarity index 90%
rename from core/Objects/Search/SearchQuery.class.php
rename to Core/Objects/Search/SearchQuery.class.php
index 16bd172..7f967e9 100644
--- a/core/Objects/Search/SearchQuery.class.php
+++ b/Core/Objects/Search/SearchQuery.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\Search;
+namespace Core\Objects\Search;
 
 class SearchQuery {
 
diff --git a/core/Objects/Search/SearchResult.class.php b/Core/Objects/Search/SearchResult.class.php
similarity index 89%
rename from core/Objects/Search/SearchResult.class.php
rename to Core/Objects/Search/SearchResult.class.php
index 84ce47f..3de499a 100644
--- a/core/Objects/Search/SearchResult.class.php
+++ b/Core/Objects/Search/SearchResult.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Objects\Search;
+namespace Core\Objects\Search;
 
-use Objects\ApiObject;
+use Core\Objects\ApiObject;
 
 class SearchResult extends ApiObject {
 
diff --git a/core/Objects/Search/Searchable.trait.php b/Core/Objects/Search/Searchable.trait.php
similarity index 97%
rename from core/Objects/Search/Searchable.trait.php
rename to Core/Objects/Search/Searchable.trait.php
index 121e1b3..12ce7e5 100644
--- a/core/Objects/Search/Searchable.trait.php
+++ b/Core/Objects/Search/Searchable.trait.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Objects\Search;
+namespace Core\Objects\Search;
 
 use Html2Text\Html2Text;
-use Objects\Context;
+use Core\Objects\Context;
 use function PHPUnit\Framework\stringContains;
 
 trait Searchable {
diff --git a/core/Objects/TwoFactor/AttestationObject.class.php b/Core/Objects/TwoFactor/AttestationObject.class.php
similarity index 88%
rename from core/Objects/TwoFactor/AttestationObject.class.php
rename to Core/Objects/TwoFactor/AttestationObject.class.php
index 1d77c31..f6e9920 100644
--- a/core/Objects/TwoFactor/AttestationObject.class.php
+++ b/Core/Objects/TwoFactor/AttestationObject.class.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Objects\TwoFactor;
+namespace Core\Objects\TwoFactor;
 
-use Objects\ApiObject;
+use Core\Objects\ApiObject;
 
 class AttestationObject extends ApiObject {
 
-  use \Objects\TwoFactor\CBORDecoder;
+  use Core\Objects\TwoFactor\CBORDecoder;
 
   private string $format;
   private array $statement;
diff --git a/core/Objects/TwoFactor/AuthenticationData.class.php b/Core/Objects/TwoFactor/AuthenticationData.class.php
similarity index 97%
rename from core/Objects/TwoFactor/AuthenticationData.class.php
rename to Core/Objects/TwoFactor/AuthenticationData.class.php
index aa581b9..b84d383 100644
--- a/core/Objects/TwoFactor/AuthenticationData.class.php
+++ b/Core/Objects/TwoFactor/AuthenticationData.class.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Objects\TwoFactor;
+namespace Core\Objects\TwoFactor;
 
-use Objects\ApiObject;
+use Core\Objects\ApiObject;
 
 class AuthenticationData extends ApiObject {
 
diff --git a/core/Objects/TwoFactor/CBORDecoder.trait.php b/Core/Objects/TwoFactor/CBORDecoder.trait.php
similarity index 91%
rename from core/Objects/TwoFactor/CBORDecoder.trait.php
rename to Core/Objects/TwoFactor/CBORDecoder.trait.php
index 4a25977..c42d3c3 100644
--- a/core/Objects/TwoFactor/CBORDecoder.trait.php
+++ b/Core/Objects/TwoFactor/CBORDecoder.trait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\TwoFactor;
+namespace Core\Objects\TwoFactor;
 
 use CBOR\StringStream;
 
diff --git a/core/Objects/TwoFactor/KeyBasedTwoFactorToken.class.php b/Core/Objects/TwoFactor/KeyBasedTwoFactorToken.class.php
similarity index 93%
rename from core/Objects/TwoFactor/KeyBasedTwoFactorToken.class.php
rename to Core/Objects/TwoFactor/KeyBasedTwoFactorToken.class.php
index db406e9..1577d3b 100644
--- a/core/Objects/TwoFactor/KeyBasedTwoFactorToken.class.php
+++ b/Core/Objects/TwoFactor/KeyBasedTwoFactorToken.class.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Objects\TwoFactor;
+namespace Core\Objects\TwoFactor;
 
 use Cose\Algorithm\Signature\ECDSA\ECSignature;
-use Objects\DatabaseEntity\Attribute\Transient;
-use Objects\DatabaseEntity\TwoFactorToken;
+use Core\Objects\DatabaseEntity\Attribute\Transient;
+use Core\Objects\DatabaseEntity\TwoFactorToken;
 
 class KeyBasedTwoFactorToken extends TwoFactorToken {
 
diff --git a/core/Objects/TwoFactor/PublicKey.class.php b/Core/Objects/TwoFactor/PublicKey.class.php
similarity index 94%
rename from core/Objects/TwoFactor/PublicKey.class.php
rename to Core/Objects/TwoFactor/PublicKey.class.php
index a251113..01f20ed 100644
--- a/core/Objects/TwoFactor/PublicKey.class.php
+++ b/Core/Objects/TwoFactor/PublicKey.class.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Objects\TwoFactor;
+namespace Core\Objects\TwoFactor;
 
-use Objects\ApiObject;
+use Core\Objects\ApiObject;
 
 class PublicKey extends ApiObject {
 
-  use \Objects\TwoFactor\CBORDecoder;
+  use Core\Objects\TwoFactor\CBORDecoder;
 
   private int $keyType;
   private int $usedAlgorithm;
diff --git a/core/Objects/TwoFactor/TimeBasedTwoFactorToken.class.php b/Core/Objects/TwoFactor/TimeBasedTwoFactorToken.class.php
similarity index 89%
rename from core/Objects/TwoFactor/TimeBasedTwoFactorToken.class.php
rename to Core/Objects/TwoFactor/TimeBasedTwoFactorToken.class.php
index 7424c35..1386373 100644
--- a/core/Objects/TwoFactor/TimeBasedTwoFactorToken.class.php
+++ b/Core/Objects/TwoFactor/TimeBasedTwoFactorToken.class.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Objects\TwoFactor;
+namespace Core\Objects\TwoFactor;
 
 use Base32\Base32;
 use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
-use Objects\Context;
-use Objects\DatabaseEntity\Attribute\Transient;
-use Objects\DatabaseEntity\TwoFactorToken;
-use Objects\DatabaseEntity\User;
+use Core\Objects\Context;
+use Core\Objects\DatabaseEntity\Attribute\Transient;
+use Core\Objects\DatabaseEntity\TwoFactorToken;
+use Core\Objects\DatabaseEntity\User;
 
 class TimeBasedTwoFactorToken extends TwoFactorToken {
 
diff --git a/core/Objects/lang/LanguageModule.php b/Core/Objects/lang/LanguageModule.php
similarity index 76%
rename from core/Objects/lang/LanguageModule.php
rename to Core/Objects/lang/LanguageModule.php
index 20a932d..53d1f7f 100644
--- a/core/Objects/lang/LanguageModule.php
+++ b/Core/Objects/lang/LanguageModule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\lang;
+namespace Core\Objects\lang;
 
 abstract class LanguageModule {
 
diff --git a/core/Templates/account.twig b/Core/Templates/account.twig
similarity index 100%
rename from core/Templates/account.twig
rename to Core/Templates/account.twig
diff --git a/core/Templates/account/accept_invite.twig b/Core/Templates/account/accept_invite.twig
similarity index 100%
rename from core/Templates/account/accept_invite.twig
rename to Core/Templates/account/accept_invite.twig
diff --git a/core/Templates/account/confirm_email.twig b/Core/Templates/account/confirm_email.twig
similarity index 100%
rename from core/Templates/account/confirm_email.twig
rename to Core/Templates/account/confirm_email.twig
diff --git a/core/Templates/account/login.twig b/Core/Templates/account/login.twig
similarity index 100%
rename from core/Templates/account/login.twig
rename to Core/Templates/account/login.twig
diff --git a/core/Templates/account/register.twig b/Core/Templates/account/register.twig
similarity index 100%
rename from core/Templates/account/register.twig
rename to Core/Templates/account/register.twig
diff --git a/core/Templates/account/resend_confirm_email.twig b/Core/Templates/account/resend_confirm_email.twig
similarity index 100%
rename from core/Templates/account/resend_confirm_email.twig
rename to Core/Templates/account/resend_confirm_email.twig
diff --git a/core/Templates/account/reset_password.twig b/Core/Templates/account/reset_password.twig
similarity index 100%
rename from core/Templates/account/reset_password.twig
rename to Core/Templates/account/reset_password.twig
diff --git a/core/Templates/admin.twig b/Core/Templates/admin.twig
similarity index 100%
rename from core/Templates/admin.twig
rename to Core/Templates/admin.twig
diff --git a/core/Templates/base.twig b/Core/Templates/base.twig
similarity index 100%
rename from core/Templates/base.twig
rename to Core/Templates/base.twig
diff --git a/core/Templates/error_document.twig b/Core/Templates/error_document.twig
similarity index 100%
rename from core/Templates/error_document.twig
rename to Core/Templates/error_document.twig
diff --git a/core/Templates/mail/2fa_remove.twig b/Core/Templates/mail/2fa_remove.twig
similarity index 100%
rename from core/Templates/mail/2fa_remove.twig
rename to Core/Templates/mail/2fa_remove.twig
diff --git a/core/Templates/mail/accept_invite.twig b/Core/Templates/mail/accept_invite.twig
similarity index 100%
rename from core/Templates/mail/accept_invite.twig
rename to Core/Templates/mail/accept_invite.twig
diff --git a/core/Templates/mail/confirm_email.twig b/Core/Templates/mail/confirm_email.twig
similarity index 100%
rename from core/Templates/mail/confirm_email.twig
rename to Core/Templates/mail/confirm_email.twig
diff --git a/core/Templates/mail/reset_password.twig b/Core/Templates/mail/reset_password.twig
similarity index 100%
rename from core/Templates/mail/reset_password.twig
rename to Core/Templates/mail/reset_password.twig
diff --git a/core/Templates/redirect.twig b/Core/Templates/redirect.twig
similarity index 100%
rename from core/Templates/redirect.twig
rename to Core/Templates/redirect.twig
diff --git a/core/Templates/swagger.twig b/Core/Templates/swagger.twig
similarity index 100%
rename from core/Templates/swagger.twig
rename to Core/Templates/swagger.twig
diff --git a/core/constants.php b/Core/constants.php
similarity index 100%
rename from core/constants.php
rename to Core/constants.php
diff --git a/core/core.php b/Core/core.php
similarity index 93%
rename from core/core.php
rename to Core/core.php
index d180af3..474881a 100644
--- a/core/core.php
+++ b/Core/core.php
@@ -10,7 +10,7 @@ if (is_file($autoLoad)) {
   require_once $autoLoad;
 }
 
-define("WEBBASE_VERSION", "2.1.0");
+define("WEBBASE_VERSION", "2.2.0");
 
 spl_autoload_extensions(".php");
 spl_autoload_register(function ($class) {
@@ -221,15 +221,21 @@ function html_tag_ex(string $tag, array $attributes, $content = "", bool $escape
 
 function getClassPath($class, string $suffix = ".class"): string {
   $path = str_replace('\\', '/', $class);
-  $path = array_values(array_filter(explode("/", $path)));
+  $pathParts = array_values(array_filter(explode("/", $path)));
+  $pathCount = count($pathParts);
 
-  if (count($path) > 2 && strcasecmp($path[0], "api") === 0 && strcasecmp($path[1], "Parameter") !== 0) {
-    $path = "Api/" . $path[1] . "API";
-  } else {
-    $path = implode("/", $path);
+  if ($pathCount >= 3) {
+    if (strcasecmp($pathParts[$pathCount - 3], "API") === 0) {
+      $group = $pathParts[$pathCount - 2];
+      if (strcasecmp($group, "Parameter") !== 0) {
+        $pathParts = array_slice($pathParts, 0, $pathCount - 2);
+        $pathParts[] = "${group}API";
+      }
+    }
   }
 
-  return "core/$path$suffix.php";
+  $path = implode("/", $pathParts);
+  return "$path$suffix.php";
 }
 
 function getClassName($class, bool $short = true): string {
diff --git a/core/datetime.php b/Core/datetime.php
similarity index 100%
rename from core/datetime.php
rename to Core/datetime.php
diff --git a/README.md b/README.md
index 6400368..b95d79e 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,8 @@ Each endpoint is represented by a class inheriting the [Request Class](/core/Api
 
 ```php
 namespace Api;
-use Api\Parameter\Parameter;
-use Objects\DatabaseEntity\User;
+use Core\API\Parameter\Parameter;
+use Core\Objects\DatabaseEntity\User;
 
 class SingleEndpoint extends Request {
 
@@ -108,7 +108,7 @@ Some endpoints are set to private, which means, they can be only accessed inside
 can be used by creating the desired request object, and calling the execute function with our parameters like shown below:
 
 ```php
-$req = new \Api\Mail\Send($context);
+$req = new \Core\API\Mail\Send($context);
 $success = $req->execute(array(
   "to" => "mail@example.org", 
   "subject" => "Example Mail", 
@@ -132,7 +132,7 @@ an additional patch file, which can be executed using the [CLI](#CLI), can be cr
 located in [/core/Configuration/Patch](/core/Configuration/Patch) and have the following structure:
 
 ```php
-namespace Configuration\Patch;
+namespace Core\Configuration\Patch;
 
 use Configuration\DatabaseScript;
 use Driver\SQL\SQL;
diff --git a/Site/.gitignore b/Site/.gitignore
new file mode 100644
index 0000000..d69060d
--- /dev/null
+++ b/Site/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitignore
+!*/.gitkeep
diff --git a/Site/API/.gitkeep b/Site/API/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Site/Configuration/.gitkeep b/Site/Configuration/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Site/Documents/.gitkeep b/Site/Documents/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Site/Objects/.gitkeep b/Site/Objects/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/cli.php b/cli.php
index 637375b..383ae97 100644
--- a/cli.php
+++ b/cli.php
@@ -2,17 +2,17 @@
 
 define('WEBROOT', realpath("."));
 
-include_once 'core/core.php';
-require_once 'core/datetime.php';
-include_once 'core/constants.php';
+include_once 'Core/core.php';
+require_once 'Core/datetime.php';
+include_once 'Core/constants.php';
 
-use Configuration\DatabaseScript;
-use Driver\SQL\Column\Column;
-use Driver\SQL\Condition\Compare;
-use Driver\SQL\Condition\CondIn;
-use Driver\SQL\Expression\DateSub;
-use Driver\SQL\SQL;
-use Objects\ConnectionData;
+use Core\Configuration\DatabaseScript;
+use Core\Driver\SQL\Column\Column;
+use Core\Driver\SQL\Condition\Compare;
+use Core\Driver\SQL\Condition\CondIn;
+use Core\Driver\SQL\Expression\DateSub;
+use Core\Driver\SQL\SQL;
+use Core\Objects\ConnectionData;
 
 function printLine(string $line = "") {
   echo $line . PHP_EOL;
@@ -34,7 +34,7 @@ function getDatabaseConfig(): ConnectionData {
   return new $configClass();
 }
 
-$context = new \Objects\Context();
+$context = new \Core\Objects\Context();
 if (!$context->isCLI()) {
   _exit("Can only be executed via CLI");
 }
@@ -74,7 +74,7 @@ function printHelp() {
   // TODO: help
 }
 
-function applyPatch(\Driver\SQL\SQL $sql, string $patchName): bool {
+function applyPatch(\Core\Driver\SQL\SQL $sql, string $patchName): bool {
   $class = str_replace('/', '\\', $patchName);
   $className = "\\Configuration\\$class";
   $classPath = getClassPath($className);
@@ -420,7 +420,7 @@ function onSettings(array $argv) {
 
   if ($action === "list" || $action === "get") {
     $key = (($action === "list" || count($argv) < 4) ? null : $argv[3]);
-    $req = new Api\Settings\Get($context);
+    $req = new \Core\API\Settings\Get($context);
     $success = $req->execute(["key" => $key]);
     if (!$success) {
       _exit("Error listings settings: " . $req->getLastError());
@@ -437,7 +437,7 @@ function onSettings(array $argv) {
     } else {
       $key = $argv[3];
       $value = $argv[4];
-      $req = new Api\Settings\Set($context);
+      $req = new \Core\API\Settings\Set($context);
       $success = $req->execute(["settings" => [$key => $value]]);
       if (!$success) {
         _exit("Error updating settings: " . $req->getLastError());
@@ -448,7 +448,7 @@ function onSettings(array $argv) {
       _exit("Usage: $argv[0] settings $argv[2] <key>");
     } else {
       $key = $argv[3];
-      $req = new Api\Settings\Set($context);
+      $req = new \Core\API\Settings\Set($context);
       $success = $req->execute(["settings" => [$key => null]]);
       if (!$success) {
         _exit("Error updating settings: " . $req->getLastError());
@@ -465,7 +465,7 @@ function onRoutes(array $argv) {
   $action = $argv[2] ?? "list";
 
   if ($action === "list") {
-    $req = new Api\Routes\Fetch($context);
+    $req = new \Core\API\Routes\Fetch($context);
     $success = $req->execute();
     if (!$success) {
       _exit("Error fetching routes: " . $req->getLastError());
@@ -493,7 +493,7 @@ function onRoutes(array $argv) {
       "extra" => $argv[7] ?? "",
     );
 
-    $req  = new Api\Routes\Add($context);
+    $req  = new \Core\API\Routes\Add($context);
     $success = $req->execute($params);
     if (!$success) {
       _exit($req->getLastError());
@@ -520,13 +520,13 @@ function onRoutes(array $argv) {
         echo "Remove route #$uid? (y|n): ";
       } while(($input = trim(fgets(STDIN))) !== "y");
 
-      $req = new Api\Routes\Remove($context);
+      $req = new \Core\API\Routes\Remove($context);
     } else if ($action === "enable") {
-      $req = new Api\Routes\Enable($context);
+      $req = new \Core\API\Routes\Enable($context);
     } else if ($action === "disable") {
-      $req = new Api\Routes\Disable($context);
+      $req = new \Core\API\Routes\Disable($context);
     } else if ($action === "modify") {
-      $req = new Api\Routes\Update($context);
+      $req = new \Core\API\Routes\Update($context);
       $params["request"] = $argv[4];
       $params["action"] = $argv[5];
       $params["target"] = $argv[6];
@@ -606,28 +606,14 @@ function onTest($argv) {
 function onMail($argv) {
   global $context;
   $action = $argv[2] ?? null;
-  if ($action === "sync") {
-    $sql = connectSQL() or die();
-    if (!$context->getSettings()->isMailEnabled()) {
-      _exit("Mails are not configured yet.");
-    }
-
-    $req = new Api\Mail\Sync($context);
-    printLine("Syncing emails…");
-    if (!$req->execute()) {
-      _exit("Error syncing mails: " . $req->getLastError());
-    }
-
-    _exit("Done.");
-  } else if ($action === "send_queue") {
-    $sql = connectSQL() or die();
-    $req = new \Api\Mail\SendQueue($context);
+  if ($action === "send_queue") {
+    $req = new \Core\API\Mail\SendQueue($context);
     $debug = in_array("debug", $argv);
     if (!$req->execute(["debug" => $debug])) {
       _exit("Error processing mail queue: " . $req->getLastError());
     }
   } else {
-    _exit("Usage: cli.php mail <sync|send_news|send_queue> [options...]");
+    _exit("Usage: cli.php mail <send_queue> [options...]");
   }
 }
 
@@ -653,8 +639,8 @@ function onImpersonate($argv) {
     }
   }
 
-  $user = new \Objects\DatabaseEntity\User($userId);
-  $session = new \Objects\DatabaseEntity\Session($context, $user);
+  $user = new \Core\Objects\DatabaseEntity\User($userId);
+  $session = new \Core\Objects\DatabaseEntity\Session($context, $user);
   $session->setData(["2faAuthenticated" => true]);
   $session->update();
   echo "session=" . $session->getCookie() . PHP_EOL;
diff --git a/core/Cache/.gitignore b/core/Cache/.gitignore
deleted file mode 100644
index f0fa09f..0000000
--- a/core/Cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitkeep
\ No newline at end of file
diff --git a/core/Configuration/.gitignore b/core/Configuration/.gitignore
deleted file mode 100644
index bd1b2f7..0000000
--- a/core/Configuration/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Database\.class\.php
diff --git a/core/Configuration/.htaccess b/core/Configuration/.htaccess
deleted file mode 100644
index d3223d4..0000000
--- a/core/Configuration/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-DENY FROM ALL
diff --git a/core/Driver/SQL/Condition/Condition.class.php b/core/Driver/SQL/Condition/Condition.class.php
deleted file mode 100644
index d8266ec..0000000
--- a/core/Driver/SQL/Condition/Condition.class.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Driver\SQL\Condition;
-
-use Driver\SQL\Expression\Expression;
-
-abstract class Condition extends Expression {
-  
-}
\ No newline at end of file
diff --git a/core/Driver/SQL/Constraint/Constraint.class.php b/core/Driver/SQL/Constraint/Constraint.class.php
deleted file mode 100644
index 27aeb86..0000000
--- a/core/Driver/SQL/Constraint/Constraint.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Driver\SQL\Constraint;
-
-abstract class Constraint {
-
-  private array $columnNames;
-
-  public function __construct($columnNames) {
-    $this->columnNames = (!is_array($columnNames) ? array($columnNames) : $columnNames);
-  }
-
-  public function getColumnNames(): array { return $this->columnNames; }
-}
\ No newline at end of file
diff --git a/core/Driver/SQL/Expression/Expression.class.php b/core/Driver/SQL/Expression/Expression.class.php
deleted file mode 100644
index 33f6611..0000000
--- a/core/Driver/SQL/Expression/Expression.class.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Driver\SQL\Expression;
-
-use Driver\SQL\SQL;
-
-abstract class Expression {
-
-}
\ No newline at end of file
diff --git a/core/Driver/SQL/Strategy/Strategy.class.php b/core/Driver/SQL/Strategy/Strategy.class.php
deleted file mode 100644
index 96efdab..0000000
--- a/core/Driver/SQL/Strategy/Strategy.class.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Driver\SQL\Strategy;
-
-abstract class Strategy {
-
-}
\ No newline at end of file
diff --git a/core/Logs/.gitignore b/core/Logs/.gitignore
deleted file mode 100644
index 1d295f6..0000000
--- a/core/Logs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.htaccess
\ No newline at end of file
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index e442aed..c7cb240 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,4 +1,4 @@
 FROM nginx:latest
 WORKDIR "/application"
-RUN mkdir -p /application/core/Configuration
+RUN mkdir -p /application/Site/Configuration
 RUN chown -R www-data:www-data /application
diff --git a/docker/nginx/site.conf b/docker/nginx/site.conf
index d3b5344..ee4005a 100644
--- a/docker/nginx/site.conf
+++ b/docker/nginx/site.conf
@@ -24,7 +24,7 @@ server {
 	}
 
 	# deny access to specific directories
-	location ~ ^/(files/uploaded|adminPanel|docker|core|test)/.*$ {
+	location ~ ^/(files/uploaded|adminPanel|docker|Site|Core|test)/.*$ {
 		rewrite ^(.*)$ /index.php?site=$1;
 	}
 
diff --git a/index.php b/index.php
index eaf963b..995e3be 100644
--- a/index.php
+++ b/index.php
@@ -1,26 +1,26 @@
 <?php
 
-include_once 'core/core.php';
-include_once 'core/datetime.php';
-include_once 'core/constants.php';
+include_once 'Core/core.php';
+include_once 'Core/datetime.php';
+include_once 'Core/constants.php';
 
 define("WEBROOT", realpath("."));
 
 if (is_file("MAINTENANCE") && !in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
   http_response_code(503);
-  \Objects\Router\StaticFileRoute::serveStatic(WEBROOT . "/static/maintenance.html");
+  \Core\Objects\Router\StaticFileRoute::serveStatic(WEBROOT . "/static/maintenance.html");
   die();
 }
 
-use Configuration\Configuration;
-use Objects\Router\Router;
+use Core\Configuration\Configuration;
+use Core\Objects\Router\Router;
 
 if (!is_readable(getClassPath(Configuration::class))) {
   header("Content-Type: application/json");
   die(json_encode([ "success" => false, "msg" => "Configuration class is not readable, check permissions before proceeding." ]));
 }
 
-$context = new \Objects\Context();
+$context = new \Core\Objects\Context();
 $sql = $context->initSQL();
 $settings = $context->getSettings();
 $context->parseCookies();
@@ -34,13 +34,13 @@ if ($installation) {
     $response = "Redirecting to <a href=\"/\">/</a>";
     header("Location: /");
   } else {
-    $document = new Documents\Install(new Router($context));
+    $document = new \Core\Documents\Install(new Router($context));
     $response = $document->load();
   }
 } else {
 
   $router = null;
-  $routerCacheClass = '\Cache\RouterCache';
+  $routerCacheClass = '\Core\Cache\RouterCache';
   $routerCachePath = getClassPath($routerCacheClass);
   if (is_file($routerCachePath)) {
     @include_once $routerCachePath;
@@ -50,7 +50,7 @@ if ($installation) {
   }
 
   if ($router === null) {
-    $req = new \Api\Routes\GenerateCache($context);
+    $req = new \Core\API\Routes\GenerateCache($context);
     if ($req->execute()) {
       $router = $req->getRouter();
     } else {
diff --git a/robots.txt b/robots.txt
index 3f5c8f8..7e85f31 100644
--- a/robots.txt
+++ b/robots.txt
@@ -1,2 +1,3 @@
 User-agent: *
-Disallow: /core
+Disallow: /Core
+Disallow: /Site
diff --git a/test/AesStream.test.php b/test/AesStream.test.php
index a2dddf2..84970be 100644
--- a/test/AesStream.test.php
+++ b/test/AesStream.test.php
@@ -1,6 +1,6 @@
 <?php
 
-use Objects\AesStream;
+use Core\Objects\AesStream;
 
 class AesStreamTest extends PHPUnit\Framework\TestCase {
 
diff --git a/test/DatabaseEntity.test.php b/test/DatabaseEntity.test.php
index c9f280f..6f68789 100644
--- a/test/DatabaseEntity.test.php
+++ b/test/DatabaseEntity.test.php
@@ -1,11 +1,12 @@
 <?php
 
-use Configuration\Configuration;
-use Driver\SQL\Query\CreateTable;
-use Driver\SQL\SQL;
-use Objects\Context;
-use Objects\DatabaseEntity\DatabaseEntityHandler;
-use Objects\DatabaseEntity\User;
+use Core\API\Parameter\Parameter;
+use Core\Driver\SQL\Query\CreateTable;
+use Core\Driver\SQL\SQL;
+use Core\Objects\Context;
+use Core\Objects\DatabaseEntity\DatabaseEntity;
+use Core\Objects\DatabaseEntity\DatabaseEntityHandler;
+use Core\Objects\DatabaseEntity\User;
 
 class DatabaseEntityTest extends \PHPUnit\Framework\TestCase {
 
@@ -55,8 +56,8 @@ class DatabaseEntityTest extends \PHPUnit\Framework\TestCase {
     $this->assertEquals($entity2->d, $entity->d);
     $this->assertNotNull($entity2->e);
     $this->assertEquals(
-      $entity2->e->format(\Api\Parameter\Parameter::DATE_TIME_FORMAT),
-      $entity->e->format(\Api\Parameter\Parameter::DATE_TIME_FORMAT)
+      $entity2->e->format(Parameter::DATE_TIME_FORMAT),
+      $entity->e->format(Parameter::DATE_TIME_FORMAT)
     );
     $this->assertNull($entity2->f);
 
@@ -100,7 +101,7 @@ class DatabaseEntityTest extends \PHPUnit\Framework\TestCase {
   }
 }
 
-class TestEntity extends \Objects\DatabaseEntity\DatabaseEntity {
+class TestEntity extends DatabaseEntity {
   public int $a;
   public string $b;
   public bool $c;
diff --git a/test/Parameter.test.php b/test/Parameter.test.php
index 261e91f..269469a 100644
--- a/test/Parameter.test.php
+++ b/test/Parameter.test.php
@@ -1,8 +1,8 @@
 <?php
 
-use Api\Parameter\ArrayType;
-use Api\Parameter\StringType;
-use Api\Parameter\Parameter;
+use Core\API\Parameter\ArrayType;
+use Core\API\Parameter\StringType;
+use Core\API\Parameter\Parameter;
 
 class ParameterTest extends \PHPUnit\Framework\TestCase {
 
diff --git a/test/Request.test.php b/test/Request.test.php
index d7dd5c0..b7e8fcf 100644
--- a/test/Request.test.php
+++ b/test/Request.test.php
@@ -1,9 +1,8 @@
 <?php
 
-use Api\Request;
-use Configuration\Configuration;
-use Objects\Context;
-use Objects\DatabaseEntity\User;
+use Core\API\Request;
+use Core\Objects\Context;
+use Core\Objects\DatabaseEntity\User;
 
 function __new_header_impl(string $line) {
   if (preg_match("/^HTTP\/([0-9.]+) (\d+) (.*)$/", $line, $m)) {
diff --git a/test/Router.test.php b/test/Router.test.php
index 4a1ad2a..fd3bbc2 100644
--- a/test/Router.test.php
+++ b/test/Router.test.php
@@ -1,8 +1,8 @@
 <?php
 
-use Objects\Context;
-use Objects\Router\EmptyRoute;
-use Objects\Router\Router;
+use Core\Objects\Context;
+use Core\Objects\Router\EmptyRoute;
+use Core\Objects\Router\Router;
 
 class RouterTest extends \PHPUnit\Framework\TestCase {
 
diff --git a/test/TimeBasedTwoFactorToken.test.php b/test/TimeBasedTwoFactorToken.test.php
index e8259d5..d81a067 100644
--- a/test/TimeBasedTwoFactorToken.test.php
+++ b/test/TimeBasedTwoFactorToken.test.php
@@ -1,9 +1,8 @@
 <?php
 
 use Base32\Base32;
-use Configuration\Configuration;
-use Objects\TwoFactor\TimeBasedTwoFactorToken;
-use Objects\DatabaseEntity\User;
+use Core\Objects\Context;
+use Core\Objects\TwoFactor\TimeBasedTwoFactorToken;
 
 class TimeBasedTwoFactorTokenTest extends PHPUnit\Framework\TestCase {
 
@@ -31,7 +30,7 @@ class TimeBasedTwoFactorTokenTest extends PHPUnit\Framework\TestCase {
 
   public function testURL() {
     $secret = Base32::encode("12345678901234567890");
-    $context = new \Objects\Context();
+    $context = new Context();
 
     // $context->