diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index 2d247109c18fe6997600192785fc9c7ee9112fa4..c51ac64604a2cc084ee0c1e87c73f3abc86c6f77 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -1,19 +1,19 @@
 package com.comandante.creeper;
 
-import com.comandante.creeper.command.CreeperCommandRegistry;
-import com.comandante.creeper.command.commands.DropCommand;
-import com.comandante.creeper.command.commands.GossipCommand;
-import com.comandante.creeper.command.commands.InventoryCommand;
-import com.comandante.creeper.command.commands.KillCommand;
-import com.comandante.creeper.command.commands.LookCommand;
-import com.comandante.creeper.command.commands.MovementCommand;
-import com.comandante.creeper.command.commands.PickUpCommand;
-import com.comandante.creeper.command.commands.SayCommand;
-import com.comandante.creeper.command.commands.TellCommand;
-import com.comandante.creeper.command.commands.UnknownCommand;
-import com.comandante.creeper.command.commands.UseCommand;
-import com.comandante.creeper.command.commands.WhoCommand;
-import com.comandante.creeper.command.commands.WhoamiCommand;
+import com.comandante.creeper.server.CreeperCommandRegistry;
+import com.comandante.creeper.server.command.DropCommand;
+import com.comandante.creeper.server.command.GossipCommand;
+import com.comandante.creeper.server.command.InventoryCommand;
+import com.comandante.creeper.server.command.KillCommand;
+import com.comandante.creeper.server.command.LookCommand;
+import com.comandante.creeper.server.command.MovementCommand;
+import com.comandante.creeper.server.command.PickUpCommand;
+import com.comandante.creeper.server.command.SayCommand;
+import com.comandante.creeper.server.command.TellCommand;
+import com.comandante.creeper.server.command.UnknownCommand;
+import com.comandante.creeper.server.command.UseCommand;
+import com.comandante.creeper.server.command.WhoCommand;
+import com.comandante.creeper.server.command.WhoamiCommand;
 import com.comandante.creeper.entity.EntityManager;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.managers.SessionManager;
diff --git a/src/main/java/com/comandante/creeper/player/PlayerMovement.java b/src/main/java/com/comandante/creeper/player/PlayerMovement.java
index 845f71e583425c94fa9f32286744fa24cdf82dec..2737a30dc061cac73d562b9b5609fe6e4c2c4ce3 100644
--- a/src/main/java/com/comandante/creeper/player/PlayerMovement.java
+++ b/src/main/java/com/comandante/creeper/player/PlayerMovement.java
@@ -1,6 +1,6 @@
 package com.comandante.creeper.player;
 
