diff --git a/src/com/massivecraft/mcore/usys/Aspect.java b/src/com/massivecraft/mcore/Aspect.java
similarity index 92%
rename from src/com/massivecraft/mcore/usys/Aspect.java
rename to src/com/massivecraft/mcore/Aspect.java
index 7fea09b0..6d5b8770 100644
--- a/src/com/massivecraft/mcore/usys/Aspect.java
+++ b/src/com/massivecraft/mcore/Aspect.java
@@ -1,10 +1,9 @@
-package com.massivecraft.mcore.usys;
+package com.massivecraft.mcore;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-import com.massivecraft.mcore.MCore;
 import com.massivecraft.mcore.store.Entity;
 import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;
 
diff --git a/src/com/massivecraft/mcore/usys/AspectColl.java b/src/com/massivecraft/mcore/AspectColl.java
similarity index 90%
rename from src/com/massivecraft/mcore/usys/AspectColl.java
rename to src/com/massivecraft/mcore/AspectColl.java
index 78448e20..f6f00412 100644
--- a/src/com/massivecraft/mcore/usys/AspectColl.java
+++ b/src/com/massivecraft/mcore/AspectColl.java
@@ -1,9 +1,8 @@
-package com.massivecraft.mcore.usys;
+package com.massivecraft.mcore;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.massivecraft.mcore.MCore;
 import com.massivecraft.mcore.store.Coll;
 import com.massivecraft.mcore.store.MStore;
 
diff --git a/src/com/massivecraft/mcore/MCore.java b/src/com/massivecraft/mcore/MCore.java
index 59620b05..0f55a3be 100644
--- a/src/com/massivecraft/mcore/MCore.java
+++ b/src/com/massivecraft/mcore/MCore.java
@@ -29,10 +29,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.Aspect;
-import com.massivecraft.mcore.usys.AspectColl;
-import com.massivecraft.mcore.usys.Multiverse;
-import com.massivecraft.mcore.usys.MultiverseColl;
 import com.massivecraft.mcore.usys.cmd.CmdUsys;
 import com.massivecraft.mcore.util.PlayerUtil;
 import com.massivecraft.mcore.util.TimeDiffUtil;
diff --git a/src/com/massivecraft/mcore/usys/Multiverse.java b/src/com/massivecraft/mcore/Multiverse.java
similarity index 94%
rename from src/com/massivecraft/mcore/usys/Multiverse.java
rename to src/com/massivecraft/mcore/Multiverse.java
index 78b69534..4d338192 100644
--- a/src/com/massivecraft/mcore/usys/Multiverse.java
+++ b/src/com/massivecraft/mcore/Multiverse.java
@@ -1,4 +1,4 @@
-package com.massivecraft.mcore.usys;
+package com.massivecraft.mcore;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -8,7 +8,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
 
-import com.massivecraft.mcore.MCore;
 import com.massivecraft.mcore.cmd.arg.ARUniverse;
 import com.massivecraft.mcore.store.Entity;
 import com.massivecraft.mcore.util.MUtil;
diff --git a/src/com/massivecraft/mcore/usys/MultiverseColl.java b/src/com/massivecraft/mcore/MultiverseColl.java
similarity index 87%
rename from src/com/massivecraft/mcore/usys/MultiverseColl.java
rename to src/com/massivecraft/mcore/MultiverseColl.java
index f611a9d1..8b8174ae 100644
--- a/src/com/massivecraft/mcore/usys/MultiverseColl.java
+++ b/src/com/massivecraft/mcore/MultiverseColl.java
@@ -1,6 +1,5 @@
-package com.massivecraft.mcore.usys;
+package com.massivecraft.mcore;
 
-import com.massivecraft.mcore.MCore;
 import com.massivecraft.mcore.store.Coll;
 import com.massivecraft.mcore.store.MStore;
 
diff --git a/src/com/massivecraft/mcore/cmd/arg/ARAspect.java b/src/com/massivecraft/mcore/cmd/arg/ARAspect.java
index fa04cefd..c71ba35f 100644
--- a/src/com/massivecraft/mcore/cmd/arg/ARAspect.java
+++ b/src/com/massivecraft/mcore/cmd/arg/ARAspect.java
@@ -4,9 +4,9 @@ import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
+import com.massivecraft.mcore.Aspect;
+import com.massivecraft.mcore.AspectColl;
 import com.massivecraft.mcore.Perm;
