diff --git a/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java b/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java
index 6e60302c0..dee09bc79 100644
--- a/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java
+++ b/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java
index efb4f209a..e2415189c 100644
--- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java
+++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java
index 2ca0740db..6565b9d32 100644
--- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java
+++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java
@@ -19,10 +19,10 @@
 package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.core.edit.JigsawEditor;
-import com.volmit.iris.object.IrisJigsawPiece;
+import com.volmit.iris.engine.object.IrisJigsawPiece;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java
index 4bdeafe7b..ba1dbbe33 100644
--- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java
+++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.edit.JigsawEditor;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java
index f3510b335..e0dce2cdd 100644
--- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java
+++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java
@@ -19,10 +19,10 @@
 package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.core.edit.JigsawEditor;
-import com.volmit.iris.object.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java
index 36b531970..0c0ca97ff 100644
--- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java
+++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java
@@ -19,10 +19,10 @@
 package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.IrisDataManager;
-import com.volmit.iris.object.IrisJigsawStructure;
-import com.volmit.iris.object.IrisPosition;
+import com.volmit.iris.engine.object.IrisJigsawStructure;
+import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.engine.jigsaw.PlannedStructure;
 import com.volmit.iris.util.*;
 
diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java
index 392b51e3b..7af59995f 100644
--- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java
+++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.jigsaw;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.edit.JigsawEditor;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java
index 7692b5b87..0ef6242c6 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java
index 5b21caa68..9a73ac12e 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java
index afaedaf61..c35862d9b 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java
index 3363309ae..f3bc3a57d 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java
index 9fb008dd3..c922d48c5 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java
index 5e7b38eab..b38172182 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java
index 735c5900d..6cb51c524 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java
@@ -19,11 +19,11 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.core.ProjectManager;
 import com.volmit.iris.core.WandManager;
-import com.volmit.iris.object.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java
index 35a4ae1ae..0b1740870 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java
@@ -19,9 +19,9 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
-import com.volmit.iris.object.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java
index a299cdf98..09623d352 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java
index 13c67734f..3e4c00773 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java
index f90843d66..28151e58f 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.Cuboid;
 import com.volmit.iris.util.Cuboid.CuboidDirection;
diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java
index 17031fa9f..9c87e9c11 100644
--- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java
+++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.WandManager;
 import com.volmit.iris.util.Cuboid;
 import com.volmit.iris.util.Cuboid.CuboidDirection;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java
index ae7ca4faf..58ac3c8cf 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java
index c2da73ac1..4b6f5a0d4 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.*;
 
 import java.io.File;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java
index a67e8fb1f..ef55e2fe8 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java
index 26ec4d68f..5f2277081 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java
index 7be9261d3..c438cd204 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.C;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java
index c53e21716..949eac15c 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java
index 07b100ef6..5c2debe59 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java
@@ -19,8 +19,8 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gui.NoiseExplorer;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.gui.NoiseExplorer;
 import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java
index 70acb42dd..5e78012a1 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java
@@ -19,10 +19,10 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.IrisDataManager;
-import com.volmit.iris.gui.NoiseExplorer;
-import com.volmit.iris.object.IrisGenerator;
+import com.volmit.iris.core.gui.NoiseExplorer;
+import com.volmit.iris.engine.object.IrisGenerator;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java
index 2e5e56b7d..deb1fc7c6 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java
@@ -20,8 +20,8 @@ package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisDataManager;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisRegion;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java
index f4cf2b995..341c9bca9 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java
index 8fb00a3b1..b01107387 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java
@@ -19,9 +19,9 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.object.InventorySlotType;
-import com.volmit.iris.object.IrisLootTable;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.engine.object.InventorySlotType;
+import com.volmit.iris.engine.object.IrisLootTable;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java
index 66b7bb6d1..2036dce4f 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java
@@ -19,8 +19,8 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.gui.IrisVision;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.gui.IrisVision;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.IrisAccess;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java
index 1b1d06678..416ab0f36 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java
index c42ef0553..0e9e7de63 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.J;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java
index 31fc49f35..f18cadaba 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java
@@ -19,11 +19,11 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.engine.noise.CNG;
 import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.core.IrisProject;
-import com.volmit.iris.object.*;
+import com.volmit.iris.engine.object.*;
 import com.volmit.iris.util.*;
 
 import java.io.File;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java
index 870e33017..3ecbb26dd 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java
@@ -19,8 +19,8 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.object.IrisEntity;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.engine.object.IrisEntity;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.IrisAccess;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java
index 012c741f6..fd0ea429f 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java
index a85f75f36..f58810941 100644
--- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java
+++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.studio;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.IrisProject;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java
index 516cdf6c3..66f42f895 100644
--- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java
+++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java
@@ -19,8 +19,8 @@
 package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.nms.INMS;
