diff --git a/exam/api/Auth/Auth.php b/exam/classes/Auth/Auth.php
similarity index 93%
rename from exam/api/Auth/Auth.php
rename to exam/classes/Auth/Auth.php
index 4a3fb2b..30b005c 100644
--- a/exam/api/Auth/Auth.php
+++ b/exam/classes/Auth/Auth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api\Auth;
+namespace Khofmann\Auth;
 
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
diff --git a/exam/classes/Database/Database.php b/exam/classes/Database/Database.php
new file mode 100644
index 0000000..5da3879
--- /dev/null
+++ b/exam/classes/Database/Database.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Khofmann\Database;
+
+use \PDO;
+
+class Database extends
+{
+  private static array $instances = [];
+
+  protected function __construct($dsn, $username = null, $password = null, array $options = null)
+  {
+    parent::__construct($dsn, $username, $password, $options);
+  }
+
+  public static function getInstance(): Database
+  {
+    $cls = static::class;
+    if (!isset(self::$instances[$cls])) {
+      $dataAccess = Config\Config::getDatabase();
+      self::$instances[$cls] = new static(
+        "mysql:host={$dataAccess["host"]};dbname={$dataAccess["database"]};charset={$dataAccess["charset"]}",
+        $dataAccess["user"],
+        $dataAccess["passwd"],
+        [
+          PDO::ATTR_PERSISTENT => false,
+          PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+          PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+          PDO::ATTR_EMULATE_PREPARES   => false,
+        ]
+      );
+    }
+
+    return self::$instances[$cls];
+  }
+}
diff --git a/exam/composer.json b/exam/composer.json
index b05f569..40d1531 100644
--- a/exam/composer.json
+++ b/exam/composer.json
@@ -5,7 +5,8 @@
   "autoload": {
     "psr-4": {
       "Api\\": "api/",
-      "Config\\": "config/"
+      "Config\\": "config/",
+      "Khofmann\\": "classes/"
     }
   }
 }
diff --git a/exam/routes/routes.php b/exam/routes/routes.php
index d7b5a6c..4a4ee88 100644
--- a/exam/routes/routes.php
+++ b/exam/routes/routes.php
@@ -14,7 +14,7 @@ SimpleRouter::all("/", function () {
 SimpleRouter::post("/login", [Api\Login\Login::class, "post"]);
 SimpleRouter::post("/logout", [Api\Logout\Logout::class, "post"]);
 // User
-SimpleRouter::group(["middleware" => \Api\Auth\Auth::class], function () {
+SimpleRouter::group(["middleware" => \Khofmann\Auth\Auth::class], function () {
   SimpleRouter::get("/user/{id}", function ($userID) {
     echo "USER ENDP $userID";
   });