Refactor API

common/src/main/java/com/dfsek/terra/api/Entity.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api;
 
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Handle;
-import com.dfsek.terra.api.platform.world.vector.Location;
 
 public interface Entity extends Handle {
     Location getLocation();

common/src/main/java/com/dfsek/terra/api/loot/Entry.java

@@ -4,8 +4,8 @@ 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.platform.world.block.MaterialData;
 import com.dfsek.terra.api.util.GlueList;
 import net.jafama.FastMath;
 import org.json.simple.JSONArray;

common/src/main/java/com/dfsek/terra/api/math/interpolation/ChunkInterpolator3.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math;
+package com.dfsek.terra.api.math.interpolation;
 
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.world.biome.BiomeGrid;

common/src/main/java/com/dfsek/terra/api/math/interpolation/Interpolator.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math;
+package com.dfsek.terra.api.math.interpolation;
 
 import net.jafama.FastMath;
 

common/src/main/java/com/dfsek/terra/api/math/interpolation/Interpolator3.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math;
+package com.dfsek.terra.api.math.interpolation;
 
 /**
  * Class for bilinear interpolation of values arranged on a unit square.

common/src/main/java/com/dfsek/terra/api/math/vector/Location.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.world.vector;
+package com.dfsek.terra.api.math.vector;
 
+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;
 
 public class Location implements Cloneable {
     private World world;

common/src/main/java/com/dfsek/terra/api/math/vector/Vector2.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.world.vector;
+package com.dfsek.terra.api.math.vector;
 
 import net.jafama.FastMath;
 

common/src/main/java/com/dfsek/terra/api/math/vector/Vector3.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.world.vector;
+package com.dfsek.terra.api.math.vector;
 
 import com.dfsek.terra.api.platform.world.World;
 import net.jafama.FastMath;

common/src/main/java/com/dfsek/terra/api/platform/block/Axis.java

@@ -0,0 +1,5 @@
+package com.dfsek.terra.api.platform.block;
+
+public enum Axis {
+    X, Y, Z
+}

common/src/main/java/com/dfsek/terra/api/platform/block/Block.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.world.block;
+package com.dfsek.terra.api.platform.block;
 
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Handle;
-import com.dfsek.terra.api.platform.world.vector.Location;
 
 public interface Block extends Handle {
     void setBlockData(BlockData data, boolean physics);

common/src/main/java/com/dfsek/terra/api/platform/block/BlockData.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.world.block;
+package com.dfsek.terra.api.platform.block;
 
 import com.dfsek.terra.api.platform.Handle;
 

common/src/main/java/com/dfsek/terra/api/platform/block/BlockFace.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.world.block;
+package com.dfsek.terra.api.platform.block;
 
-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 import org.jetbrains.annotations.NotNull;
 
 public enum BlockFace {

common/src/main/java/com/dfsek/terra/api/platform/block/MaterialData.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.world.block;
+package com.dfsek.terra.api.platform.block;
 
 import com.dfsek.terra.api.platform.Handle;
 

common/src/main/java/com/dfsek/terra/api/platform/block/data/AnaloguePowerable.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 
 public interface AnaloguePowerable extends BlockData {
     int getMaximumPower();

common/src/main/java/com/dfsek/terra/api/platform/block/data/Bisected.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 
 public interface Bisected extends BlockData {
     Half getHalf();

common/src/main/java/com/dfsek/terra/api/platform/block/data/Directional.java

@@ -0,0 +1,10 @@
+package com.dfsek.terra.api.platform.block.data;
+
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockFace;
+
+public interface Directional extends BlockData {
+    BlockFace getFacing();
+
+    void setFacing(BlockFace facing);
+}

common/src/main/java/com/dfsek/terra/api/platform/block/data/MultipleFacing.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
+import com.dfsek.terra.api.platform.block.BlockFace;
 
 import java.util.Set;
 

common/src/main/java/com/dfsek/terra/api/platform/block/data/Orientable.java

@@ -0,0 +1,14 @@
+package com.dfsek.terra.api.platform.block.data;
+
+import com.dfsek.terra.api.platform.block.Axis;
+import com.dfsek.terra.api.platform.block.BlockData;
+
+import java.util.Set;
+
+public interface Orientable extends BlockData {
+    Set<Axis> getAxes();
+
+    Axis getAxis();
+
+    void setAxis(Axis axis);
+}

common/src/main/java/com/dfsek/terra/api/platform/block/data/Rail.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 
 public interface Rail extends BlockData {
     Shape getShape();

common/src/main/java/com/dfsek/terra/api/platform/block/data/RedstoneWire.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
+import com.dfsek.terra.api.platform.block.BlockFace;
 
 import java.util.Set;
 

common/src/main/java/com/dfsek/terra/api/platform/block/data/Rotatable.java

@@ -0,0 +1,10 @@
+package com.dfsek.terra.api.platform.block.data;
+
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockFace;
+
+public interface Rotatable extends BlockData {
+    BlockFace getRotation();
+
+    void setRotation(BlockFace face);
+}

common/src/main/java/com/dfsek/terra/api/platform/block/data/Slab.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
 public interface Slab extends Waterlogged {
     Type getType();

common/src/main/java/com/dfsek/terra/api/platform/block/data/Stairs.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
 public interface Stairs extends Waterlogged, Directional, Bisected {
     Shape getShape();

common/src/main/java/com/dfsek/terra/api/platform/block/data/Wall.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
+import com.dfsek.terra.api.platform.block.BlockFace;
 
 public interface Wall extends BlockData, Waterlogged {
     boolean isUp();

common/src/main/java/com/dfsek/terra/api/platform/block/data/Waterlogged.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.world.block.data;
+package com.dfsek.terra.api.platform.block.data;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 
 public interface Waterlogged extends BlockData {
     boolean isWaterlogged();

common/src/main/java/com/dfsek/terra/api/platform/block/state/BlockState.java

@@ -0,0 +1,4 @@
+package com.dfsek.terra.api.platform.block.state;
+
+public interface BlockState {
+}

common/src/main/java/com/dfsek/terra/api/platform/generator/ChunkGenerator.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.platform.generator;
 
 import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.world.BiomeGrid;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemHandle.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.platform.inventory;
 
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 
 public interface ItemHandle {
     ItemStack newItemStack(MaterialData material, int amount);

common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemStack.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.platform.inventory;
 
 import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
 
 public interface ItemStack extends Handle, Cloneable {
     int getAmount();

common/src/main/java/com/dfsek/terra/api/platform/world/Chunk.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.platform.world;
 
 import com.dfsek.terra.api.platform.Handle;
-import com.dfsek.terra.api.platform.world.block.Block;
+import com.dfsek.terra.api.platform.block.Block;
 
 public interface Chunk extends Handle {
     int getX();

common/src/main/java/com/dfsek/terra/api/platform/world/World.java

@@ -1,11 +1,11 @@
 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;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.vector.Location;
 
 import java.io.File;
 import java.util.UUID;

common/src/main/java/com/dfsek/terra/api/platform/world/WorldHandle.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.platform.world;
 
 import com.dfsek.terra.api.platform.Tree;
-import com.dfsek.terra.api.platform.world.block.Block;
+import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 
 /**
  * Interface to be implemented for world manipulation.

common/src/main/java/com/dfsek/terra/api/platform/world/block/Axis.java

@@ -1,5 +0,0 @@
-package com.dfsek.terra.api.platform.world.block;
-
-public enum Axis {
-    X, Y, Z
-}

common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Directional.java

@@ -1,10 +0,0 @@
-package com.dfsek.terra.api.platform.world.block.data;
-
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-
-public interface Directional extends BlockData {
-    BlockFace getFacing();
-
-    void setFacing(BlockFace facing);
-}

common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Orientable.java

@@ -1,14 +0,0 @@
-package com.dfsek.terra.api.platform.world.block.data;
-
-import com.dfsek.terra.api.platform.world.block.Axis;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-
-import java.util.Set;
-
-public interface Orientable extends BlockData {
-    Set<Axis> getAxes();
-
-    Axis getAxis();
-
-    void setAxis(Axis axis);
-}

common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Rotatable.java

@@ -1,10 +0,0 @@
-package com.dfsek.terra.api.platform.world.block.data;
-
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-
-public interface Rotatable extends BlockData {
-    BlockFace getRotation();
-
-    void setRotation(BlockFace face);
-}

common/src/main/java/com/dfsek/terra/api/platform/world/block/state/BlockState.java

@@ -1,4 +0,0 @@
-package com.dfsek.terra.api.platform.world.block.state;
-
-public interface BlockState {
-}

common/src/main/java/com/dfsek/terra/api/world/biome/BiomeGrid.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome;
 
 import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 
 public abstract class BiomeGrid {

common/src/main/java/com/dfsek/terra/api/world/biome/Generator.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.biome;
 
-import com.dfsek.terra.api.math.Interpolator;
+import com.dfsek.terra.api.math.interpolation.Interpolator;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.world.palette.Palette;
 
 public abstract class Generator {

common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java

@@ -1,8 +1,8 @@
 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.platform.world.vector.Vector3;
 import com.dfsek.terra.api.util.FastRandom;
 import net.jafama.FastMath;
 

common/src/main/java/com/dfsek/terra/api/world/carving/Worm.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.carving;
 
-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 import net.jafama.FastMath;
 
 import java.util.Random;

common/src/main/java/com/dfsek/terra/api/world/flora/Flora.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.flora;
 
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.vector.Location;
+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.vector.Location;
 
 import java.util.List;
 

common/src/main/java/com/dfsek/terra/api/world/tree/Tree.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.tree;
 
 
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.platform.block.MaterialData;
 
 import java.util.Random;
 import java.util.Set;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/EntitySpawnHolder.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.tree.fractal;
 
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
-import com.dfsek.terra.api.platform.world.vector.Location;
 
 import java.util.function.Consumer;
 

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/FractalTree.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.tree.fractal;
 
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.util.MaterialSet;
 
 import java.util.Random;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/TreeGeometry.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.tree.fractal;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.platform.block.BlockData;
 
 import java.util.Random;
 

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/Cactus.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.util.MaterialSet;
 

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
+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.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
+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.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredPillar.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.util.MaterialSet;
 

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
+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.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredPillar.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.util.MaterialSet;
 

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
+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.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SpruceTree.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
+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.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.async;
 
+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.world.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;

common/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.async;
 
+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.world.World;
-import com.dfsek.terra.api.platform.world.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;
 import org.jetbrains.annotations.NotNull;
 

common/src/main/java/com/dfsek/terra/biome/grid/SingleBiomeGrid.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.grid;
 
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.BiomeGrid;
 import com.dfsek.terra.api.world.generation.GenerationPhase;

common/src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.grid;
 
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.BiomeGrid;
 import com.dfsek.terra.api.world.biome.NormalizationUtil;

common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.biome.grid.master;
 
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.BiomeGrid;
 import com.dfsek.terra.api.world.generation.GenerationPhase;

common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.biome.grid.master;
 
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.biome.BiomeZone;

common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.palette;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.world.palette.Palette;
 
 public class PaletteHolder {

common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolderBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.palette;
 
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.world.palette.Palette;
 import net.jafama.FastMath;
 

common/src/main/java/com/dfsek/terra/biome/palette/PaletteLayer.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.biome.palette;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import org.jetbrains.annotations.NotNull;
 
 public class PaletteLayer {

common/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.biome.postprocessing;
 
 import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.math.vector.Vector2;
 
 /**
  * Offset a coordinate pair by an amount.

common/src/main/java/com/dfsek/terra/carving/CarverCache.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.carving;
 
 import com.dfsek.terra.api.math.MathUtil;
+import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.world.biome.Biome;

common/src/main/java/com/dfsek/terra/carving/CarverPalette.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.carving;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.util.MaterialSet;
 
 import java.util.Map;

common/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.carving;
 
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.carving.Carver;
 import com.dfsek.terra.api.world.carving.Worm;

common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.config.factories;
 
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.api.world.palette.Palette;

common/src/main/java/com/dfsek/terra/config/factories/OreFactory.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.config.factories;
 
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.config.templates.OreTemplate;
 import com.dfsek.terra.generation.items.ores.DeformedSphereOre;
 import com.dfsek.terra.generation.items.ores.Ore;

common/src/main/java/com/dfsek/terra/config/factories/PaletteFactory.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.config.factories;
 
 import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.RandomPalette;

common/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.util.MaterialSet;
 
 import java.lang.reflect.Type;

common/src/main/java/com/dfsek/terra/config/loaders/Types.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.config.loaders;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.tree.Tree;

common/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java

@@ -5,7 +5,7 @@ import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.carving.CarverPalette;
 import com.dfsek.terra.config.loaders.Types;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.palette;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.biome.palette.PaletteHolder;
 import com.dfsek.terra.biome.palette.PaletteHolderBuilder;

common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.biome.palette.PaletteLayer;
 import com.dfsek.terra.config.loaders.Types;
 

common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java

@@ -6,9 +6,9 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
 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.world.Biome;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.biome.palette.PaletteHolder;

common/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.carving.CarverPalette;
 import com.dfsek.terra.util.MaterialSet;
 

common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.generation.items.ores.Ore;
 import com.dfsek.terra.util.MaterialSet;
 

common/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation;
 
-import com.dfsek.terra.api.math.Interpolator;
+import com.dfsek.terra.api.math.interpolation.Interpolator;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;
 import com.dfsek.terra.generation.config.WorldGenerator;

common/src/main/java/com/dfsek/terra/generation/MasterChunkGenerator.java

@@ -1,19 +1,19 @@
 package com.dfsek.terra.generation;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.math.ChunkInterpolator3;
+import com.dfsek.terra.api.math.interpolation.ChunkInterpolator3;
+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.block.BlockFace;
+import com.dfsek.terra.api.platform.block.MaterialData;
+import com.dfsek.terra.api.platform.block.data.Bisected;
+import com.dfsek.terra.api.platform.block.data.Slab;
+import com.dfsek.terra.api.platform.block.data.Stairs;
+import com.dfsek.terra.api.platform.block.data.Waterlogged;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.BiomeGrid;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
-import com.dfsek.terra.api.platform.world.block.data.Bisected;
-import com.dfsek.terra.api.platform.world.block.data.Slab;
-import com.dfsek.terra.api.platform.world.block.data.Stairs;
-import com.dfsek.terra.api.platform.world.block.data.Waterlogged;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.generation.GenerationPhase;

common/src/main/java/com/dfsek/terra/generation/Sampler.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation;
 
-import com.dfsek.terra.api.math.ChunkInterpolator3;
+import com.dfsek.terra.api.math.interpolation.ChunkInterpolator3;
 import net.jafama.FastMath;
 
 public class Sampler {

common/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.generation.config;
 
-import com.dfsek.terra.api.math.Interpolator;
+import com.dfsek.terra.api.math.interpolation.Interpolator;
+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.world.biome.Generator;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.biome.palette.PaletteHolder;

common/src/main/java/com/dfsek/terra/generation/items/PlaceableLayer.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.generation.items;
 import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
 
 import java.util.Random;
 

common/src/main/java/com/dfsek/terra/generation/items/flora/BlockFlora.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.generation.items.flora;
 
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.vector.Location;
+import com.dfsek.terra.api.platform.block.Block;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.world.flora.Flora;
 

common/src/main/java/com/dfsek/terra/generation/items/flora/ConstantFlora.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.generation.items.flora;
 
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.vector.Location;
+import com.dfsek.terra.api.platform.block.Block;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/generation/items/flora/FloraLayer.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.generation.items.flora;
 import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
 import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.generation.items.PlaceableLayer;
 

common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java

@@ -1,16 +1,16 @@
 package com.dfsek.terra.generation.items.flora;
 
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.vector.Location;
 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.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.world.Chunk;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.data.Directional;
-import com.dfsek.terra.api.platform.world.block.data.MultipleFacing;
-import com.dfsek.terra.api.platform.world.block.data.Rotatable;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.world.flora.Flora;

common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java

@@ -2,12 +2,12 @@ package com.dfsek.terra.generation.items.ores;
 
 import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.math.Range;
+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.world.Chunk;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.util.MaterialSet;
 
 import java.util.Random;

common/src/main/java/com/dfsek/terra/generation/items/ores/Ore.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.generation.items.ores;
 
+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.Chunk;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.util.MaterialSet;
 
 import java.util.Random;

common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java

@@ -1,12 +1,12 @@
 package com.dfsek.terra.generation.items.ores;
 
 import com.dfsek.terra.api.math.Range;
+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.world.Chunk;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.util.MaterialSet;
 import net.jafama.FastMath;
 

common/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.generation.items.tree;
 
 import com.dfsek.terra.api.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.world.tree.Tree;
 import com.dfsek.terra.util.MaterialSet;
 

common/src/main/java/com/dfsek/terra/generation/items/tree/TreeLayer.java

@@ -3,10 +3,10 @@ package com.dfsek.terra.generation.items.tree;
 import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.vector.Vector2;
+import com.dfsek.terra.api.platform.block.Block;
+import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
 import com.dfsek.terra.api.world.tree.Tree;
 import com.dfsek.terra.generation.items.PlaceableLayer;
 

common/src/main/java/com/dfsek/terra/population/CavePopulator.java

@@ -1,14 +1,14 @@
 package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraWorld;
+import com.dfsek.terra.api.math.vector.Location;
 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.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.carving.UserDefinedCarver;

common/src/main/java/com/dfsek/terra/population/FloraPopulator.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraWorld;
+import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
 import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;

common/src/main/java/com/dfsek/terra/population/OrePopulator.java

@@ -2,10 +2,10 @@ package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.math.MathUtil;
+import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
 import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.biome.Biome;

common/src/main/java/com/dfsek/terra/population/TreePopulator.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraWorld;
+import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
 import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;

common/src/main/java/com/dfsek/terra/procgen/GridSpawn.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.procgen;
 
 import com.dfsek.terra.api.math.MathUtil;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.GlueList;
 

common/src/main/java/com/dfsek/terra/procgen/pixel/Polygon.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.procgen.pixel;
 
-import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.math.vector.Vector2;
 
 import java.util.Set;
 

common/src/main/java/com/dfsek/terra/procgen/pixel/Rectangle.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.procgen.pixel;
 
-import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.math.vector.Vector2;
 import net.jafama.FastMath;
 
 import java.util.HashSet;

common/src/main/java/com/dfsek/terra/procgen/voxel/Cylinder.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.procgen.voxel;
 
 
-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 
 public class Cylinder extends VoxelGeometry {
     public Cylinder(Vector3 start, int rad, int height) {