diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/Gaea.java b/common/src/main/java/com/dfsek/terra/api/Gaea.java
similarity index 91%
rename from common/src/main/java/com/dfsek/terra/api/gaea/Gaea.java
rename to common/src/main/java/com/dfsek/terra/api/Gaea.java
index 5254fe730..4c0890fca 100644
--- a/common/src/main/java/com/dfsek/terra/api/gaea/Gaea.java
+++ b/common/src/main/java/com/dfsek/terra/api/Gaea.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea;
+package com.dfsek.terra.api;
 
 
 import com.dfsek.terra.api.platform.world.World;
diff --git a/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java b/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java
index b47890b4a..5721cf888 100644
--- a/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java
+++ b/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java
@@ -3,9 +3,10 @@ package com.dfsek.terra.api.platform;
 import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.LoaderRegistrar;
 import com.dfsek.terra.api.lang.Language;
-import com.dfsek.terra.api.platform.inventory.ItemHandle;
+import com.dfsek.terra.api.platform.handle.EntityHandle;
+import com.dfsek.terra.api.platform.handle.ItemHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.config.base.PluginConfig;
 import com.dfsek.terra.registry.ConfigRegistry;
 
@@ -36,4 +37,6 @@ public interface TerraPlugin extends LoaderRegistrar {
     ItemHandle getItemHandle();
 
     void saveDefaultConfig();
+
+    EntityHandle getEntityHandle();
 }
