diff --git a/package.json b/package.json
index f1cbd92..df5acb4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "drb-client",
   "version": "3.0.0",
   "description": "",
-  "main": "client.js",
+  "main": "src/client.js",
   "scripts": {
     "test": "mocha --timeout 10000"
   },
diff --git a/client.js b/src/client.js
similarity index 100%
rename from client.js
rename to src/client.js
diff --git a/discordAudioBot/pdabHandler.mjs b/src/discordAudioBot/pdabHandler.mjs
similarity index 100%
rename from discordAudioBot/pdabHandler.mjs
rename to src/discordAudioBot/pdabHandler.mjs
diff --git a/discordAudioBot/pdabWrappers.mjs b/src/discordAudioBot/pdabWrappers.mjs
similarity index 100%
rename from discordAudioBot/pdabWrappers.mjs
rename to src/discordAudioBot/pdabWrappers.mjs
diff --git a/express/routes/dashboardRoutes.js b/src/express/routes/dashboardRoutes.js
similarity index 100%
rename from express/routes/dashboardRoutes.js
rename to src/express/routes/dashboardRoutes.js
diff --git a/express/routes/setupRoutes.js b/src/express/routes/setupRoutes.js
similarity index 100%
rename from express/routes/setupRoutes.js
rename to src/express/routes/setupRoutes.js
diff --git a/express/server.mjs b/src/express/server.mjs
similarity index 100%
rename from express/server.mjs
rename to src/express/server.mjs
diff --git a/express/views/dashboard.ejs b/src/express/views/dashboard.ejs
similarity index 100%
rename from express/views/dashboard.ejs
rename to src/express/views/dashboard.ejs
diff --git a/express/views/setup/add_system.ejs b/src/express/views/setup/add_system.ejs
similarity index 100%
rename from express/views/setup/add_system.ejs
rename to src/express/views/setup/add_system.ejs
diff --git a/express/views/setup/prompt_add_another_system.ejs b/src/express/views/setup/prompt_add_another_system.ejs
similarity index 100%
rename from express/views/setup/prompt_add_another_system.ejs
rename to src/express/views/setup/prompt_add_another_system.ejs
diff --git a/express/views/setup/setup.ejs b/src/express/views/setup/setup.ejs
similarity index 100%
rename from express/views/setup/setup.ejs
rename to src/express/views/setup/setup.ejs
diff --git a/modules/baseUtils.mjs b/src/modules/baseUtils.mjs
similarity index 100%
rename from modules/baseUtils.mjs
rename to src/modules/baseUtils.mjs
diff --git a/modules/cliHandler.mjs b/src/modules/cliHandler.mjs
similarity index 100%
rename from modules/cliHandler.mjs
rename to src/modules/cliHandler.mjs
diff --git a/modules/clientObjectDefinitions.mjs b/src/modules/clientObjectDefinitions.mjs
similarity index 100%
rename from modules/clientObjectDefinitions.mjs
rename to src/modules/clientObjectDefinitions.mjs
diff --git a/modules/debugger.mjs b/src/modules/debugger.mjs
similarity index 100%
rename from modules/debugger.mjs
rename to src/modules/debugger.mjs
diff --git a/modules/radioPresetHandler.mjs b/src/modules/radioPresetHandler.mjs
similarity index 100%
rename from modules/radioPresetHandler.mjs
rename to src/modules/radioPresetHandler.mjs
diff --git a/modules/selfUpdater.mjs b/src/modules/selfUpdater.mjs
similarity index 100%
rename from modules/selfUpdater.mjs
rename to src/modules/selfUpdater.mjs
diff --git a/modules/serviceHandler.mjs b/src/modules/serviceHandler.mjs
similarity index 100%
rename from modules/serviceHandler.mjs
rename to src/modules/serviceHandler.mjs
diff --git a/modules/socketClient.mjs b/src/modules/socketClient.mjs
similarity index 100%
rename from modules/socketClient.mjs
rename to src/modules/socketClient.mjs
diff --git a/modules/socketClientWrappers.mjs b/src/modules/socketClientWrappers.mjs
similarity index 100%
rename from modules/socketClientWrappers.mjs
rename to src/modules/socketClientWrappers.mjs
diff --git a/modules/subprocessHandler.mjs b/src/modules/subprocessHandler.mjs
similarity index 100%
rename from modules/subprocessHandler.mjs
rename to src/modules/subprocessHandler.mjs
diff --git a/modules/updateConfig.mjs b/src/modules/updateConfig.mjs
similarity index 100%
rename from modules/updateConfig.mjs
rename to src/modules/updateConfig.mjs
diff --git a/op25Handler/modules/op25ConfigGenerators.mjs b/src/op25Handler/modules/op25ConfigGenerators.mjs
similarity index 100%
rename from op25Handler/modules/op25ConfigGenerators.mjs
rename to src/op25Handler/modules/op25ConfigGenerators.mjs
diff --git a/op25Handler/op25Handler.mjs b/src/op25Handler/op25Handler.mjs
similarity index 100%
rename from op25Handler/op25Handler.mjs
rename to src/op25Handler/op25Handler.mjs