diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 2cea1993c..e38e867a5 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -17,6 +17,7 @@
  */
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.commands.EssentialsCommandHandler;
 import com.earth2me.essentials.utils.ExecuteTimer;
 import com.earth2me.essentials.economy.WorthHolder;
 import com.earth2me.essentials.economy.Economy;
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsCommandHandler.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommandHandler.java
similarity index 99%
rename from Essentials/src/com/earth2me/essentials/EssentialsCommandHandler.java
rename to Essentials/src/com/earth2me/essentials/commands/EssentialsCommandHandler.java
index f047868d6..f45a55a3f 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsCommandHandler.java
+++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommandHandler.java
@@ -1,4 +1,4 @@
-package com.earth2me.essentials;
+package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.*;
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
index 507326296..fea8dd2e2 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
@@ -1,6 +1,6 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.EssentialsCommandHandler;
+import com.earth2me.essentials.commands.EssentialsCommandHandler;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.ICommandHandler;
 import com.earth2me.essentials.api.IEssentials;