diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2df18a7..9f4fc56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,8 @@ project(TheBartender VERSION 1.0)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 # Create an executable
-add_executable(${PROJECT_NAME} src/Base/Entry.cpp src/Commands.cpp)
+add_executable(${PROJECT_NAME} src/Base/Entry.cpp src/CommandEvents.cpp
+                               src/CommandManagement.cpp)
 
 # Find our pre-installed DPP package (using FindDPP.cmake).
 find_package(DPP REQUIRED)
diff --git a/src/Base/Entry.cpp b/src/Base/Entry.cpp
index ae9b6d6..35ee60c 100644
--- a/src/Base/Entry.cpp
+++ b/src/Base/Entry.cpp
@@ -29,17 +29,12 @@ int main(int argc, char **argv) {
   });
 
   bot.on_ready([&bot](const dpp::ready_t &event) {
-    if (dpp::run_once<struct register_bot_commands>()) {
-      bot.global_command_create(
-          dpp::slashcommand("ping", "Ping-pong test", bot.me.id));
-      bot.guild_command_create(
-          dpp::slashcommand("balance", COMMAND_BALANCE_DESCRIPTION, bot.me.id),
-          GUILD);
-    }
-
     if (dpp::run_once<struct clear_bot_commands>()) {
       // bot.global_command_delete(1395839332220408051);
     }
+    if (dpp::run_once<struct register_bot_commands>()) {
+      createCommands(event, bot);
+    }
   });
 
   // Remove dpp::st_wait if you want it to return execution
diff --git a/src/Commands.cpp b/src/CommandEvents.cpp
similarity index 100%
rename from src/Commands.cpp
rename to src/CommandEvents.cpp
diff --git a/src/CommandManagement.cpp b/src/CommandManagement.cpp
new file mode 100644
index 0000000..3bd9e22
--- /dev/null
+++ b/src/CommandManagement.cpp
@@ -0,0 +1,13 @@
+#include "../languages/locale_en.hpp"
+#include "../token.h"
+#include "Commands.hpp"
+#include <dpp/cluster.h>
+#include <dpp/dispatcher.h>
+
+void createCommands(const dpp::ready_t &event, dpp::cluster &bot) {
+  bot.global_command_create(
+      dpp::slashcommand("ping", "Ping-pong test", bot.me.id));
+  bot.guild_command_create(
+      dpp::slashcommand("balance", COMMAND_BALANCE_DESCRIPTION, bot.me.id),
+      GUILD);
+}
diff --git a/src/Commands.hpp b/src/Commands.hpp
index 2c6364c..655c397 100644
--- a/src/Commands.hpp
+++ b/src/Commands.hpp
@@ -1,7 +1,11 @@
 #include <dpp/dispatcher.h>
+
+void createCommands(const dpp::ready_t &event, dpp::cluster &bot);
 void commandPing(const dpp::slashcommand_t &event);
 void commandBalance(const dpp::slashcommand_t &event);
 
 inline std::unordered_map<std::string,
                           std::function<void(const dpp::slashcommand_t &event)>>
-    Commands{{"ping", commandPing}, {"balance", commandBalance}};
+    Commands{{"ping", commandPing},
+             {"balance", commandBalance},
+             {"bal", commandBalance}};