diff --git a/Dockerfile b/Dockerfile
index f1c6c24..6db7c7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 FROM node:22.4.1-alpine
 
 # Set the working directory in the container
-WORKDIR /usr/src/app
+WORKDIR /usr/src/
 
 # Copy package.json and package-lock.json (if available)
 COPY package*.json ./
@@ -26,10 +26,10 @@ RUN npm run build
 EXPOSE 80
 
 # Create a shell script to run migrations and start the application
-RUN echo '#!/bin/sh' > /usr/src/app/start.sh && \
-    echo 'npx prisma migrate deploy' >> /usr/src/app/start.sh && \
-    echo 'node dist/server.js' >> /usr/src/app/start.sh && \
-    chmod +x /usr/src/app/start.sh
+RUN echo '#!/bin/sh' > /usr/src/start.sh && \
+    echo 'npx prisma migrate deploy' >> /usr/src/start.sh && \
+    echo 'node dist/server.js' >> /usr/src/start.sh && \
+    chmod +x /usr/src/start.sh
 
 # Use the shell script as the entry point
-CMD ["/usr/src/app/start.sh"]
\ No newline at end of file
+CMD ["/usr/src/start.sh"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 64176b5..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-version: '3'
-services:
-  app:
-    volumes:
-      - ./persistent_data:/usr/src/app/public
\ No newline at end of file
diff --git a/src/app/commands/alert.ts b/src/commands/alert.ts
similarity index 100%
rename from src/app/commands/alert.ts
rename to src/commands/alert.ts
diff --git a/src/app/commands/listZones.ts b/src/commands/listZones.ts
similarity index 76%
rename from src/app/commands/listZones.ts
rename to src/commands/listZones.ts
index a8e1258..33a17bf 100644
--- a/src/app/commands/listZones.ts
+++ b/src/commands/listZones.ts
@@ -1,5 +1,5 @@
 import { Server } from "socket.io";
-import ZoneManager from "../ZoneManager";
+import ZoneManager from "../managers/ZoneManager";
 
 type CommandInput = string[]
 
diff --git a/src/app/events/Disconnect.ts b/src/events/Disconnect.ts
similarity index 92%
rename from src/app/events/Disconnect.ts
rename to src/events/Disconnect.ts
index bd8ae13..fc8e287 100644
--- a/src/app/events/Disconnect.ts
+++ b/src/events/Disconnect.ts
@@ -1,6 +1,6 @@
 import { Server } from "socket.io";
 import {TSocket} from "../utilities/Types";
-import ZoneManager from "../ZoneManager";
+import ZoneManager from "../managers/ZoneManager";
 
 export default function (socket: TSocket, io: Server) {
     socket.on('disconnect', (data: any) => {
diff --git a/src/app/events/Login.ts b/src/events/Login.ts
similarity index 100%
rename from src/app/events/Login.ts
rename to src/events/Login.ts
diff --git a/src/app/events/character/CharacterConnect.ts b/src/events/character/CharacterConnect.ts
similarity index 100%
rename from src/app/events/character/CharacterConnect.ts
rename to src/events/character/CharacterConnect.ts
diff --git a/src/app/events/character/CharacterCreate.ts b/src/events/character/CharacterCreate.ts
similarity index 100%
rename from src/app/events/character/CharacterCreate.ts
rename to src/events/character/CharacterCreate.ts
diff --git a/src/app/events/character/CharacterDelete.ts b/src/events/character/CharacterDelete.ts
similarity index 100%
rename from src/app/events/character/CharacterDelete.ts
rename to src/events/character/CharacterDelete.ts
diff --git a/src/app/events/character/CharacterList.ts b/src/events/character/CharacterList.ts
similarity index 100%
rename from src/app/events/character/CharacterList.ts
rename to src/events/character/CharacterList.ts
diff --git a/src/app/events/character/CharacterMove.ts b/src/events/character/CharacterMove.ts
similarity index 95%
rename from src/app/events/character/CharacterMove.ts
rename to src/events/character/CharacterMove.ts
index fce7c07..fa44e39 100644
--- a/src/app/events/character/CharacterMove.ts
+++ b/src/events/character/CharacterMove.ts
@@ -1,7 +1,7 @@
 import { Server } from "socket.io";
 import {TSocket} from "../../utilities/Types";
 import CharacterRepository from "../../repositories/CharacterRepository";
-import ZoneManager from "../../ZoneManager";
+import ZoneManager from "../../managers/ZoneManager";
 
 type SocketResponseT = {
     position_x: number,
diff --git a/src/app/events/character/CharacterZoneLeave.ts b/src/events/character/CharacterZoneLeave.ts
similarity index 96%
rename from src/app/events/character/CharacterZoneLeave.ts
rename to src/events/character/CharacterZoneLeave.ts
index 69dae87..8450db3 100644
--- a/src/app/events/character/CharacterZoneLeave.ts
+++ b/src/events/character/CharacterZoneLeave.ts
@@ -1,7 +1,7 @@
 import { Server } from "socket.io";
 import {TSocket} from "../../utilities/Types";
 import ZoneRepository from "../../repositories/ZoneRepository";
-import ZoneManager from "../../ZoneManager";
+import ZoneManager from "../../managers/ZoneManager";
 import {Character, Zone} from "@prisma/client";
 
 /**
diff --git a/src/app/events/character/CharacterZoneRequest.ts b/src/events/character/CharacterZoneRequest.ts
similarity index 96%
rename from src/app/events/character/CharacterZoneRequest.ts
rename to src/events/character/CharacterZoneRequest.ts
index d899bbc..68c866a 100644
--- a/src/app/events/character/CharacterZoneRequest.ts
+++ b/src/events/character/CharacterZoneRequest.ts
@@ -1,7 +1,7 @@
 import { Server } from "socket.io";
 import {TSocket} from "../../utilities/Types";
 import ZoneRepository from "../../repositories/ZoneRepository";
-import ZoneManager from "../../ZoneManager";
+import ZoneManager from "../../managers/ZoneManager";
 import {Character, Zone} from "@prisma/client";
 
 interface IPayload {
diff --git a/src/app/events/gm/object/GmObjectList.ts b/src/events/gm/object/GmObjectList.ts
similarity index 100%
rename from src/app/events/gm/object/GmObjectList.ts
rename to src/events/gm/object/GmObjectList.ts
diff --git a/src/app/events/gm/object/GmObjectRemove.ts b/src/events/gm/object/GmObjectRemove.ts
similarity index 100%
rename from src/app/events/gm/object/GmObjectRemove.ts
rename to src/events/gm/object/GmObjectRemove.ts
diff --git a/src/app/events/gm/object/GmObjectUpdate.ts b/src/events/gm/object/GmObjectUpdate.ts
similarity index 100%
rename from src/app/events/gm/object/GmObjectUpdate.ts
rename to src/events/gm/object/GmObjectUpdate.ts
diff --git a/src/app/events/gm/object/GmObjectUpload.ts b/src/events/gm/object/GmObjectUpload.ts
similarity index 100%
rename from src/app/events/gm/object/GmObjectUpload.ts
rename to src/events/gm/object/GmObjectUpload.ts
diff --git a/src/app/events/gm/sprite/List.ts b/src/events/gm/sprite/List.ts
similarity index 100%
rename from src/app/events/gm/sprite/List.ts
rename to src/events/gm/sprite/List.ts
diff --git a/src/app/events/gm/sprite/Remove.ts b/src/events/gm/sprite/Remove.ts
similarity index 100%
rename from src/app/events/gm/sprite/Remove.ts
rename to src/events/gm/sprite/Remove.ts
diff --git a/src/app/events/gm/sprite/Update.ts b/src/events/gm/sprite/Update.ts
similarity index 100%
rename from src/app/events/gm/sprite/Update.ts
rename to src/events/gm/sprite/Update.ts
diff --git a/src/app/events/gm/sprite/Upload.ts b/src/events/gm/sprite/Upload.ts
similarity index 100%
rename from src/app/events/gm/sprite/Upload.ts
rename to src/events/gm/sprite/Upload.ts
diff --git a/src/app/events/gm/tile/GmTileList.ts b/src/events/gm/tile/GmTileList.ts
similarity index 100%
rename from src/app/events/gm/tile/GmTileList.ts
rename to src/events/gm/tile/GmTileList.ts
diff --git a/src/app/events/gm/tile/GmTileRemove.ts b/src/events/gm/tile/GmTileRemove.ts
similarity index 100%
rename from src/app/events/gm/tile/GmTileRemove.ts
rename to src/events/gm/tile/GmTileRemove.ts
diff --git a/src/app/events/gm/tile/GmTileUpdate.ts b/src/events/gm/tile/GmTileUpdate.ts
similarity index 100%
rename from src/app/events/gm/tile/GmTileUpdate.ts
rename to src/events/gm/tile/GmTileUpdate.ts
diff --git a/src/app/events/gm/tile/GmTileUpload.ts b/src/events/gm/tile/GmTileUpload.ts
similarity index 100%
rename from src/app/events/gm/tile/GmTileUpload.ts
rename to src/events/gm/tile/GmTileUpload.ts
diff --git a/src/app/events/gm/zone/GmZoneEditorZoneCreate.ts b/src/events/gm/zone/GmZoneEditorZoneCreate.ts
similarity index 96%
rename from src/app/events/gm/zone/GmZoneEditorZoneCreate.ts
rename to src/events/gm/zone/GmZoneEditorZoneCreate.ts
index 8806408..b7b0537 100644
--- a/src/app/events/gm/zone/GmZoneEditorZoneCreate.ts
+++ b/src/events/gm/zone/GmZoneEditorZoneCreate.ts
@@ -1,7 +1,7 @@
 import { Server } from "socket.io";
 import {TSocket} from "../../../utilities/Types";
 import ZoneRepository from "../../../repositories/ZoneRepository";
-import ZoneManager from "../../../ZoneManager";
+import ZoneManager from "../../../managers/ZoneManager";
 import {Character, Zone} from "@prisma/client";
 
 interface IPayload {
diff --git a/src/app/events/gm/zone/GmZoneEditorZoneDelete.ts b/src/events/gm/zone/GmZoneEditorZoneDelete.ts
similarity index 95%
rename from src/app/events/gm/zone/GmZoneEditorZoneDelete.ts
rename to src/events/gm/zone/GmZoneEditorZoneDelete.ts
index 91456b7..67c3607 100644
--- a/src/app/events/gm/zone/GmZoneEditorZoneDelete.ts
+++ b/src/events/gm/zone/GmZoneEditorZoneDelete.ts
@@ -1,7 +1,7 @@
 import { Server } from "socket.io";
 import {TSocket} from "../../../utilities/Types";
 import ZoneRepository from "../../../repositories/ZoneRepository";
-import ZoneManager from "../../../ZoneManager";
+import ZoneManager from "../../../managers/ZoneManager";
 import {Character, Zone} from "@prisma/client";
 
 interface IPayload {
diff --git a/src/app/events/gm/zone/GmZoneEditorZoneList.ts b/src/events/gm/zone/GmZoneEditorZoneList.ts
similarity index 100%
rename from src/app/events/gm/zone/GmZoneEditorZoneList.ts
rename to src/events/gm/zone/GmZoneEditorZoneList.ts
diff --git a/src/app/events/gm/zone/GmZoneEditorZoneRequest.ts b/src/events/gm/zone/GmZoneEditorZoneRequest.ts
similarity index 100%
rename from src/app/events/gm/zone/GmZoneEditorZoneRequest.ts
rename to src/events/gm/zone/GmZoneEditorZoneRequest.ts
diff --git a/src/app/events/gm/zone/GmZoneEditorZoneUpdate.ts b/src/events/gm/zone/GmZoneEditorZoneUpdate.ts
similarity index 96%
rename from src/app/events/gm/zone/GmZoneEditorZoneUpdate.ts
rename to src/events/gm/zone/GmZoneEditorZoneUpdate.ts
index 22d91e1..d9ab725 100644
--- a/src/app/events/gm/zone/GmZoneEditorZoneUpdate.ts
+++ b/src/events/gm/zone/GmZoneEditorZoneUpdate.ts
@@ -1,7 +1,7 @@
 import { Server } from "socket.io";
 import {TSocket} from "../../../utilities/Types";
 import ZoneRepository from "../../../repositories/ZoneRepository";
-import ZoneManager from "../../../ZoneManager";
+import ZoneManager from "../../../managers/ZoneManager";
 import { Character, Zone, ZoneEventTile, ZoneObject } from '@prisma/client'
 
 interface IPayload {
diff --git a/src/app/CommandManager.ts b/src/managers/CommandManager.ts
similarity index 100%
rename from src/app/CommandManager.ts
rename to src/managers/CommandManager.ts
diff --git a/src/app/UserManager.ts b/src/managers/UserManager.ts
similarity index 100%
rename from src/app/UserManager.ts
rename to src/managers/UserManager.ts
diff --git a/src/app/ZoneManager.ts b/src/managers/ZoneManager.ts
similarity index 96%
rename from src/app/ZoneManager.ts
rename to src/managers/ZoneManager.ts
index 6ad358f..bb7a12d 100644
--- a/src/app/ZoneManager.ts
+++ b/src/managers/ZoneManager.ts
@@ -1,6 +1,6 @@
 import {Character, Zone} from "@prisma/client";
-import ZoneRepository from "./repositories/ZoneRepository";
-import ZoneService from "./services/ZoneService";
+import ZoneRepository from "../repositories/ZoneRepository";
+import ZoneService from "../services/ZoneService";
 
 type TLoadedZone = {
     zone: Zone;
diff --git a/src/app/middleware/Authentication.ts b/src/middleware/Authentication.ts
similarity index 100%
rename from src/app/middleware/Authentication.ts
rename to src/middleware/Authentication.ts
diff --git a/src/app/repositories/CharacterRepository.ts b/src/repositories/CharacterRepository.ts
similarity index 100%
rename from src/app/repositories/CharacterRepository.ts
rename to src/repositories/CharacterRepository.ts
diff --git a/src/app/repositories/ObjectRepository.ts b/src/repositories/ObjectRepository.ts
similarity index 100%
rename from src/app/repositories/ObjectRepository.ts
rename to src/repositories/ObjectRepository.ts
diff --git a/src/app/repositories/SpriteRepository.ts b/src/repositories/SpriteRepository.ts
similarity index 100%
rename from src/app/repositories/SpriteRepository.ts
rename to src/repositories/SpriteRepository.ts
diff --git a/src/app/repositories/TileRepository.ts b/src/repositories/TileRepository.ts
similarity index 100%
rename from src/app/repositories/TileRepository.ts
rename to src/repositories/TileRepository.ts
diff --git a/src/app/repositories/UserRepository.ts b/src/repositories/UserRepository.ts
similarity index 100%
rename from src/app/repositories/UserRepository.ts
rename to src/repositories/UserRepository.ts
diff --git a/src/app/repositories/ZoneRepository.ts b/src/repositories/ZoneRepository.ts
similarity index 100%
rename from src/app/repositories/ZoneRepository.ts
rename to src/repositories/ZoneRepository.ts
diff --git a/src/server.ts b/src/server.ts
index 3c99830..44f3f6c 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -2,16 +2,16 @@ import fs from "fs";
 import path from "path";
 import express, {Application} from 'express';
 import {createServer as httpServer} from 'http';
-import {addHttpRoutes} from './app/utilities/Http';
+import {addHttpRoutes} from './utilities/Http';
 import cors from 'cors';
 import {Server as SocketServer} from 'socket.io';
-import {TSocket} from "./app/utilities/Types";
-import config from './app/utilities/Config';
-import prisma from './app/utilities/Prisma';
-import ZoneManager from "./app/ZoneManager";
-import UserManager from "./app/UserManager";
-import {Authentication} from "./app/middleware/Authentication";
-import CommandManager from "./app/CommandManager";
+import {TSocket} from "./utilities/Types";
+import config from './utilities/Config';
+import prisma from './utilities/Prisma';
+import ZoneManager from "./managers/ZoneManager";
+import UserManager from "./managers/UserManager";
+import {Authentication} from "./middleware/Authentication";
+import CommandManager from "./managers/CommandManager";
 import {Dirent} from "node:fs";
 
 export class Server
diff --git a/src/app/services/AssetService.ts b/src/services/AssetService.ts
similarity index 100%
rename from src/app/services/AssetService.ts
rename to src/services/AssetService.ts
diff --git a/src/app/services/CharacterService.ts b/src/services/CharacterService.ts
similarity index 100%
rename from src/app/services/CharacterService.ts
rename to src/services/CharacterService.ts
diff --git a/src/app/services/UserService.ts b/src/services/UserService.ts
similarity index 100%
rename from src/app/services/UserService.ts
rename to src/services/UserService.ts
diff --git a/src/app/services/ZoneService.ts b/src/services/ZoneService.ts
similarity index 100%
rename from src/app/services/ZoneService.ts
rename to src/services/ZoneService.ts
diff --git a/src/app/utilities/Config.ts b/src/utilities/Config.ts
similarity index 100%
rename from src/app/utilities/Config.ts
rename to src/utilities/Config.ts
diff --git a/src/app/utilities/Http.ts b/src/utilities/Http.ts
similarity index 100%
rename from src/app/utilities/Http.ts
rename to src/utilities/Http.ts
diff --git a/src/app/utilities/Prisma.ts b/src/utilities/Prisma.ts
similarity index 100%
rename from src/app/utilities/Prisma.ts
rename to src/utilities/Prisma.ts
diff --git a/src/app/utilities/Types.ts b/src/utilities/Types.ts
similarity index 100%
rename from src/app/utilities/Types.ts
rename to src/utilities/Types.ts
diff --git a/src/app/utilities/ZodTypes.ts b/src/utilities/ZodTypes.ts
similarity index 100%
rename from src/app/utilities/ZodTypes.ts
rename to src/utilities/ZodTypes.ts