-import com.comandante.creeper.command.commands.MovementCommand;
+import com.comandante.creeper.server.command.MovementCommand;
 
 public class PlayerMovement {
 
diff --git a/src/main/java/com/comandante/creeper/server/AuthHandler.java b/src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java
similarity index 95%
rename from src/main/java/com/comandante/creeper/server/AuthHandler.java
rename to src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java
index 7800374ad4d6e56af8b9b461021fb0a1c7f655d0..14f19417bbc977dc72cd321b524a5cd13a2a93d8 100644
--- a/src/main/java/com/comandante/creeper/server/AuthHandler.java
+++ b/src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java
@@ -11,12 +11,12 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 
 import static com.comandante.creeper.server.Color.RESET;
 
-public class AuthHandler extends SimpleChannelUpstreamHandler {
+public class CreeperAuthenticationHandler extends SimpleChannelUpstreamHandler {
 
     private final GameManager gameManager;
     private final CreeperAuthenticator creeperAuthenticator;
 
-    public AuthHandler(GameManager gameManager) {
+    public CreeperAuthenticationHandler(GameManager gameManager) {
         this.gameManager = gameManager;
         this.creeperAuthenticator = new GameAuth(gameManager);
     }
@@ -61,7 +61,7 @@ public class AuthHandler extends SimpleChannelUpstreamHandler {
             }
         } else {
             gameManager.getPlayerManager().getSessionManager().putSession(creeperSession);
-            e.getChannel().getPipeline().addLast("server_handler", new MudCommandHandler(gameManager));
+            e.getChannel().getPipeline().addLast("server_handler", new CreeperCommandHandler(gameManager));
             e.getChannel().getPipeline().remove(this);
             e.getChannel().setAttachment(creeperSession);
         }
diff --git a/src/main/java/com/comandante/creeper/server/MudCommandHandler.java b/src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java
similarity index 88%
rename from src/main/java/com/comandante/creeper/server/MudCommandHandler.java
rename to src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java
index 2371ba6ae39be3e52f7add0fd6527e72f16c62e9..33614029b22aff740603a3def9f373ebce797677 100644
--- a/src/main/java/com/comandante/creeper/server/MudCommandHandler.java
+++ b/src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java
@@ -1,18 +1,18 @@
 package com.comandante.creeper.server;
 
 import com.comandante.creeper.Main;
-import com.comandante.creeper.command.commands.Command;
 import com.comandante.creeper.managers.GameManager;
+import com.comandante.creeper.server.command.Command;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 
-public class MudCommandHandler extends SimpleChannelUpstreamHandler {
+public class CreeperCommandHandler extends SimpleChannelUpstreamHandler {
 
     private final GameManager gameManager;
 
-    public MudCommandHandler(GameManager gameManager) {
+    public CreeperCommandHandler(GameManager gameManager) {
         this.gameManager = gameManager;
     }
 
diff --git a/src/main/java/com/comandante/creeper/command/CreeperCommandRegistry.java b/src/main/java/com/comandante/creeper/server/CreeperCommandRegistry.java
similarity index 89%
rename from src/main/java/com/comandante/creeper/command/CreeperCommandRegistry.java
rename to src/main/java/com/comandante/creeper/server/CreeperCommandRegistry.java
index 25c3a6ff38ed6f7a9501567ab8ac30e202561796..0106d1ba8e2b99570714a1c02ab283f8f6608361 100644
--- a/src/main/java/com/comandante/creeper/command/CreeperCommandRegistry.java
+++ b/src/main/java/com/comandante/creeper/server/CreeperCommandRegistry.java
@@ -1,6 +1,6 @@
-package com.comandante.creeper.command;
+package com.comandante.creeper.server;
 
-import com.comandante.creeper.command.commands.Command;
+import com.comandante.creeper.server.command.Command;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/comandante/creeper/server/CreeperServer.java b/src/main/java/com/comandante/creeper/server/CreeperServer.java
index cbca16263905c7f70c402382ab4a6d70c27637ec..1bb8176e946de2342d12197e7127b40bead4bfcc 100644
--- a/src/main/java/com/comandante/creeper/server/CreeperServer.java
+++ b/src/main/java/com/comandante/creeper/server/CreeperServer.java
@@ -21,7 +21,7 @@ public class CreeperServer {
 
     public void run(GameManager gameManager) throws Exception {
         ServerBootstrap bootstrap = new ServerBootstrap(new NioServerSocketChannelFactory(Executors.newCachedThreadPool(), Executors.newCachedThreadPool()));
-        AuthHandler handler = new AuthHandler(gameManager);
+        CreeperAuthenticationHandler handler = new CreeperAuthenticationHandler(gameManager);
         bootstrap.setPipelineFactory(new CreeperServerPipelineFactory(handler));
         bootstrap.bind(new InetSocketAddress(port));
     }
diff --git a/src/main/java/com/comandante/creeper/command/commands/Command.java b/src/main/java/com/comandante/creeper/server/command/Command.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/Command.java
rename to src/main/java/com/comandante/creeper/server/command/Command.java
index 43739fdfa22641476aa9ade263aa816fa9ade039..e6ff16a5393dd030377ab660f48663f11eeaf267 100644
--- a/src/main/java/com/comandante/creeper/command/commands/Command.java
+++ b/src/main/java/com/comandante/creeper/server/command/Command.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.Main;
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/DropCommand.java b/src/main/java/com/comandante/creeper/server/command/DropCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/DropCommand.java
rename to src/main/java/com/comandante/creeper/server/command/DropCommand.java
index 2ec7b9a30d0aa13beab783890eaf6da982e96f3e..c4ad3a3f388d43f48e51125df8a34b0394b70de1 100644
--- a/src/main/java/com/comandante/creeper/command/commands/DropCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/DropCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.Items.Item;
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/GossipCommand.java b/src/main/java/com/comandante/creeper/server/command/GossipCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/GossipCommand.java
rename to src/main/java/com/comandante/creeper/server/command/GossipCommand.java
index 2ea4b4ab6a4f168c468a62d5cab9882096bc632f..5f16171c71fd23f462ded3aece70f23d6966dd15 100644
--- a/src/main/java/com/comandante/creeper/command/commands/GossipCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/GossipCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java b/src/main/java/com/comandante/creeper/server/command/InventoryCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java
rename to src/main/java/com/comandante/creeper/server/command/InventoryCommand.java
index c2b15100fe2fa8fe6d76c078baad2c6871678694..f745fe94a6b598d1f4e631cb3f6b1297b24d8197 100644
--- a/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/InventoryCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 
 import com.comandante.creeper.Items.Item;
diff --git a/src/main/java/com/comandante/creeper/command/commands/KillCommand.java b/src/main/java/com/comandante/creeper/server/command/KillCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/KillCommand.java
rename to src/main/java/com/comandante/creeper/server/command/KillCommand.java
index 42027687835f0d486687dc87489f90bcb3a37756..f0f297c44c5520fb60b343662274585512f94f78 100644
--- a/src/main/java/com/comandante/creeper/command/commands/KillCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/KillCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.fight.FightManager;
 import com.comandante.creeper.fight.FightResults;
diff --git a/src/main/java/com/comandante/creeper/command/commands/LookCommand.java b/src/main/java/com/comandante/creeper/server/command/LookCommand.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/LookCommand.java
rename to src/main/java/com/comandante/creeper/server/command/LookCommand.java
index 51c12d5340b0344fe01ce7d08d574df29ed22c83..56c8b2c788d40ceb38c1380b47884f029f358ab1 100644
--- a/src/main/java/com/comandante/creeper/command/commands/LookCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/LookCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/command/commands/MovementCommand.java b/src/main/java/com/comandante/creeper/server/command/MovementCommand.java
similarity index 99%
rename from src/main/java/com/comandante/creeper/command/commands/MovementCommand.java
rename to src/main/java/com/comandante/creeper/server/command/MovementCommand.java
index 1ccdb3159fba58a14e87f653a48ea75257a9bb57..18895f12c7bddb2a6a58d71aec1c2101e58d96c2 100644
--- a/src/main/java/com/comandante/creeper/command/commands/MovementCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/MovementCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.fight.FightManager;
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/PickUpCommand.java b/src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/PickUpCommand.java
rename to src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
index da58f1202146166408ff7a62a61ddc5729f097fa..cfd7f815a8acbd1ac3c24997ab5c9605a9ccc61b 100644
--- a/src/main/java/com/comandante/creeper/command/commands/PickUpCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.Items.Item;
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/SayCommand.java b/src/main/java/com/comandante/creeper/server/command/SayCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/SayCommand.java
rename to src/main/java/com/comandante/creeper/server/command/SayCommand.java
index 5ffacf4590f2e36fb003a0e72d583c475a5395ee..c0eca5a53eeeb32cf5ddf8f5dabaf6987d519a65 100644
--- a/src/main/java/com/comandante/creeper/command/commands/SayCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/SayCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/command/commands/TellCommand.java b/src/main/java/com/comandante/creeper/server/command/TellCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/TellCommand.java
rename to src/main/java/com/comandante/creeper/server/command/TellCommand.java
index 8f9d4aff09031f36f1537e26a96ce4b8c422c67a..0976f48b6134bbb8ca551307b0febeb450a8f50d 100644
--- a/src/main/java/com/comandante/creeper/command/commands/TellCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/TellCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/command/commands/UnknownCommand.java b/src/main/java/com/comandante/creeper/server/command/UnknownCommand.java
similarity index 92%
rename from src/main/java/com/comandante/creeper/command/commands/UnknownCommand.java
rename to src/main/java/com/comandante/creeper/server/command/UnknownCommand.java
index 76317c1f7eb914d684b8d9a66171d5410140e835..d516deff23ac222c3f32fdc022f07b480005037a 100644
--- a/src/main/java/com/comandante/creeper/command/commands/UnknownCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/UnknownCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import org.jboss.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/comandante/creeper/command/commands/UseCommand.java b/src/main/java/com/comandante/creeper/server/command/UseCommand.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/UseCommand.java
rename to src/main/java/com/comandante/creeper/server/command/UseCommand.java
index 42802213b9ebcac39e5eb565a5b71727a1cbe659..83673d4e252937f57f13e72a7c76c92fe3bbf328 100644
--- a/src/main/java/com/comandante/creeper/command/commands/UseCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/UseCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 
 import com.comandante.creeper.Items.Item;
diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java b/src/main/java/com/comandante/creeper/server/command/WhoCommand.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
rename to src/main/java/com/comandante/creeper/server/command/WhoCommand.java
index 39806d9f63af0113a5f5c0ab9d1c854fba574be2..5db783aec534cc466b74e3b16aa41b995a7cbbb7 100644
--- a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/WhoCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java b/src/main/java/com/comandante/creeper/server/command/WhoamiCommand.java
similarity index 95%
rename from src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
rename to src/main/java/com/comandante/creeper/server/command/WhoamiCommand.java
index 2d318fbc9fe9d5b158eb13395bfe6ba893b4cf56..9570b896568fd19d27da0aa4ea64f473806bf968 100644
--- a/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/WhoamiCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;