diff --git a/server/src/commands/admin/addmod.js b/commands/admin/addmod.js
similarity index 100%
rename from server/src/commands/admin/addmod.js
rename to commands/admin/addmod.js
diff --git a/server/src/commands/admin/listusers.js b/commands/admin/listusers.js
similarity index 100%
rename from server/src/commands/admin/listusers.js
rename to commands/admin/listusers.js
diff --git a/server/src/commands/admin/reload.js b/commands/admin/reload.js
similarity index 100%
rename from server/src/commands/admin/reload.js
rename to commands/admin/reload.js
diff --git a/server/src/commands/admin/removemod.js b/commands/admin/removemod.js
similarity index 100%
rename from server/src/commands/admin/removemod.js
rename to commands/admin/removemod.js
diff --git a/server/src/commands/admin/saveconfig.js b/commands/admin/saveconfig.js
similarity index 100%
rename from server/src/commands/admin/saveconfig.js
rename to commands/admin/saveconfig.js
diff --git a/server/src/commands/admin/shout.js b/commands/admin/shout.js
similarity index 100%
rename from server/src/commands/admin/shout.js
rename to commands/admin/shout.js
diff --git a/server/src/commands/core/changecolor.js b/commands/core/changecolor.js
similarity index 100%
rename from server/src/commands/core/changecolor.js
rename to commands/core/changecolor.js
diff --git a/server/src/commands/core/changenick.js b/commands/core/changenick.js
similarity index 100%
rename from server/src/commands/core/changenick.js
rename to commands/core/changenick.js
diff --git a/server/src/commands/core/chat.js b/commands/core/chat.js
similarity index 100%
rename from server/src/commands/core/chat.js
rename to commands/core/chat.js
diff --git a/server/src/commands/core/emote.js b/commands/core/emote.js
similarity index 100%
rename from server/src/commands/core/emote.js
rename to commands/core/emote.js
diff --git a/server/src/commands/core/help.js b/commands/core/help.js
similarity index 100%
rename from server/src/commands/core/help.js
rename to commands/core/help.js
diff --git a/server/src/commands/core/invite.js b/commands/core/invite.js
similarity index 100%
rename from server/src/commands/core/invite.js
rename to commands/core/invite.js
diff --git a/server/src/commands/core/join.js b/commands/core/join.js
similarity index 100%
rename from server/src/commands/core/join.js
rename to commands/core/join.js
diff --git a/server/src/commands/core/morestats.js b/commands/core/morestats.js
similarity index 100%
rename from server/src/commands/core/morestats.js
rename to commands/core/morestats.js
diff --git a/server/src/commands/core/move.js b/commands/core/move.js
similarity index 100%
rename from server/src/commands/core/move.js
rename to commands/core/move.js
diff --git a/server/src/commands/core/ping.js b/commands/core/ping.js
similarity index 100%
rename from server/src/commands/core/ping.js
rename to commands/core/ping.js
diff --git a/server/src/commands/core/session.js b/commands/core/session.js
similarity index 100%
rename from server/src/commands/core/session.js
rename to commands/core/session.js
diff --git a/server/src/commands/core/stats.js b/commands/core/stats.js
similarity index 100%
rename from server/src/commands/core/stats.js
rename to commands/core/stats.js
diff --git a/server/src/commands/core/whisper.js b/commands/core/whisper.js
similarity index 100%
rename from server/src/commands/core/whisper.js
rename to commands/core/whisper.js
diff --git a/server/src/commands/internal/disconnect.js b/commands/internal/disconnect.js
similarity index 100%
rename from server/src/commands/internal/disconnect.js
rename to commands/internal/disconnect.js
diff --git a/server/src/commands/internal/socketreply.js b/commands/internal/socketreply.js
similarity index 100%
rename from server/src/commands/internal/socketreply.js
rename to commands/internal/socketreply.js
diff --git a/server/src/commands/mod/ban.js b/commands/mod/ban.js
similarity index 100%
rename from server/src/commands/mod/ban.js
rename to commands/mod/ban.js
diff --git a/server/src/commands/mod/dumb.js b/commands/mod/dumb.js
similarity index 100%
rename from server/src/commands/mod/dumb.js
rename to commands/mod/dumb.js
diff --git a/server/src/commands/mod/forcecolor.js b/commands/mod/forcecolor.js
similarity index 100%
rename from server/src/commands/mod/forcecolor.js
rename to commands/mod/forcecolor.js
diff --git a/server/src/commands/mod/kick.js b/commands/mod/kick.js
similarity index 100%
rename from server/src/commands/mod/kick.js
rename to commands/mod/kick.js
diff --git a/server/src/commands/mod/moveuser.js b/commands/mod/moveuser.js
similarity index 100%
rename from server/src/commands/mod/moveuser.js
rename to commands/mod/moveuser.js
diff --git a/server/src/commands/mod/speak.js b/commands/mod/speak.js
similarity index 100%
rename from server/src/commands/mod/speak.js
rename to commands/mod/speak.js
diff --git a/server/src/commands/mod/unban.js b/commands/mod/unban.js
similarity index 100%
rename from server/src/commands/mod/unban.js
rename to commands/mod/unban.js
diff --git a/server/src/commands/mod/unbanall.js b/commands/mod/unbanall.js
similarity index 100%
rename from server/src/commands/mod/unbanall.js
rename to commands/mod/unbanall.js
diff --git a/server/src/commands/utility/_Channels.js b/commands/utility/_Channels.js
similarity index 100%
rename from server/src/commands/utility/_Channels.js
rename to commands/utility/_Channels.js
diff --git a/server/src/commands/utility/_Constants.js b/commands/utility/_Constants.js
similarity index 100%
rename from server/src/commands/utility/_Constants.js
rename to commands/utility/_Constants.js
diff --git a/server/src/commands/utility/_LegacyFunctions.js b/commands/utility/_LegacyFunctions.js
similarity index 100%
rename from server/src/commands/utility/_LegacyFunctions.js
rename to commands/utility/_LegacyFunctions.js
diff --git a/server/src/commands/utility/_UAC.js b/commands/utility/_UAC.js
similarity index 100%
rename from server/src/commands/utility/_UAC.js
rename to commands/utility/_UAC.js