diff --git a/commander/src/main/java/mc/commander/CommandExecutor.java b/core/src/main/java/mc/core/chat/CommandExecutor.java
similarity index 89%
rename from commander/src/main/java/mc/commander/CommandExecutor.java
rename to core/src/main/java/mc/core/chat/CommandExecutor.java
index 2c1c0a7..39c4de1 100644
--- a/commander/src/main/java/mc/commander/CommandExecutor.java
+++ b/core/src/main/java/mc/core/chat/CommandExecutor.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-05-22
  */
-package mc.commander;
+package mc.core.chat;
 
 import mc.core.player.Player;
 
diff --git a/commander/src/main/java/mc/commander/Commander.java b/core/src/main/java/mc/core/chat/CommanderChatProcessor.java
similarity index 89%
rename from commander/src/main/java/mc/commander/Commander.java
rename to core/src/main/java/mc/core/chat/CommanderChatProcessor.java
index 03ef8a1..bbbb17f 100644
--- a/commander/src/main/java/mc/commander/Commander.java
+++ b/core/src/main/java/mc/core/chat/CommanderChatProcessor.java
@@ -1,12 +1,10 @@
 /*
  * DmitriyMX <dimon550@gmail.com>
- * 2018-05-22
+ * 2018-05-23
  */
-package mc.commander;
+package mc.core.chat;
 
 import lombok.extern.slf4j.Slf4j;
-import mc.core.chat.ChatStyle;
-import mc.core.chat.SimpleChatProcessor;
 import mc.core.player.Player;
 import org.slf4j.Marker;
 import org.slf4j.helpers.BasicMarkerFactory;
@@ -15,7 +13,7 @@ import java.util.Collections;
 import java.util.Map;
 
 @Slf4j
-public class Commander extends SimpleChatProcessor {
+public class CommanderChatProcessor extends SimpleChatProcessor {
     private static final Marker COMMAND_MARKER = new BasicMarkerFactory().getMarker("Command");
     private static final String UNKNOW_COMMAND_MSG = ChatStyle.RED + "Unknown command \"" + ChatStyle.WHITE + "%s" + ChatStyle.RED + "\"";
     private Map<String, CommandExecutor> commands = Collections.emptyMap();