-import com.volmit.iris.object.IrisBiome;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.KList;
diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java
index 34b3cbb95..3992b1c16 100644
--- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java
+++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java
@@ -19,9 +19,9 @@
 package com.volmit.iris.core.command.what;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisObject;
-import com.volmit.iris.object.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisObject;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java
index 4a59c0a50..467a4fdf3 100644
--- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java
+++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java
@@ -19,12 +19,12 @@
 package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.core.link.MultiverseCoreLink;
-import com.volmit.iris.nms.INMS;
-import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.gui.Pregenerator;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.core.gui.Pregenerator;
 import com.volmit.iris.engine.IrisWorldCreator;
 import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java
index f0f3710f8..fc30e7167 100644
--- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java
+++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.command.world;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.gui.Pregenerator;
+import com.volmit.iris.core.gui.Pregenerator;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
diff --git a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java
index d1b85c0c9..b1d2d4222 100644
--- a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java
+++ b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java
@@ -20,7 +20,7 @@ package com.volmit.iris.core.edit;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.*;
+import com.volmit.iris.engine.object.*;
 import com.volmit.iris.util.*;
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java b/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java
index 7ec1f5662..7fa9304f2 100644
--- a/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java
+++ b/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.gui;
+package com.volmit.iris.core.gui;
 
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.util.IrisInterpolation;
diff --git a/src/main/java/com/volmit/iris/core/gui/IrisVision.java b/src/main/java/com/volmit/iris/core/gui/IrisVision.java
index 175ff3cb9..c2ecdf0c7 100644
--- a/src/main/java/com/volmit/iris/core/gui/IrisVision.java
+++ b/src/main/java/com/volmit/iris/core/gui/IrisVision.java
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.gui;
+package com.volmit.iris.core.gui;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.IrisComplex;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisRegion;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.IrisAccess;
 import com.volmit.iris.util.*;
diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java
index 9a319f6d9..d669eda1e 100644
--- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java
+++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.gui;
+package com.volmit.iris.core.gui;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.noise.CNG;
-import com.volmit.iris.object.NoiseStyle;
+import com.volmit.iris.engine.object.NoiseStyle;
 import com.volmit.iris.util.*;
 
 import javax.imageio.ImageIO;
diff --git a/src/main/java/com/volmit/iris/core/gui/Pregenerator.java b/src/main/java/com/volmit/iris/core/gui/Pregenerator.java
index da6bcada2..5ccc0b5c6 100644
--- a/src/main/java/com/volmit/iris/core/gui/Pregenerator.java
+++ b/src/main/java/com/volmit/iris/core/gui/Pregenerator.java
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.gui;
+package com.volmit.iris.core.gui;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.engine.data.DirectWorldWriter;
 import com.volmit.iris.engine.framework.IrisAccess;
