diff --git a/src/com/massivecraft/mcore/ConfServer.java b/src/com/massivecraft/mcore/ConfServer.java
index 90512232..60395142 100644
--- a/src/com/massivecraft/mcore/ConfServer.java
+++ b/src/com/massivecraft/mcore/ConfServer.java
@@ -5,7 +5,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import com.massivecraft.mcore.cmd.CmdMcore;
-import com.massivecraft.mcore.usys.cmd.CmdUsys;
+import com.massivecraft.mcore.mcorecmd.CmdUsys;
 import com.massivecraft.mcore.util.MUtil;
 
 public class ConfServer extends SimpleConfig
diff --git a/src/com/massivecraft/mcore/MCore.java b/src/com/massivecraft/mcore/MCore.java
index 0f55a3be..af2b18ef 100644
--- a/src/com/massivecraft/mcore/MCore.java
+++ b/src/com/massivecraft/mcore/MCore.java
@@ -20,6 +20,7 @@ import com.massivecraft.mcore.adapter.UUIDAdapter;
 import com.massivecraft.mcore.cmd.CmdMcore;
 import com.massivecraft.mcore.integration.protocollib.ProtocolLibFeatures;
 import com.massivecraft.mcore.integration.vault.VaultFeatures;
+import com.massivecraft.mcore.mcorecmd.CmdUsys;
 import com.massivecraft.mcore.mixin.ScheduledTeleportEngine;
 import com.massivecraft.mcore.mixin.SenderIdMixinDefault;
 import com.massivecraft.mcore.mixin.TeleportMixinCauseEngine;
@@ -29,7 +30,6 @@ import com.massivecraft.mcore.store.Coll;
 import com.massivecraft.mcore.store.Db;
 import com.massivecraft.mcore.store.ExamineThread;
 import com.massivecraft.mcore.store.MStore;
-import com.massivecraft.mcore.usys.cmd.CmdUsys;
 import com.massivecraft.mcore.util.PlayerUtil;
 import com.massivecraft.mcore.util.TimeDiffUtil;
 import com.massivecraft.mcore.util.TimeUnit;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsys.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsys.java
similarity index 96%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsys.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsys.java
index 91635ca2..40781e6c 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsys.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsys.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.ConfServer;
 import com.massivecraft.mcore.MCorePerm;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysAspect.java
similarity index 95%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysAspect.java
index 790f134f..52b4de74 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysAspect.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.MCorePerm;
 import com.massivecraft.mcore.cmd.HelpCommand;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectList.java
similarity index 96%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectList.java
index 9852aa7e..f5b608fd 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectList.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectShow.java
similarity index 95%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectShow.java
index e67c1691..8c0cb121 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectShow.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.Aspect;
 import com.massivecraft.mcore.MCorePerm;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectUse.java
similarity index 95%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectUse.java
index b8de3276..6ed99774 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectUse.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.Aspect;
 import com.massivecraft.mcore.Multiverse;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverse.java
similarity index 96%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverse.java
index c38a8f0d..90a3b09f 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverse.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.MCorePerm;
 import com.massivecraft.mcore.cmd.HelpCommand;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseDel.java
similarity index 95%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseDel.java
index 0058bec8..996b2fcf 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseDel.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.MCore;
 import com.massivecraft.mcore.Multiverse;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseList.java
similarity index 96%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseList.java
index 8cf04dde..cdb610cd 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseList.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseNew.java
similarity index 94%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseNew.java
index 17950b15..5200a977 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseNew.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.MultiverseColl;
 import com.massivecraft.mcore.MCorePerm;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseShow.java
similarity index 97%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseShow.java
index 8f3dc333..873d33e0 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseShow.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverse.java
similarity index 95%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverse.java
index 88806e0b..7e68e4a9 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverse.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.MCorePerm;
 import com.massivecraft.mcore.cmd.HelpCommand;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseClear.java
similarity index 96%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseClear.java
index 18278776..e2cfdb62 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseClear.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.MCore;
 import com.massivecraft.mcore.Multiverse;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseDel.java
similarity index 96%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseDel.java
index e3f6d94e..509cada6 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseDel.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.MCore;
 import com.massivecraft.mcore.Multiverse;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseNew.java
similarity index 95%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseNew.java
index f1c2ed47..85a9cb1a 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseNew.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.MCorePerm;
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java b/src/com/massivecraft/mcore/mcorecmd/CmdUsysWorld.java
similarity index 96%
rename from src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java
rename to src/com/massivecraft/mcore/mcorecmd/CmdUsysWorld.java
index c4ce61f5..42250218 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java
+++ b/src/com/massivecraft/mcore/mcorecmd/CmdUsysWorld.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys.cmd;
+package com.massivecraft.mcore.mcorecmd;
 
 import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.MCorePerm;