-import com.massivecraft.mcore.usys.Aspect;
-import com.massivecraft.mcore.usys.AspectColl;
 
 public class ARAspect extends ARAbstractSelect<Aspect>
 {
diff --git a/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java b/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java
index a51a33fd..e7306fa2 100644
--- a/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java
+++ b/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java
@@ -4,9 +4,9 @@ import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
+import com.massivecraft.mcore.Multiverse;
+import com.massivecraft.mcore.MultiverseColl;
 import com.massivecraft.mcore.Perm;
-import com.massivecraft.mcore.usys.Multiverse;
-import com.massivecraft.mcore.usys.MultiverseColl;
 
 public class ARMultiverse extends ARAbstractSelect<Multiverse>
 {
diff --git a/src/com/massivecraft/mcore/cmd/arg/ARUniverse.java b/src/com/massivecraft/mcore/cmd/arg/ARUniverse.java
index b2120226..87906e89 100644
--- a/src/com/massivecraft/mcore/cmd/arg/ARUniverse.java
+++ b/src/com/massivecraft/mcore/cmd/arg/ARUniverse.java
@@ -5,7 +5,7 @@ import java.util.Collection;
 
 import org.bukkit.command.CommandSender;
 
-import com.massivecraft.mcore.usys.Multiverse;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.util.Txt;
 
 public class ARUniverse extends ArgReaderAbstract<String>
diff --git a/src/com/massivecraft/mcore/ps/PS.java b/src/com/massivecraft/mcore/ps/PS.java
index 1b3f14ee..1222a8ce 100644
--- a/src/com/massivecraft/mcore/ps/PS.java
+++ b/src/com/massivecraft/mcore/ps/PS.java
@@ -11,9 +11,9 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
 
+import com.massivecraft.mcore.Aspect;
 import com.massivecraft.mcore.MCore;
-import com.massivecraft.mcore.usys.Aspect;
-import com.massivecraft.mcore.usys.Multiverse;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.util.MUtil;
 import com.massivecraft.mcore.xlib.gson.JsonElement;
 import com.massivecraft.mcore.xlib.gson.JsonObject;
diff --git a/src/com/massivecraft/mcore/store/Colls.java b/src/com/massivecraft/mcore/store/Colls.java
index 1f9081c3..61fea78e 100644
--- a/src/com/massivecraft/mcore/store/Colls.java
+++ b/src/com/massivecraft/mcore/store/Colls.java
@@ -5,8 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.massivecraft.mcore.usys.Aspect;
-import com.massivecraft.mcore.usys.Multiverse;
+import com.massivecraft.mcore.Aspect;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.util.MUtil;
 
 public abstract class Colls<C extends Coll<E>, E>
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java
index 721856b1..78216453 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java
@@ -3,12 +3,12 @@ package com.massivecraft.mcore.usys.cmd;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.massivecraft.mcore.Aspect;
+import com.massivecraft.mcore.AspectColl;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARInteger;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Aspect;
-import com.massivecraft.mcore.usys.AspectColl;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdUsysAspectList extends MCommand
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java
index 66dba667..8a440a7d 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java
@@ -1,10 +1,10 @@
 package com.massivecraft.mcore.usys.cmd;
 
+import com.massivecraft.mcore.Aspect;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARAspect;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Aspect;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdUsysAspectShow extends MCommand
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java
index 97344611..a8c782e6 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java
@@ -1,12 +1,12 @@
 package com.massivecraft.mcore.usys.cmd;
 
+import com.massivecraft.mcore.Aspect;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARAspect;
 import com.massivecraft.mcore.cmd.arg.ARMultiverse;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Aspect;
-import com.massivecraft.mcore.usys.Multiverse;
 
 public class CmdUsysAspectUse extends MCommand
 {
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java
index 7194e73c..60e80e80 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java
@@ -1,11 +1,11 @@
 package com.massivecraft.mcore.usys.cmd;
 
 import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARMultiverse;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Multiverse;
 
 public class CmdUsysMultiverseDel extends MCommand
 {
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java
index cc03c36c..1927048d 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java
@@ -3,12 +3,12 @@ package com.massivecraft.mcore.usys.cmd;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.massivecraft.mcore.Multiverse;
+import com.massivecraft.mcore.MultiverseColl;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARInteger;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Multiverse;
-import com.massivecraft.mcore.usys.MultiverseColl;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdUsysMultiverseList extends MCommand
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java
index 78562106..358f35fb 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java
@@ -1,9 +1,9 @@
 package com.massivecraft.mcore.usys.cmd;
 
+import com.massivecraft.mcore.MultiverseColl;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.MultiverseColl;
 
 public class CmdUsysMultiverseNew extends MCommand
 {
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java
index f94777fc..5fecf5ac 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java
@@ -3,13 +3,13 @@ package com.massivecraft.mcore.usys.cmd;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.massivecraft.mcore.Aspect;
 import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARMultiverse;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Aspect;
-import com.massivecraft.mcore.usys.Multiverse;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdUsysMultiverseShow extends MCommand
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java
index 5a04f6b6..e29e5dbe 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java
@@ -1,11 +1,11 @@
 package com.massivecraft.mcore.usys.cmd;
 
 import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARMultiverse;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Multiverse;
 
 public class CmdUsysUniverseClear extends MCommand
 {
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java
index abad93c0..e06e3e5d 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java
@@ -1,11 +1,11 @@
 package com.massivecraft.mcore.usys.cmd;
 
 import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARMultiverse;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Multiverse;
 
 public class CmdUsysUniverseDel extends MCommand
 {
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java
index 2d961183..35867a2a 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java
@@ -1,10 +1,10 @@
 package com.massivecraft.mcore.usys.cmd;
 
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARMultiverse;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Multiverse;
 
 public class CmdUsysUniverseNew extends MCommand
 {
diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java
index 41c2f71a..3bc92aa2 100644
--- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java
+++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java
@@ -1,10 +1,10 @@
 package com.massivecraft.mcore.usys.cmd;
 
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.Perm;
 import com.massivecraft.mcore.cmd.MCommand;
 import com.massivecraft.mcore.cmd.arg.ARMultiverse;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
-import com.massivecraft.mcore.usys.Multiverse;
 
 public class CmdUsysWorld extends MCommand
 {
diff --git a/src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java b/src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java
index 3e8c5863..77396142 100644
--- a/src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java
+++ b/src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java
@@ -26,9 +26,9 @@ import org.bukkit.event.vehicle.VehicleEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
 
 import com.massivecraft.mcore.MCore;
+import com.massivecraft.mcore.Multiverse;
 import com.massivecraft.mcore.ps.PS;
 import com.massivecraft.mcore.store.SenderEntity;
-import com.massivecraft.mcore.usys.Multiverse;
 import com.massivecraft.mcore.util.MUtil;
 import com.massivecraft.mcore.util.SenderUtil;