diff --git a/fabric/src/alt-auth.mixins.json b/fabric/src/alt-auth.mixins.json
index 5c7a44e..99f4534 100644
--- a/fabric/src/alt-auth.mixins.json
+++ b/fabric/src/alt-auth.mixins.json
@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "de.chaoscaot.altauth.mixin",
+  "package": "de.chaoscaot.altauth.fabric.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
     "client.LoginRequestMixin"
diff --git a/fabric/src/de/chaoscaot/altauth/AltAuthClient.java b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthClient.java
similarity index 70%
rename from fabric/src/de/chaoscaot/altauth/AltAuthClient.java
rename to fabric/src/de/chaoscaot/altauth/fabric/AltAuthClient.java
index 42c9326..54a2e80 100644
--- a/fabric/src/de/chaoscaot/altauth/AltAuthClient.java
+++ b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthClient.java
@@ -1,4 +1,6 @@
-package de.chaoscaot.altauth;
+// SPDX-License-Identifier: MIT
+
+package de.chaoscaot.altauth.fabric;
 
 import net.fabricmc.api.ClientModInitializer;
 
diff --git a/fabric/src/de/chaoscaot/altauth/config/client/AltAuthClientConfig.java b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthClientConfig.java
similarity index 61%
rename from fabric/src/de/chaoscaot/altauth/config/client/AltAuthClientConfig.java
rename to fabric/src/de/chaoscaot/altauth/fabric/AltAuthClientConfig.java
index 931cc35..f1b4a23 100644
--- a/fabric/src/de/chaoscaot/altauth/config/client/AltAuthClientConfig.java
+++ b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthClientConfig.java
@@ -1,6 +1,7 @@
-package de.chaoscaot.altauth.config.client;
+// SPDX-License-Identifier: MIT
+
+package de.chaoscaot.altauth.fabric;
 
-import de.chaoscaot.altauth.AltAuth;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.io.File;
@@ -20,10 +21,10 @@ public class AltAuthClientConfig {
             INSTANCE = new AltAuthClientConfig();
         } else {
             try {
-                INSTANCE = AltAuth.GSON.fromJson(Files.readString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME)), AltAuthClientConfig.class);
+                INSTANCE = AltAuthFabric.GSON.fromJson(Files.readString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME)), AltAuthClientConfig.class);
             } catch (IOException e) {
-                AltAuth.LOGGER.error("AltauthClient: AltAuthClientConfig: Error while loading config", e);
-                AltAuth.LOGGER.info("Reset Config...");
+                AltAuthFabric.LOGGER.error("AltauthClient: AltAuthClientConfig: Error while loading config", e);
+                AltAuthFabric.LOGGER.info("Reset Config...");
                 INSTANCE = new AltAuthClientConfig();
                 INSTANCE.save();
             }
@@ -35,9 +36,9 @@ public class AltAuthClientConfig {
 
     public void save() {
         try {
-            Files.writeString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME), AltAuth.GSON.toJson(this));
+            Files.writeString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME), AltAuthFabric.GSON.toJson(this));
         } catch (IOException e) {
-            AltAuth.LOGGER.error("AltauthClient: AltAuthClientConfig: Error while saving config", e);
+            AltAuthFabric.LOGGER.error("AltauthClient: AltAuthClientConfig: Error while saving config", e);
         }
     }
 }
