diff --git a/bundle/.vscode/launch.json b/bundle/.vscode/launch.json
index 0b5d2287..917f2a93 100644
--- a/bundle/.vscode/launch.json
+++ b/bundle/.vscode/launch.json
@@ -10,9 +10,11 @@
 			"request": "launch",
 			"name": "Launch server bundle",
 			"program": "${workspaceFolder}/dist/start.js",
+			"runtimeArgs": ["-r", "./tsconfig-paths-bootstrap.js"],
 			"preLaunchTask": "tsc: build - tsconfig.json",
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
-			"envFile": "${workspaceFolder}/.env"
+			"outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/node_modules/@fosscord/**/*.js"],
+			"envFile": "${workspaceFolder}/.env",
+			"outDir": "${workspaceFolder}/dist"
 		}
 	]
 }
diff --git a/bundle/package-lock.json b/bundle/package-lock.json
index 718cc969..3199f7d8 100644
Binary files a/bundle/package-lock.json and b/bundle/package-lock.json differ
diff --git a/bundle/package.json b/bundle/package.json
index 83f26116..edcd1ec2 100644
--- a/bundle/package.json
+++ b/bundle/package.json
@@ -43,6 +43,7 @@
 		"@types/uuid": "^8.3.0",
 		"@types/ws": "^7.4.0",
 		"@zerollup/ts-transform-paths": "^1.7.18",
+		"ts-node": "^10.2.1",
 		"typescript": "^4.3.5"
 	},
 	"dependencies": {
diff --git a/bundle/src/start.ts b/bundle/src/start.ts
index 843e3812..f68a65bf 100644
--- a/bundle/src/start.ts
+++ b/bundle/src/start.ts
@@ -13,7 +13,7 @@ if (cluster.isMaster && !process.env.masterStarted) {
 		initStats();
 
 		if (cores === 1) {
-			require("./Server.js");
+			require("./Server");
 			return;
 		}
 
@@ -23,10 +23,12 @@ if (cluster.isMaster && !process.env.masterStarted) {
 		}
 
 		cluster.on("exit", (worker: any, code: any, signal: any) => {
-			console.log(`[Worker] died with pid: ${worker.process.pid} , restarting ...`);
+			console.log(
+				`[Worker] died with pid: ${worker.process.pid} , restarting ...`
+			);
 			cluster.fork();
 		});
 	})();
 } else {
-	require("./Server.js");
+	require("./Server");
 }