diff --git a/common/src/main/java/com/dfsek/terra/api/platform/Tree.java b/common/src/main/java/com/dfsek/terra/api/platform/Tree.java
deleted file mode 100644
index a4f4a3d9e..000000000
--- a/common/src/main/java/com/dfsek/terra/api/platform/Tree.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.dfsek.terra.api.platform;
-
-public interface Tree extends Handle, com.dfsek.terra.api.world.tree.Tree {
-}
diff --git a/common/src/main/java/com/dfsek/terra/api/platform/handle/EntityHandle.java b/common/src/main/java/com/dfsek/terra/api/platform/handle/EntityHandle.java
new file mode 100644
index 000000000..0661fbfa5
--- /dev/null
+++ b/common/src/main/java/com/dfsek/terra/api/platform/handle/EntityHandle.java
@@ -0,0 +1,4 @@
+package com.dfsek.terra.api.platform.handle;
+
+public interface EntityHandle {
+}
diff --git a/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemHandle.java b/common/src/main/java/com/dfsek/terra/api/platform/handle/ItemHandle.java
similarity index 60%
rename from common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemHandle.java
rename to common/src/main/java/com/dfsek/terra/api/platform/handle/ItemHandle.java
index a812cbc18..ce26fa2ac 100644
--- a/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemHandle.java
+++ b/common/src/main/java/com/dfsek/terra/api/platform/handle/ItemHandle.java
@@ -1,6 +1,7 @@
-package com.dfsek.terra.api.platform.inventory;
+package com.dfsek.terra.api.platform.handle;
 
 import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.inventory.ItemStack;
 
 public interface ItemHandle {
     ItemStack newItemStack(MaterialData material, int amount);
diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/WorldHandle.java b/common/src/main/java/com/dfsek/terra/api/platform/handle/WorldHandle.java
similarity index 85%
rename from common/src/main/java/com/dfsek/terra/api/platform/world/WorldHandle.java
rename to common/src/main/java/com/dfsek/terra/api/platform/handle/WorldHandle.java
index 9f0cb7559..dd7f8e0f9 100644
--- a/common/src/main/java/com/dfsek/terra/api/platform/world/WorldHandle.java
+++ b/common/src/main/java/com/dfsek/terra/api/platform/handle/WorldHandle.java
@@ -1,9 +1,9 @@
-package com.dfsek.terra.api.platform.world;
+package com.dfsek.terra.api.platform.handle;
 
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.world.Tree;
 
 /**
  * Interface to be implemented for world manipulation.
diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/Tree.java b/common/src/main/java/com/dfsek/terra/api/platform/world/Tree.java
new file mode 100644
index 000000000..c9a6a1cb5
--- /dev/null
+++ b/common/src/main/java/com/dfsek/terra/api/platform/world/Tree.java
@@ -0,0 +1,6 @@
+package com.dfsek.terra.api.platform.world;
+
+import com.dfsek.terra.api.platform.Handle;
+
+public interface Tree extends Handle, com.dfsek.terra.api.world.tree.Tree {
+}
diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/World.java b/common/src/main/java/com/dfsek/terra/api/platform/world/World.java
index 38e5acd61..cdb10ceb3 100644
--- a/common/src/main/java/com/dfsek/terra/api/platform/world/World.java
+++ b/common/src/main/java/com/dfsek/terra/api/platform/world/World.java
@@ -3,7 +3,6 @@ package com.dfsek.terra.api.platform.world;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
 import com.dfsek.terra.api.platform.Handle;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 
diff --git a/common/src/main/java/com/dfsek/terra/api/loot/Entry.java b/common/src/main/java/com/dfsek/terra/api/structures/loot/Entry.java
similarity index 92%
rename from common/src/main/java/com/dfsek/terra/api/loot/Entry.java
rename to common/src/main/java/com/dfsek/terra/api/structures/loot/Entry.java
index 59528eb38..66a819baf 100644
--- a/common/src/main/java/com/dfsek/terra/api/loot/Entry.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/loot/Entry.java
@@ -1,11 +1,11 @@
-package com.dfsek.terra.api.loot;
+package com.dfsek.terra.api.structures.loot;
 
-import com.dfsek.terra.api.loot.functions.AmountFunction;
-import com.dfsek.terra.api.loot.functions.DamageFunction;
-import com.dfsek.terra.api.loot.functions.Function;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.structures.loot.functions.AmountFunction;
+import com.dfsek.terra.api.structures.loot.functions.DamageFunction;
+import com.dfsek.terra.api.structures.loot.functions.Function;
 import com.dfsek.terra.api.util.GlueList;
 import net.jafama.FastMath;
 import org.json.simple.JSONArray;
diff --git a/common/src/main/java/com/dfsek/terra/api/loot/LootTable.java b/common/src/main/java/com/dfsek/terra/api/structures/loot/LootTable.java
similarity index 98%
rename from common/src/main/java/com/dfsek/terra/api/loot/LootTable.java
rename to common/src/main/java/com/dfsek/terra/api/structures/loot/LootTable.java
index eb4be5f8c..9e57de215 100644
--- a/common/src/main/java/com/dfsek/terra/api/loot/LootTable.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/loot/LootTable.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.loot;
+package com.dfsek.terra.api.structures.loot;
 
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.inventory.Inventory;
diff --git a/common/src/main/java/com/dfsek/terra/api/loot/Pool.java b/common/src/main/java/com/dfsek/terra/api/structures/loot/Pool.java
similarity index 97%
rename from common/src/main/java/com/dfsek/terra/api/loot/Pool.java
rename to common/src/main/java/com/dfsek/terra/api/structures/loot/Pool.java
index 899d55ec6..d45be375f 100644
--- a/common/src/main/java/com/dfsek/terra/api/loot/Pool.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/loot/Pool.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.loot;
+package com.dfsek.terra.api.structures.loot;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.TerraPlugin;
diff --git a/common/src/main/java/com/dfsek/terra/api/loot/functions/AmountFunction.java b/common/src/main/java/com/dfsek/terra/api/structures/loot/functions/AmountFunction.java
similarity index 94%
rename from common/src/main/java/com/dfsek/terra/api/loot/functions/AmountFunction.java
rename to common/src/main/java/com/dfsek/terra/api/structures/loot/functions/AmountFunction.java
index cacfdb9bd..b268fb637 100644
--- a/common/src/main/java/com/dfsek/terra/api/loot/functions/AmountFunction.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/loot/functions/AmountFunction.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.loot.functions;
+package com.dfsek.terra.api.structures.loot.functions;
 
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;
diff --git a/common/src/main/java/com/dfsek/terra/api/loot/functions/DamageFunction.java b/common/src/main/java/com/dfsek/terra/api/structures/loot/functions/DamageFunction.java
similarity index 96%
rename from common/src/main/java/com/dfsek/terra/api/loot/functions/DamageFunction.java
rename to common/src/main/java/com/dfsek/terra/api/structures/loot/functions/DamageFunction.java
index 948967ad0..3afb8ecdb 100644
--- a/common/src/main/java/com/dfsek/terra/api/loot/functions/DamageFunction.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/loot/functions/DamageFunction.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.loot.functions;
+package com.dfsek.terra.api.structures.loot.functions;
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.Damageable;
diff --git a/common/src/main/java/com/dfsek/terra/api/loot/functions/Function.java b/common/src/main/java/com/dfsek/terra/api/structures/loot/functions/Function.java
similarity index 89%
rename from common/src/main/java/com/dfsek/terra/api/loot/functions/Function.java
rename to common/src/main/java/com/dfsek/terra/api/structures/loot/functions/Function.java
index 643310626..b3993abe6 100644
--- a/common/src/main/java/com/dfsek/terra/api/loot/functions/Function.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/loot/functions/Function.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.loot.functions;
+package com.dfsek.terra.api.structures.loot.functions;
 
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;
diff --git a/common/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java b/common/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java
index cecc70a88..fd4467d65 100644
--- a/common/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java
@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.loot.LootTable;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.structures.loot.LootTable;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.structure.Rotation;
diff --git a/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java b/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java
index 4924e6b60..bf2d2c2f6 100644
--- a/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java
+++ b/common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
-import com.dfsek.terra.api.loot.LootTable;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.state.BlockState;
 import com.dfsek.terra.api.platform.block.state.Container;
+import com.dfsek.terra.api.structures.loot.LootTable;
 import com.dfsek.terra.api.util.FastRandom;
 
 public class BufferedLootApplication implements BufferedItem {
diff --git a/common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java b/common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java
index e7d75133a..c0b21ae26 100644
--- a/common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java
+++ b/common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java
@@ -1,9 +1,7 @@
 package com.dfsek.terra.api.world.carving;
 
-import com.dfsek.terra.api.math.MathUtil;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.util.FastRandom;
 import net.jafama.FastMath;
 
 import java.util.Random;
@@ -20,26 +18,7 @@ public abstract class Carver {
         this.maxY = maxY;
     }
 
-    public void carve(int chunkX, int chunkZ, World w, BiConsumer<Vector3, CarvingType> consumer) {
-        for(int x = chunkX - carvingRadius; x <= chunkX + carvingRadius; x++) {
-            for(int z = chunkZ - carvingRadius; z <= chunkZ + carvingRadius; z++) {
-                if(isChunkCarved(w, x, z, new FastRandom(MathUtil.hashToLong(this.getClass().getName() + "_" + x + "&" + z)))) {
-                    long seed = MathUtil.getCarverChunkSeed(x, z, w.getSeed());
-                    Random r = new FastRandom(seed);
-                    Worm carving = getWorm(seed, new Vector3((x << 4) + r.nextInt(16), r.nextInt(maxY - minY + 1) + minY, (z << 4) + r.nextInt(16)));
-                    Vector3 origin = carving.getOrigin();
-                    for(int i = 0; i < carving.getLength(); i++) {
-                        carving.step();
-                        if(carving.getRunning().clone().setY(0).distanceSquared(origin.clone().setY(0)) > sixtyFourSq)
-                            break;
-                        if(FastMath.floorDiv(origin.getBlockX(), 16) != chunkX && FastMath.floorDiv(origin.getBlockZ(), 16) != chunkZ)
-                            continue;
-                        carving.getPoint().carve(chunkX, chunkZ, consumer);
-                    }
-                }
-            }
-        }
-    }
+    public abstract void carve(int chunkX, int chunkZ, World w, BiConsumer<Vector3, CarvingType> consumer);
 
     public int getCarvingRadius() {
         return carvingRadius;
diff --git a/common/src/main/java/com/dfsek/terra/api/world/generation/population/PopulationManager.java b/common/src/main/java/com/dfsek/terra/api/world/generation/population/PopulationManager.java
index 4be710a6b..dba3643a2 100644
--- a/common/src/main/java/com/dfsek/terra/api/world/generation/population/PopulationManager.java
+++ b/common/src/main/java/com/dfsek/terra/api/world/generation/population/PopulationManager.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.generation.population;
 
-import com.dfsek.terra.api.gaea.Gaea;
+import com.dfsek.terra.api.Gaea;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
diff --git a/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java
index 35b1d0c83..ea45144dd 100644
--- a/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java
+++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.WorldHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import com.dfsek.terra.util.MaterialSet;
diff --git a/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java
index a65f54538..50839b746 100644
--- a/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java
+++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.WorldHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import com.dfsek.terra.util.MaterialSet;
diff --git a/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java
index 575542912..50e681870 100644
--- a/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java
+++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.WorldHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import com.dfsek.terra.util.MaterialSet;
diff --git a/common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java b/common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java
index 46d421ada..f1ba1c6f5 100644
--- a/common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java
+++ b/common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java
@@ -6,8 +6,8 @@ import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.LoaderRegistrar;
-import com.dfsek.terra.api.loot.LootTable;
 import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.structures.loot.LootTable;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.structures.world.CheckCache;
 import com.dfsek.terra.api.world.biome.Biome;
diff --git a/common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java b/common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java
index bcb72ce54..ce700c3e8 100644
--- a/common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java
+++ b/common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java
@@ -9,8 +9,8 @@ import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.data.Directional;
 import com.dfsek.terra.api.platform.block.data.MultipleFacing;
 import com.dfsek.terra.api.platform.block.data.Rotatable;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.world.flora.Flora;
diff --git a/common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java b/common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java
index c8f72a584..94332344d 100644
--- a/common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java
+++ b/common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java
@@ -6,8 +6,8 @@ import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.util.MaterialSet;
 
 import java.util.Random;
diff --git a/common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java b/common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java
index 98e549e13..4e1f5364c 100644
--- a/common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java
+++ b/common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java
@@ -5,8 +5,8 @@ import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.util.MaterialSet;
 import net.jafama.FastMath;
 
diff --git a/common/src/main/java/com/dfsek/terra/population/CavePopulator.java b/common/src/main/java/com/dfsek/terra/population/CavePopulator.java
index a04c86005..208211b07 100644
--- a/common/src/main/java/com/dfsek/terra/population/CavePopulator.java
+++ b/common/src/main/java/com/dfsek/terra/population/CavePopulator.java
@@ -6,9 +6,9 @@ import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.carving.UserDefinedCarver;
diff --git a/common/src/main/java/com/dfsek/terra/registry/LootRegistry.java b/common/src/main/java/com/dfsek/terra/registry/LootRegistry.java
index a824c9d31..0104bb66c 100644
--- a/common/src/main/java/com/dfsek/terra/registry/LootRegistry.java
+++ b/common/src/main/java/com/dfsek/terra/registry/LootRegistry.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.registry;
 
-import com.dfsek.terra.api.loot.LootTable;
+import com.dfsek.terra.api.structures.loot.LootTable;
 
 public class LootRegistry extends TerraRegistry<LootTable> {
 }
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
index 026277941..e24a75eec 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
@@ -2,6 +2,7 @@ package com.dfsek.terra.bukkit;
 
 import com.dfsek.terra.api.Player;
 import com.dfsek.terra.api.math.vector.Location;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 
 public class BukkitPlayer implements Player {
     private final org.bukkit.entity.Player delegate;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
index 7abefd247..1c4c4de05 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -5,23 +5,27 @@ import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.GenericLoaders;
 import com.dfsek.terra.api.lang.Language;
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.platform.inventory.ItemHandle;
+import com.dfsek.terra.api.platform.handle.EntityHandle;
+import com.dfsek.terra.api.platform.handle.ItemHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Biome;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.bukkit.command.command.TerraCommand;
 import com.dfsek.terra.bukkit.command.command.structure.LocateCommand;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGenerator;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
+import com.dfsek.terra.bukkit.handles.BukkitItemHandle;
+import com.dfsek.terra.bukkit.handles.BukkitWorldHandle;
 import com.dfsek.terra.bukkit.listeners.EventListener;
 import com.dfsek.terra.bukkit.listeners.SpigotListener;
 import com.dfsek.terra.bukkit.util.PaperUtil;
 import com.dfsek.terra.bukkit.world.BukkitBiome;
+import com.dfsek.terra.bukkit.world.BukkitTree;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.base.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
@@ -70,6 +74,11 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         return itemHandle;
     }
 
+    @Override
+    public EntityHandle getEntityHandle() {
+        return null;
+    }
+
     public void setHandle(WorldHandle handle) {
         getLogger().warning("|-------------------------------------------------------|");
         getLogger().warning("A third-party addon has injected a custom WorldHandle!");
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeInfoCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeInfoCommand.java
index 7208bf296..37a72b0fc 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeInfoCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/biome/BiomeInfoCommand.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.bukkit.command.command.biome;
 
 import com.dfsek.terra.biome.UserDefinedBiome;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.lang.LangUtil;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java
index 6e363bf0f..e8c677fcb 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java
@@ -4,8 +4,8 @@ import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitPlayer;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.PlayerCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.procgen.voxel.DeformedSphere;
 import org.bukkit.command.Command;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java
index 0bc1b5883..f0bebfa1f 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java
@@ -3,8 +3,8 @@ package com.dfsek.terra.bukkit.command.command.geometry;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitPlayer;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.PlayerCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.procgen.voxel.Sphere;
 import org.bukkit.command.Command;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java
index 0d1385771..6f4e7db47 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java
@@ -2,10 +2,10 @@ package com.dfsek.terra.bukkit.command.command.geometry;
 
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.PlayerCommand;
 import com.dfsek.terra.bukkit.structure.WorldEditUtil;
 import com.dfsek.terra.bukkit.util.BukkitConversions;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.procgen.voxel.Tube;
 import org.bukkit.Location;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/QueryCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/QueryCommand.java
index 84ae1624a..8987d6636 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/QueryCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/QueryCommand.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit.command.command.profile;
 
 import com.dfsek.terra.api.profiler.WorldProfiler;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/ResetCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/ResetCommand.java
index f86224dc9..19d687d47 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/ResetCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/ResetCommand.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.bukkit.command.command.profile;
 
 import com.dfsek.terra.api.profiler.WorldProfiler;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.lang.LangUtil;
 import org.bukkit.World;
 import org.bukkit.command.Command;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/StartCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/StartCommand.java
index 8a6a077a2..8dd41ce67 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/StartCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/StartCommand.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.bukkit.command.command.profile;
 
 import com.dfsek.terra.api.profiler.WorldProfiler;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.lang.LangUtil;
 import org.bukkit.World;
 import org.bukkit.command.Command;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/StopCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/StopCommand.java
index 2477d52ae..39dea2544 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/StopCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/profile/StopCommand.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.bukkit.command.command.profile;
 
 import com.dfsek.terra.api.profiler.WorldProfiler;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.lang.LangUtil;
 import org.bukkit.World;
 import org.bukkit.command.Command;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/LocateCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/LocateCommand.java
index a9badebe7..00585091c 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/LocateCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/LocateCommand.java
@@ -4,9 +4,9 @@ import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.async.AsyncStructureFinder;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.generation.items.TerraStructure;
 import net.md_5.bungee.api.ChatColor;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/SpawnCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/SpawnCommand.java
index f604a5f5b..0942b6170 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/SpawnCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/SpawnCommand.java
@@ -6,9 +6,9 @@ import com.dfsek.terra.api.structures.structure.Rotation;
 import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import com.dfsek.terra.api.util.FastRandom;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.DebugCommand;
 import com.dfsek.terra.bukkit.command.WorldCommand;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.Command;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java
index b16ba77f9..b6021146e 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java
@@ -4,9 +4,9 @@ import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.structures.structure.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
-import com.dfsek.terra.bukkit.BukkitChunk;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.DebugCommand;
+import com.dfsek.terra.bukkit.world.BukkitChunk;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.util.PopulationUtil;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadRawCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadRawCommand.java
index 1a0008cb3..b57981e2d 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadRawCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadRawCommand.java
@@ -4,9 +4,9 @@ import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.structures.structure.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
-import com.dfsek.terra.bukkit.BukkitChunk;
-import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.DebugCommand;
+import com.dfsek.terra.bukkit.world.BukkitChunk;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.util.PopulationUtil;
 import org.bukkit.block.Sign;
 import org.bukkit.command.Command;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
index da5979414..624354589 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
@@ -5,8 +5,8 @@ import com.dfsek.terra.api.platform.generator.BlockPopulator;
 import com.dfsek.terra.api.platform.world.BiomeGrid;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
-import com.dfsek.terra.bukkit.BukkitBiomeGrid;
-import com.dfsek.terra.bukkit.BukkitWorld;
+import com.dfsek.terra.bukkit.world.BukkitBiomeGrid;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import org.bukkit.generator.ChunkGenerator;
 import org.jetbrains.annotations.NotNull;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
index 695535ef4..9010fce42 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
@@ -5,8 +5,8 @@ import com.dfsek.terra.api.platform.generator.GeneratorWrapper;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.api.world.generation.population.PopulationManager;
-import com.dfsek.terra.bukkit.BukkitBiomeGrid;
-import com.dfsek.terra.bukkit.BukkitWorld;
+import com.dfsek.terra.bukkit.world.BukkitBiomeGrid;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.debug.Debug;
 import com.dfsek.terra.generation.MasterChunkGenerator;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java
index dae8b73fc..a8f72122f 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java
@@ -3,8 +3,8 @@ package com.dfsek.terra.bukkit.generator;
 import com.dfsek.terra.api.platform.generator.BlockPopulator;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.bukkit.BukkitChunk;
-import com.dfsek.terra.bukkit.BukkitWorld;
+import com.dfsek.terra.bukkit.world.BukkitChunk;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 
 import java.util.Random;
 
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java
index 566de2470..6a3a9a238 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit.generator;
 
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.bukkit.BukkitChunk;
-import com.dfsek.terra.bukkit.BukkitWorld;
+import com.dfsek.terra.bukkit.world.BukkitChunk;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitItemHandle.java
similarity index 84%
rename from platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java
rename to platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitItemHandle.java
index fa6d7fd3b..8116e2f80 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitItemHandle.java
@@ -1,7 +1,7 @@
-package com.dfsek.terra.bukkit;
+package com.dfsek.terra.bukkit.handles;
 
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.platform.inventory.ItemHandle;
+import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
 import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java
similarity index 91%
rename from platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java
rename to platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java
index 1a2843ad9..f9d6e4c77 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java
@@ -1,11 +1,11 @@
-package com.dfsek.terra.bukkit;
+package com.dfsek.terra.bukkit.handles;
 
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.platform.world.WorldHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java
index e56821ff0..59c5f12ec 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java
@@ -8,7 +8,7 @@ import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.tree.Tree;
-import com.dfsek.terra.bukkit.BukkitWorld;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.debug.Debug;
 import com.dfsek.terra.registry.TreeRegistry;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java
index 6ad2f0cfc..9d0673950 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.util;
 
 import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.bukkit.BukkitWorld;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import org.bukkit.Location;
 import org.bukkit.util.Vector;
 
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitBiomeGrid.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java
similarity index 92%
rename from platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitBiomeGrid.java
rename to platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java
index 649cafd57..da1fdfc51 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitBiomeGrid.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java
@@ -1,8 +1,7 @@
-package com.dfsek.terra.bukkit;
+package com.dfsek.terra.bukkit.world;
 
 import com.dfsek.terra.api.platform.world.Biome;
 import com.dfsek.terra.api.platform.world.BiomeGrid;
-import com.dfsek.terra.bukkit.world.BukkitBiome;
 import org.bukkit.generator.ChunkGenerator;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java
similarity index 95%
rename from platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java
rename to platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java
index e74cb3b86..da42f8266 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit;
+package com.dfsek.terra.bukkit.world;
 
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.world.Chunk;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
similarity index 93%
rename from platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java
rename to platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
index 19ded559c..cef57c41f 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java
@@ -1,10 +1,10 @@
-package com.dfsek.terra.bukkit;
+package com.dfsek.terra.bukkit.world;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.platform.world.WorldHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.bukkit.util.BukkitConversions;
 import com.dfsek.terra.util.MaterialSet;
 import org.bukkit.TreeType;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java
similarity index 96%
rename from platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java
rename to platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java
index 34beda546..33f41de53 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java
@@ -1,10 +1,10 @@
-package com.dfsek.terra.bukkit;
+package com.dfsek.terra.bukkit.world;
 
 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGenerator;
 import com.dfsek.terra.bukkit.world.block.BukkitBlock;
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
index 49ba5ccee..04f56e999 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
@@ -6,7 +6,7 @@ import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.block.state.BlockState;
-import com.dfsek.terra.bukkit.BukkitWorld;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import com.dfsek.terra.bukkit.world.block.data.BukkitEnumAdapter;
 import com.dfsek.terra.bukkit.world.block.state.BukkitBlockState;
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
index 21633edad..7f191059b 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -7,9 +7,10 @@ import com.dfsek.terra.api.lang.Language;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.platform.inventory.ItemHandle;
+import com.dfsek.terra.api.platform.handle.EntityHandle;
+import com.dfsek.terra.api.platform.handle.ItemHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.NotNullValidator;
 import com.dfsek.terra.api.transform.Transformer;
@@ -177,6 +178,11 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
         }
     }
 
+    @Override
+    public EntityHandle getEntityHandle() {
+        return null;
+    }
+
     Transformer<String, Biome> biomeFixer = new Transformer.Builder<String, Biome>()
             .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse(id)), new NotNullValidator<>())
             .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse("minecraft:" + id.toLowerCase())), new NotNullValidator<>()).build();
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
index 35d5b5869..203be849b 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.inventory;
 
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.platform.inventory.ItemHandle;
+import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 
 public class FabricItemHandle implements ItemHandle {
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
index 99546947f..4006afd73 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.world;
 
 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
 import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess;
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java
index e2c411429..266bab2e3 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.fabric.world;
 
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.platform.world.WorldHandle;
+import com.dfsek.terra.api.platform.handle.WorldHandle;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.fabric.world.block.FabricBlockData;
 import com.dfsek.terra.fabric.world.block.FabricMaterialData;
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java
index dad97da57..36e77afeb 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java
@@ -2,10 +2,10 @@ package com.dfsek.terra.fabric.world.handles;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.fabric.world.block.FabricBlock;
 import com.dfsek.terra.fabric.world.handles.chunk.FabricChunk;
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java
index 987be26c9..813e6d9a1 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java
@@ -2,10 +2,10 @@ package com.dfsek.terra.fabric.world.handles.world;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.fabric.world.block.FabricBlock;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
index 09e3222bc..b292a0391 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
@@ -2,10 +2,10 @@ package com.dfsek.terra.fabric.world.handles.world;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.fabric.world.block.FabricBlock;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java
index cb46e53e7..e8c31f5b2 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java
@@ -2,10 +2,10 @@ package com.dfsek.terra.fabric.world.handles.world;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
-import com.dfsek.terra.api.platform.Tree;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.fabric.world.block.FabricBlock;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;