diff --git a/fabric/src/de/chaoscaot/altauth/AltAuth.java b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthFabric.java
similarity index 76%
rename from fabric/src/de/chaoscaot/altauth/AltAuth.java
rename to fabric/src/de/chaoscaot/altauth/fabric/AltAuthFabric.java
index a80a691..86d74c1 100644
--- a/fabric/src/de/chaoscaot/altauth/AltAuth.java
+++ b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthFabric.java
@@ -1,4 +1,6 @@
-package de.chaoscaot.altauth;
+// SPDX-License-Identifier: MIT
+
+package de.chaoscaot.altauth.fabric;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -6,7 +8,7 @@ import net.fabricmc.api.ModInitializer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class AltAuth implements ModInitializer {
+public class AltAuthFabric implements ModInitializer {
 
     public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
     public static final Logger LOGGER = LogManager.getLogger();
diff --git a/fabric/src/de/chaoscaot/altauth/AltAuthServer.java b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthServer.java
similarity index 72%
rename from fabric/src/de/chaoscaot/altauth/AltAuthServer.java
rename to fabric/src/de/chaoscaot/altauth/fabric/AltAuthServer.java
index 42f4f09..c6cc613 100644
--- a/fabric/src/de/chaoscaot/altauth/AltAuthServer.java
+++ b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthServer.java
@@ -1,4 +1,6 @@
-package de.chaoscaot.altauth;
+// SPDX-License-Identifier: MIT
+
+package de.chaoscaot.altauth.fabric;
 
 import net.fabricmc.api.DedicatedServerModInitializer;
 
diff --git a/fabric/src/de/chaoscaot/altauth/config/server/AltAuthServerConfig.java b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthServerConfig.java
similarity index 56%
rename from fabric/src/de/chaoscaot/altauth/config/server/AltAuthServerConfig.java
rename to fabric/src/de/chaoscaot/altauth/fabric/AltAuthServerConfig.java
index 3236a21..89fefab 100644
--- a/fabric/src/de/chaoscaot/altauth/config/server/AltAuthServerConfig.java
+++ b/fabric/src/de/chaoscaot/altauth/fabric/AltAuthServerConfig.java
@@ -1,6 +1,7 @@
-package de.chaoscaot.altauth.config.server;
+// SPDX-License-Identifier: MIT
+
+package de.chaoscaot.altauth.fabric;
 
-import de.chaoscaot.altauth.AltAuth;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.io.File;
@@ -18,14 +19,14 @@ public class AltAuthServerConfig {
             INSTANCE = new AltAuthServerConfig();
         } else {
             try {
-                INSTANCE = AltAuth.GSON.fromJson(Files.readString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME)), AltAuthServerConfig.class);
+                INSTANCE = AltAuthFabric.GSON.fromJson(Files.readString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME)), AltAuthServerConfig.class);
                 if(INSTANCE.serverUrl.length() > 20) {
-                    AltAuth.LOGGER.error("AltauthServer: AltAuthServerConfig: ServerUrl is too long. Max length is 20 characters");
+                    AltAuthFabric.LOGGER.error("AltauthServer: AltAuthServerConfig: ServerUrl is too long. Max length is 20 characters");
                     INSTANCE.serverUrl = "";
                 }
             } catch (IOException e) {
-                AltAuth.LOGGER.error("AltauthServer: AltAuthServerConfig: Error while loading config", e);
-                AltAuth.LOGGER.info("Reset Config...");
+                AltAuthFabric.LOGGER.error("AltauthServer: AltAuthServerConfig: Error while loading config", e);
+                AltAuthFabric.LOGGER.info("Reset Config...");
                 INSTANCE = new AltAuthServerConfig();
                 INSTANCE.save();
             }
@@ -36,9 +37,9 @@ public class AltAuthServerConfig {
 
     public void save() {
         try {
-            Files.writeString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME), AltAuth.GSON.toJson(this));
+            Files.writeString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME), AltAuthFabric.GSON.toJson(this));
         } catch (IOException e) {
-            AltAuth.LOGGER.error("AltauthServer: AltAuthServerConfig: Error while saving config", e);
+            AltAuthFabric.LOGGER.error("AltauthServer: AltAuthServerConfig: Error while saving config", e);
         }
     }
 }
