diff --git a/src/GameServer.h b/src/GameServer.h
index b17315f..0db3f03 100644
--- a/src/GameServer.h
+++ b/src/GameServer.h
@@ -15,7 +15,7 @@ class GameServer;
 
 //Own
 #include "Shared.h"
-#include "messages/Command.h"
+#include "commands/Command.h"
 
 static const int MAX_PLAYERS = 64;
 
diff --git a/src/messages/Command.cpp b/src/commands/Command.cpp
similarity index 100%
rename from src/messages/Command.cpp
rename to src/commands/Command.cpp
diff --git a/src/messages/Command.h b/src/commands/Command.h
similarity index 95%
rename from src/messages/Command.h
rename to src/commands/Command.h
index 8fb41ba..4863aa5 100644
--- a/src/messages/Command.h
+++ b/src/commands/Command.h
@@ -13,7 +13,7 @@ class Command
 public:
     // Create Commands from Network messages (Limited list)
     static Command *create(int clientIndex, yojimbo::Message *message);
-    // Create Commands from Strings (Limited list)
+    // Create Commands from Strings internal (Limited list)
     static Command *create(std::string);
 
     virtual void execute(GameServer *server) = 0;
diff --git a/src/messages/SetNameCommand.cpp b/src/commands/SetNameCommand.cpp
similarity index 100%
rename from src/messages/SetNameCommand.cpp
rename to src/commands/SetNameCommand.cpp
diff --git a/src/messages/StopCommandInternal.cpp b/src/commands/StopCommandInternal.cpp
similarity index 100%
rename from src/messages/StopCommandInternal.cpp
rename to src/commands/StopCommandInternal.cpp
diff --git a/src/messages/TestCommand.cpp b/src/commands/TestCommand.cpp
similarity index 100%
rename from src/messages/TestCommand.cpp
rename to src/commands/TestCommand.cpp
diff --git a/src/messages/TestCommandInternal.cpp b/src/commands/TestCommandInternal.cpp
similarity index 100%
rename from src/messages/TestCommandInternal.cpp
rename to src/commands/TestCommandInternal.cpp