diff --git a/server/routers/ws/index.ts b/server/routers/ws/index.ts
new file mode 100644
index 00000000..cf95932c
--- /dev/null
+++ b/server/routers/ws/index.ts
@@ -0,0 +1 @@
+export * from "./ws";
\ No newline at end of file
diff --git a/server/routers/messageHandlers.ts b/server/routers/ws/messageHandlers.ts
similarity index 96%
rename from server/routers/messageHandlers.ts
rename to server/routers/ws/messageHandlers.ts
index 92d2849f..d85cc277 100644
--- a/server/routers/messageHandlers.ts
+++ b/server/routers/ws/messageHandlers.ts
@@ -5,13 +5,13 @@ import {
     handleDockerStatusMessage,
     handleDockerContainersMessage,
     handleNewtPingRequestMessage
-} from "./newt";
+} from "../newt";
 import {
     handleOlmRegisterMessage,
     handleOlmRelayMessage,
     handleOlmPingMessage,
     startOfflineChecker
-} from "./olm";
+} from "../olm";
 import { MessageHandler } from "./ws";
 
 export const messageHandlers: Record<string, MessageHandler> = {
diff --git a/server/routers/ws.ts b/server/routers/ws/ws.ts
similarity index 100%
rename from server/routers/ws.ts
rename to server/routers/ws/ws.ts