diff --git a/src/main/java/com/volmit/iris/core/gui/RenderType.java b/src/main/java/com/volmit/iris/core/gui/RenderType.java
index 0ae395b83..99c5098fb 100644
--- a/src/main/java/com/volmit/iris/core/gui/RenderType.java
+++ b/src/main/java/com/volmit/iris/core/gui/RenderType.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.gui;
+package com.volmit.iris.core.gui;
 
 public enum RenderType {
     BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, LAYER_LOAD
diff --git a/src/main/java/com/volmit/iris/core/gui/Renderer.java b/src/main/java/com/volmit/iris/core/gui/Renderer.java
index d22b08f02..956b68e31 100644
--- a/src/main/java/com/volmit/iris/core/gui/Renderer.java
+++ b/src/main/java/com/volmit/iris/core/gui/Renderer.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.gui;
+package com.volmit.iris.core.gui;
 
 import java.awt.*;
 
diff --git a/src/main/java/com/volmit/iris/core/gui/TileRender.java b/src/main/java/com/volmit/iris/core/gui/TileRender.java
index 4ccef3a76..caca47173 100644
--- a/src/main/java/com/volmit/iris/core/gui/TileRender.java
+++ b/src/main/java/com/volmit/iris/core/gui/TileRender.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.gui;
+package com.volmit.iris.core.gui;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java b/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java
index 95b220cca..c4875a3d3 100644
--- a/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java
+++ b/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.core.link;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.KMap;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
diff --git a/src/main/java/com/volmit/iris/core/nms/BiomeBaseInjector.java b/src/main/java/com/volmit/iris/core/nms/BiomeBaseInjector.java
index c9e778e8b..cbdac0d76 100644
--- a/src/main/java/com/volmit/iris/core/nms/BiomeBaseInjector.java
+++ b/src/main/java/com/volmit/iris/core/nms/BiomeBaseInjector.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.nms;
+package com.volmit.iris.core.nms;
 
 @FunctionalInterface
 public interface BiomeBaseInjector {
diff --git a/src/main/java/com/volmit/iris/core/nms/INMS.java b/src/main/java/com/volmit/iris/core/nms/INMS.java
index fc574ac03..13f290c6b 100644
--- a/src/main/java/com/volmit/iris/core/nms/INMS.java
+++ b/src/main/java/com/volmit/iris/core/nms/INMS.java
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.nms;
+package com.volmit.iris.core.nms;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.nms.v17_1.NMSBinding17_1;
-import com.volmit.iris.nms.v1X.NMSBinding1X;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.core.nms.v17_1.NMSBinding17_1;
+import com.volmit.iris.core.nms.v1X.NMSBinding1X;
 import com.volmit.iris.util.KMap;
 import org.bukkit.Bukkit;
 
diff --git a/src/main/java/com/volmit/iris/core/nms/INMSBinding.java b/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
index 1ebf216cc..383ac574d 100644
--- a/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
+++ b/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.nms;
+package com.volmit.iris.core.nms;
 
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java b/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java
index 87e95d494..429a16fe1 100644
--- a/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java
+++ b/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.nms.v17_1;
+package com.volmit.iris.core.nms.v17_1;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.nms.INMSBinding;
+import com.volmit.iris.core.nms.INMSBinding;
 import com.volmit.iris.util.KMap;
 import net.minecraft.core.IRegistry;
 import net.minecraft.core.IRegistryWritable;
diff --git a/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java b/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
index 9eacde597..ee18ed059 100644
--- a/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
+++ b/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.nms.v1X;
+package com.volmit.iris.core.nms.v1X;
 
-import com.volmit.iris.nms.INMSBinding;
+import com.volmit.iris.core.nms.INMSBinding;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java
index 9c6775817..4c1fafbc1 100644
--- a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java
+++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.actuator;
+package com.volmit.iris.engine.actuator;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.nms.INMS;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisBiomeCustom;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiomeCustom;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java
index d11bef089..653a3d9b6 100644
--- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java
+++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.actuator;
+package com.volmit.iris.engine.actuator;
 
-import com.volmit.iris.generator.decorator.*;
-import com.volmit.iris.object.IrisBiome;
+import com.volmit.iris.engine.decorator.*;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
 import com.volmit.iris.engine.framework.EngineDecorator;
diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java
index 68ed61e9e..d3a27c821 100644
--- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java
+++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.actuator;
+package com.volmit.iris.engine.actuator;
 
-import com.volmit.iris.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/data/DataProvider.java b/src/main/java/com/volmit/iris/engine/data/DataProvider.java
index 455d97c76..0929957fd 100644
--- a/src/main/java/com/volmit/iris/engine/data/DataProvider.java
+++ b/src/main/java/com/volmit/iris/engine/data/DataProvider.java
@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.data;
 
-import com.volmit.iris.manager.IrisDataManager;
+import com.volmit.iris.core.IrisDataManager;
 
 public interface DataProvider {
     IrisDataManager getData();
diff --git a/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java b/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java
index 25e28bd69..d098f34e8 100644
--- a/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java
+++ b/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.data;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.nms.INMS;
+import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.data.mca.Chunk;
 import com.volmit.iris.engine.data.mca.MCAFile;
diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
index 2bd6ac00b..193b5e618 100644
--- a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
+++ b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.decorator;
+package com.volmit.iris.engine.decorator;
 
-import com.volmit.iris.object.DecorationPart;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisDecorator;
+import com.volmit.iris.engine.object.DecorationPart;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java
index 01f3474bd..47975afd7 100644
--- a/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java
+++ b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.decorator;
+package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.DecorationPart;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisDecorator;
+import com.volmit.iris.engine.object.DecorationPart;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedComponent;
diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
index c35cc2138..bb1dbb9c6 100644
--- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
+++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.decorator;
+package com.volmit.iris.engine.decorator;
 
-import com.volmit.iris.object.DecorationPart;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisDecorator;
+import com.volmit.iris.engine.object.DecorationPart;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
index ebc9a8645..b6c192424 100644
--- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
+++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.decorator;
+package com.volmit.iris.engine.decorator;
 
-import com.volmit.iris.object.DecorationPart;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisDecorator;
+import com.volmit.iris.engine.object.DecorationPart;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
index 337e500a1..f82906393 100644
--- a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
+++ b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.decorator;
+package com.volmit.iris.engine.decorator;
 
-import com.volmit.iris.object.DecorationPart;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisDecorator;
+import com.volmit.iris.engine.object.DecorationPart;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java
index d879c25e2..88a94bf01 100644
--- a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java
+++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.decorator;
+package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.DecorationPart;
-import com.volmit.iris.object.InferredType;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisDecorator;
+import com.volmit.iris.engine.object.DecorationPart;
+import com.volmit.iris.engine.object.InferredType;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java
index 80508c1b2..50d6fba2f 100644
--- a/src/main/java/com/volmit/iris/engine/framework/Engine.java
+++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java
@@ -19,10 +19,10 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.gui.Renderer;
-import com.volmit.iris.gui.RenderType;
-import com.volmit.iris.object.*;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.gui.Renderer;
+import com.volmit.iris.core.gui.RenderType;
+import com.volmit.iris.engine.object.*;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.data.DataProvider;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java
index 2848beeec..901332ffb 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java
@@ -19,9 +19,9 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.IrisComplex;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.object.IrisDimension;
+import com.volmit.iris.engine.IrisComplex;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.engine.parallax.ParallaxAccess;
 import com.volmit.iris.util.RollingSequence;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java
index 7630abe7d..38d8d9da2 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java
@@ -19,14 +19,14 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.IrisSettings;
-import com.volmit.iris.generator.IrisEngineCompound;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.nms.BiomeBaseInjector;
-import com.volmit.iris.nms.INMS;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.object.IrisPosition;
+import com.volmit.iris.core.IrisSettings;
+import com.volmit.iris.engine.IrisEngineCompound;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.nms.BiomeBaseInjector;
+import com.volmit.iris.core.nms.INMS;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.engine.data.DirectWorldWriter;
 import com.volmit.iris.engine.IrisWorlds;
 import com.volmit.iris.engine.cache.Cache;
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java
index ed332cf7c..db719a9fc 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java
@@ -19,11 +19,11 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.actuator.IrisTerrainActuator;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisDimension;
-import com.volmit.iris.object.IrisPosition;
+import com.volmit.iris.engine.actuator.IrisTerrainActuator;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisDimension;
+import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.engine.data.DataProvider;
 import com.volmit.iris.engine.hunk.Hunk;
 import com.volmit.iris.engine.parallel.MultiBurst;
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineData.java b/src/main/java/com/volmit/iris/engine/framework/EngineData.java
index 36e6cdaaf..b5a8d5b97 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineData.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineData.java
@@ -20,7 +20,7 @@ package com.volmit.iris.engine.framework;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.util.IO;
 import lombok.Data;
 
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java
index 2a694ec17..262623b0b 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java
@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.hunk.Hunk;
 import com.volmit.iris.util.B;
 import org.bukkit.block.data.BlockData;
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java b/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java
index 93681988f..ae30b5d4a 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java
@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.generator.IrisComplex;
-import com.volmit.iris.manager.IrisDataManager;
+import com.volmit.iris.engine.IrisComplex;
+import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.engine.data.DataProvider;
 import org.bukkit.block.Biome;
 import org.bukkit.block.data.BlockData;
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java
index e5bc45544..4a47f6668 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java
@@ -19,10 +19,10 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.IrisComplex;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.object.*;
-import com.volmit.iris.object.tile.TileData;
+import com.volmit.iris.engine.IrisComplex;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.engine.object.*;
+import com.volmit.iris.engine.object.tile.TileData;
 import com.volmit.iris.engine.cache.Cache;
 import com.volmit.iris.engine.data.DataProvider;
 import com.volmit.iris.engine.hunk.Hunk;
diff --git a/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java b/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java
index 2863872d8..55aded197 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java
@@ -19,9 +19,9 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisEffect;
-import com.volmit.iris.object.IrisRegion;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisEffect;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.J;
 import com.volmit.iris.util.M;
 import lombok.Data;
diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java
index f261c0c46..21d2bff12 100644
--- a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java
+++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java
@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.object.IrisDimension;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.engine.parallax.ParallaxWorld;
 import com.volmit.iris.engine.parallel.MultiBurst;
 import lombok.Data;
diff --git a/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java b/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java
index a80bd3053..1585d7e4c 100644
--- a/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java
+++ b/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java
@@ -18,11 +18,11 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.gui.Renderer;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisObjectPlacement;
-import com.volmit.iris.object.IrisRegion;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.gui.Renderer;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.engine.data.DataProvider;
 import com.volmit.iris.engine.parallax.ParallaxAccess;
 
diff --git a/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java
index 050095a79..f205076fe 100644
--- a/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java
+++ b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java
@@ -19,9 +19,9 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.manager.IrisDataManager;
-import com.volmit.iris.object.IrisBiome;
-import com.volmit.iris.object.IrisRegion;
+import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.engine.data.DirectWorldWriter;
 import com.volmit.iris.engine.data.DataProvider;
 import com.volmit.iris.engine.parallel.MultiBurst;
diff --git a/src/main/java/com/volmit/iris/engine/framework/LootProvider.java b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java
index d013b3cac..94d0f841a 100644
--- a/src/main/java/com/volmit/iris/engine/framework/LootProvider.java
+++ b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java
@@ -18,9 +18,9 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.object.InventorySlotType;
-import com.volmit.iris.object.IrisLootReference;
-import com.volmit.iris.object.IrisLootTable;
+import com.volmit.iris.engine.object.InventorySlotType;
+import com.volmit.iris.engine.object.IrisLootReference;
+import com.volmit.iris.engine.object.IrisLootTable;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.RNG;
 import org.bukkit.block.Block;
diff --git a/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java b/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java
index 297920eb4..f195511bc 100644
--- a/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java
+++ b/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java
@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.object.IrisObject;
-import com.volmit.iris.object.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObject;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java
index a97bd817e..1185915a8 100644
--- a/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java
+++ b/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.hunk.io;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.tile.TileData;
+import com.volmit.iris.engine.object.tile.TileData;
 import com.volmit.iris.engine.hunk.Hunk;
 import com.volmit.iris.engine.parallel.BurstExecutor;
 import com.volmit.iris.engine.parallel.GridLock;
diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java
index 1ef762952..dfb6abb88 100644
--- a/src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java
+++ b/src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java
@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.hunk.io;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.object.tile.TileData;
+import com.volmit.iris.engine.object.tile.TileData;
 import org.bukkit.block.TileState;
 
 import java.io.DataInputStream;
diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java
index 67782b9b1..43ac995be 100644
--- a/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java
+++ b/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java
@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.hunk.view;
 
-import com.volmit.iris.nms.INMS;
+import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.engine.hunk.Hunk;
 import com.volmit.iris.util.LinkedTerrainChunk;
 import lombok.Getter;
diff --git a/src/main/java/com/volmit/iris/engine/noise/CellGenerator.java b/src/main/java/com/volmit/iris/engine/noise/CellGenerator.java
index 3ba9bd7d0..ee4c71d70 100644
--- a/src/main/java/com/volmit/iris/engine/noise/CellGenerator.java
+++ b/src/main/java/com/volmit/iris/engine/noise/CellGenerator.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.noise;
+package com.volmit.iris.engine.noise;
 
 import com.volmit.iris.util.RNG;
 import lombok.Getter;
diff --git a/src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java b/src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java
index 0ff84cd96..48748b186 100644
--- a/src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java
+++ b/src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.noise;
+package com.volmit.iris.engine.noise;
 
 import com.volmit.iris.util.M;
 import com.volmit.iris.util.RNG;
diff --git a/src/main/java/com/volmit/iris/engine/noise/CellularNoise.java b/src/main/java/com/volmit/iris/engine/noise/CellularNoise.java
index 00e4b1020..dc707ba24 100644
--- a/src/main/java/com/volmit/iris/engine/noise/CellularNoise.java
+++ b/src/main/java/com/volmit/iris/engine/noise/CellularNoise.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.generator.noise;
+package com.volmit.iris.engine.noise;
 
 import com.volmit.iris.util.RNG;
 
diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java
index f12b1db92..0611408a3 100644
--- a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java
+++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java
@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.stream.interpolation;
 
-import com.volmit.iris.object.InterpolationMethod;
+import com.volmit.iris.engine.object.InterpolationMethod;
 import com.volmit.iris.engine.stream.BasicStream;
 import com.volmit.iris.engine.stream.ProceduralStream;
 import com.volmit.iris.util.IrisInterpolation;
diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java
index 1085bf182..81a6685ec 100644
--- a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java
+++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java
@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.stream.interpolation;
 
-import com.volmit.iris.object.InterpolationMethod;
+import com.volmit.iris.engine.object.InterpolationMethod;
 import com.volmit.iris.engine.stream.ProceduralStream;
 
 @SuppressWarnings("ClassCanBeRecord")