diff --git a/fabric/src/de/chaoscaot/altauth/gui/ApproveServerScreen.java b/fabric/src/de/chaoscaot/altauth/fabric/ApproveServerScreen.java
similarity index 90%
rename from fabric/src/de/chaoscaot/altauth/gui/ApproveServerScreen.java
rename to fabric/src/de/chaoscaot/altauth/fabric/ApproveServerScreen.java
index 80e1492..1c63249 100644
--- a/fabric/src/de/chaoscaot/altauth/gui/ApproveServerScreen.java
+++ b/fabric/src/de/chaoscaot/altauth/fabric/ApproveServerScreen.java
@@ -1,4 +1,6 @@
-package de.chaoscaot.altauth.gui;
+// SPDX-License-Identifier: MIT
+
+package de.chaoscaot.altauth.fabric;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
diff --git a/fabric/src/de/chaoscaot/altauth/mixin/client/LoginRequestMixin.java b/fabric/src/de/chaoscaot/altauth/fabric/mixin/LoginRequestMixin.java
similarity index 96%
rename from fabric/src/de/chaoscaot/altauth/mixin/client/LoginRequestMixin.java
rename to fabric/src/de/chaoscaot/altauth/fabric/mixin/LoginRequestMixin.java
index 2181032..8fa1c8a 100644
--- a/fabric/src/de/chaoscaot/altauth/mixin/client/LoginRequestMixin.java
+++ b/fabric/src/de/chaoscaot/altauth/fabric/mixin/LoginRequestMixin.java
@@ -1,4 +1,6 @@
-package de.chaoscaot.altauth.mixin.client;
+// SPDX-License-Identifier: MIT
+
+package de.chaoscaot.altauth.fabric.mixin;
 
 import com.mojang.authlib.yggdrasil.YggdrasilEnvironment;
 import net.fabricmc.api.EnvType;
diff --git a/fabric/src/de/chaoscaot/altauth/mixin/server/ServerIdMixin.java b/fabric/src/de/chaoscaot/altauth/fabric/mixin/ServerIdMixin.java
similarity index 85%
rename from fabric/src/de/chaoscaot/altauth/mixin/server/ServerIdMixin.java
rename to fabric/src/de/chaoscaot/altauth/fabric/mixin/ServerIdMixin.java
index 99c0afb..d892549 100644
--- a/fabric/src/de/chaoscaot/altauth/mixin/server/ServerIdMixin.java
+++ b/fabric/src/de/chaoscaot/altauth/fabric/mixin/ServerIdMixin.java
@@ -1,6 +1,8 @@
-package de.chaoscaot.altauth.mixin.server;
+// SPDX-License-Identifier: MIT
 
-import de.chaoscaot.altauth.config.server.AltAuthServerConfig;
+package de.chaoscaot.altauth.fabric.mixin;
+
+import de.chaoscaot.altauth.fabric.AltAuthServerConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.network.PacketByteBuf;
diff --git a/fabric/src/fabric.mod.json b/fabric/src/fabric.mod.json
index 8c45d1f..27f12a2 100644
--- a/fabric/src/fabric.mod.json
+++ b/fabric/src/fabric.mod.json
@@ -10,13 +10,13 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "de.chaoscaot.altauth.AltAuth"
+      "de.chaoscaot.altauth.fabric.AltAuth"
     ],
     "client": [
-      "de.chaoscaot.altauth.AltAuthClient"
+      "de.chaoscaot.altauth.fabric.AltAuthClient"
     ],
     "server": [
-      "de.chaoscaot.altauth.AltAuthServer"
+      "de.chaoscaot.altauth.fabric.AltAuthServer"
     ]
   },
   "mixins": [
diff --git a/proxy.py b/proxy.py
index c020f8d..63f7e55 100644
--- a/proxy.py
+++ b/proxy.py
@@ -177,7 +177,7 @@ class AltAuthRequestHandler(BaseHTTPRequestHandler):
         except BaseException as e:
             print(e)
 
-            self.send_response(HTTPStatus.INTERNAL_SERVER_ERROR)
+            self.send_response(HTTPStatus.FORBIDDEN)
             self.end_headers()