diff --git a/src/socketEvents/character/charactersScreen/characterHairList.ts b/src/events/character/charactersScreen/characterHairList.ts
similarity index 100%
rename from src/socketEvents/character/charactersScreen/characterHairList.ts
rename to src/events/character/charactersScreen/characterHairList.ts
diff --git a/src/socketEvents/character/connect.ts b/src/events/character/connect.ts
similarity index 100%
rename from src/socketEvents/character/connect.ts
rename to src/events/character/connect.ts
diff --git a/src/socketEvents/character/create.ts b/src/events/character/create.ts
similarity index 100%
rename from src/socketEvents/character/create.ts
rename to src/events/character/create.ts
diff --git a/src/socketEvents/character/delete.ts b/src/events/character/delete.ts
similarity index 100%
rename from src/socketEvents/character/delete.ts
rename to src/events/character/delete.ts
diff --git a/src/socketEvents/character/list.ts b/src/events/character/list.ts
similarity index 100%
rename from src/socketEvents/character/list.ts
rename to src/events/character/list.ts
diff --git a/src/socketEvents/chat/gameMaster/alertCommand.ts b/src/events/chat/gameMaster/alertCommand.ts
similarity index 100%
rename from src/socketEvents/chat/gameMaster/alertCommand.ts
rename to src/events/chat/gameMaster/alertCommand.ts
diff --git a/src/socketEvents/chat/gameMaster/setTimeCommand.ts b/src/events/chat/gameMaster/setTimeCommand.ts
similarity index 100%
rename from src/socketEvents/chat/gameMaster/setTimeCommand.ts
rename to src/events/chat/gameMaster/setTimeCommand.ts
diff --git a/src/socketEvents/chat/gameMaster/teleportCommand.ts b/src/events/chat/gameMaster/teleportCommand.ts
similarity index 100%
rename from src/socketEvents/chat/gameMaster/teleportCommand.ts
rename to src/events/chat/gameMaster/teleportCommand.ts
diff --git a/src/socketEvents/chat/gameMaster/toggleFogCommand.ts b/src/events/chat/gameMaster/toggleFogCommand.ts
similarity index 100%
rename from src/socketEvents/chat/gameMaster/toggleFogCommand.ts
rename to src/events/chat/gameMaster/toggleFogCommand.ts
diff --git a/src/socketEvents/chat/gameMaster/toggleRainCommand.ts b/src/events/chat/gameMaster/toggleRainCommand.ts
similarity index 100%
rename from src/socketEvents/chat/gameMaster/toggleRainCommand.ts
rename to src/events/chat/gameMaster/toggleRainCommand.ts
diff --git a/src/socketEvents/chat/message.ts b/src/events/chat/message.ts
similarity index 100%
rename from src/socketEvents/chat/message.ts
rename to src/events/chat/message.ts
diff --git a/src/socketEvents/disconnect.ts b/src/events/disconnect.ts
similarity index 100%
rename from src/socketEvents/disconnect.ts
rename to src/events/disconnect.ts
diff --git a/src/socketEvents/gameMaster/assetManager/characterHair/create.ts b/src/events/gameMaster/assetManager/characterHair/create.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/characterHair/create.ts
rename to src/events/gameMaster/assetManager/characterHair/create.ts
diff --git a/src/socketEvents/gameMaster/assetManager/characterHair/delete.ts b/src/events/gameMaster/assetManager/characterHair/delete.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/characterHair/delete.ts
rename to src/events/gameMaster/assetManager/characterHair/delete.ts
diff --git a/src/socketEvents/gameMaster/assetManager/characterHair/list.ts b/src/events/gameMaster/assetManager/characterHair/list.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/characterHair/list.ts
rename to src/events/gameMaster/assetManager/characterHair/list.ts
diff --git a/src/socketEvents/gameMaster/assetManager/characterHair/update.ts b/src/events/gameMaster/assetManager/characterHair/update.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/characterHair/update.ts
rename to src/events/gameMaster/assetManager/characterHair/update.ts
diff --git a/src/socketEvents/gameMaster/assetManager/characterType/create.ts b/src/events/gameMaster/assetManager/characterType/create.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/characterType/create.ts
rename to src/events/gameMaster/assetManager/characterType/create.ts
diff --git a/src/socketEvents/gameMaster/assetManager/characterType/delete.ts b/src/events/gameMaster/assetManager/characterType/delete.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/characterType/delete.ts
rename to src/events/gameMaster/assetManager/characterType/delete.ts
diff --git a/src/socketEvents/gameMaster/assetManager/characterType/list.ts b/src/events/gameMaster/assetManager/characterType/list.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/characterType/list.ts
rename to src/events/gameMaster/assetManager/characterType/list.ts
diff --git a/src/socketEvents/gameMaster/assetManager/characterType/update.ts b/src/events/gameMaster/assetManager/characterType/update.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/characterType/update.ts
rename to src/events/gameMaster/assetManager/characterType/update.ts
diff --git a/src/socketEvents/gameMaster/assetManager/item/create.ts b/src/events/gameMaster/assetManager/item/create.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/item/create.ts
rename to src/events/gameMaster/assetManager/item/create.ts
diff --git a/src/socketEvents/gameMaster/assetManager/item/delete.ts b/src/events/gameMaster/assetManager/item/delete.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/item/delete.ts
rename to src/events/gameMaster/assetManager/item/delete.ts
diff --git a/src/socketEvents/gameMaster/assetManager/item/list.ts b/src/events/gameMaster/assetManager/item/list.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/item/list.ts
rename to src/events/gameMaster/assetManager/item/list.ts
diff --git a/src/socketEvents/gameMaster/assetManager/item/update.ts b/src/events/gameMaster/assetManager/item/update.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/item/update.ts
rename to src/events/gameMaster/assetManager/item/update.ts
diff --git a/src/socketEvents/gameMaster/assetManager/object/list.ts b/src/events/gameMaster/assetManager/object/list.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/object/list.ts
rename to src/events/gameMaster/assetManager/object/list.ts
diff --git a/src/socketEvents/gameMaster/assetManager/object/remove.ts b/src/events/gameMaster/assetManager/object/remove.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/object/remove.ts
rename to src/events/gameMaster/assetManager/object/remove.ts
diff --git a/src/socketEvents/gameMaster/assetManager/object/update.ts b/src/events/gameMaster/assetManager/object/update.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/object/update.ts
rename to src/events/gameMaster/assetManager/object/update.ts
diff --git a/src/socketEvents/gameMaster/assetManager/object/upload.ts b/src/events/gameMaster/assetManager/object/upload.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/object/upload.ts
rename to src/events/gameMaster/assetManager/object/upload.ts
diff --git a/src/socketEvents/gameMaster/assetManager/sprite/copy.ts b/src/events/gameMaster/assetManager/sprite/copy.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/sprite/copy.ts
rename to src/events/gameMaster/assetManager/sprite/copy.ts
diff --git a/src/socketEvents/gameMaster/assetManager/sprite/create.ts b/src/events/gameMaster/assetManager/sprite/create.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/sprite/create.ts
rename to src/events/gameMaster/assetManager/sprite/create.ts
diff --git a/src/socketEvents/gameMaster/assetManager/sprite/delete.ts b/src/events/gameMaster/assetManager/sprite/delete.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/sprite/delete.ts
rename to src/events/gameMaster/assetManager/sprite/delete.ts
diff --git a/src/socketEvents/gameMaster/assetManager/sprite/list.ts b/src/events/gameMaster/assetManager/sprite/list.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/sprite/list.ts
rename to src/events/gameMaster/assetManager/sprite/list.ts
diff --git a/src/socketEvents/gameMaster/assetManager/sprite/update.ts b/src/events/gameMaster/assetManager/sprite/update.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/sprite/update.ts
rename to src/events/gameMaster/assetManager/sprite/update.ts
diff --git a/src/socketEvents/gameMaster/assetManager/tile/delete.ts b/src/events/gameMaster/assetManager/tile/delete.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/tile/delete.ts
rename to src/events/gameMaster/assetManager/tile/delete.ts
diff --git a/src/socketEvents/gameMaster/assetManager/tile/list.ts b/src/events/gameMaster/assetManager/tile/list.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/tile/list.ts
rename to src/events/gameMaster/assetManager/tile/list.ts
diff --git a/src/socketEvents/gameMaster/assetManager/tile/update.ts b/src/events/gameMaster/assetManager/tile/update.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/tile/update.ts
rename to src/events/gameMaster/assetManager/tile/update.ts
diff --git a/src/socketEvents/gameMaster/assetManager/tile/upload.ts b/src/events/gameMaster/assetManager/tile/upload.ts
similarity index 100%
rename from src/socketEvents/gameMaster/assetManager/tile/upload.ts
rename to src/events/gameMaster/assetManager/tile/upload.ts
diff --git a/src/socketEvents/gameMaster/zoneEditor/create.ts b/src/events/gameMaster/zoneEditor/create.ts
similarity index 100%
rename from src/socketEvents/gameMaster/zoneEditor/create.ts
rename to src/events/gameMaster/zoneEditor/create.ts
diff --git a/src/socketEvents/gameMaster/zoneEditor/delete.ts b/src/events/gameMaster/zoneEditor/delete.ts
similarity index 100%
rename from src/socketEvents/gameMaster/zoneEditor/delete.ts
rename to src/events/gameMaster/zoneEditor/delete.ts
diff --git a/src/socketEvents/gameMaster/zoneEditor/list.ts b/src/events/gameMaster/zoneEditor/list.ts
similarity index 100%
rename from src/socketEvents/gameMaster/zoneEditor/list.ts
rename to src/events/gameMaster/zoneEditor/list.ts
diff --git a/src/socketEvents/gameMaster/zoneEditor/request.ts b/src/events/gameMaster/zoneEditor/request.ts
similarity index 100%
rename from src/socketEvents/gameMaster/zoneEditor/request.ts
rename to src/events/gameMaster/zoneEditor/request.ts
diff --git a/src/socketEvents/gameMaster/zoneEditor/update.ts b/src/events/gameMaster/zoneEditor/update.ts
similarity index 100%
rename from src/socketEvents/gameMaster/zoneEditor/update.ts
rename to src/events/gameMaster/zoneEditor/update.ts
diff --git a/src/socketEvents/login.ts b/src/events/login.ts
similarity index 100%
rename from src/socketEvents/login.ts
rename to src/events/login.ts
diff --git a/src/socketEvents/zone/characterJoin.ts b/src/events/zone/characterJoin.ts
similarity index 100%
rename from src/socketEvents/zone/characterJoin.ts
rename to src/events/zone/characterJoin.ts
diff --git a/src/socketEvents/zone/characterLeave.ts b/src/events/zone/characterLeave.ts
similarity index 100%
rename from src/socketEvents/zone/characterLeave.ts
rename to src/events/zone/characterLeave.ts
diff --git a/src/socketEvents/zone/characterMove.ts b/src/events/zone/characterMove.ts
similarity index 100%
rename from src/socketEvents/zone/characterMove.ts
rename to src/events/zone/characterMove.ts
diff --git a/src/socketEvents/zone/weather.ts b/src/events/zone/weather.ts
similarity index 100%
rename from src/socketEvents/zone/weather.ts
rename to src/events/zone/weather.ts
diff --git a/src/server.ts b/src/server.ts
index 3fa3796..4325628 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -98,7 +98,7 @@ export class Server {
    */
   private async handleConnection(socket: TSocket) {
     try {
-      await this.loadEventHandlers('socketEvents', '', socket)
+      await this.loadEventHandlers('events', '', socket)
     } catch (error: any) {
       this.logger.error(`Failed to load event handlers: ${error.message}`)
     }
diff --git a/tsconfig.json b/tsconfig.json
index bcced54..ffeccaa 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,7 +26,7 @@
       "#models/*": ["./src/models/*"],
       "#repositories/*": ["./src/repositories/*"],
       "#services/*": ["./src/services/*"],
-      "#socketEvents/*": ["./src/socketEvents/*"]
+      "#events/*": ["./src/events/*"]
     },
 
     // Specify multiple folders that act like './node_modules/@types'