diff --git a/common/api/src/main/java/com/dfsek/terra/api/TerraPlugin.java b/common/api/src/main/java/com/dfsek/terra/api/TerraPlugin.java
index 8d7e55682..d127535e2 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/TerraPlugin.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/TerraPlugin.java
@@ -1,20 +1,14 @@
 package com.dfsek.terra.api;
 
-import com.dfsek.terra.api.addons.TerraAddon;
+import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.handle.ItemHandle;
 import com.dfsek.terra.api.handle.WorldHandle;
-import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.LockedRegistry;
-import com.dfsek.terra.api.util.JarUtil;
-import com.dfsek.terra.api.util.logging.DebugLogger;
-import com.dfsek.terra.api.util.logging.Logger;
-import com.dfsek.terra.config.PluginConfig;
-import com.dfsek.terra.config.lang.Language;
-import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.profiler.Profiler;
-import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.world.World;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,7 +33,7 @@ public interface TerraPlugin extends LoaderRegistrar {
 
     CheckedRegistry<ConfigPack> getConfigRegistry();
 
-    LockedRegistry<TerraAddon> getAddons();
+    Registry<TerraAddon> getAddons();
 
     boolean reload();
 
diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java b/common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java
index ccb463640..033c53232 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java
@@ -1,7 +1,6 @@
 package com.dfsek.terra.api.block;
 
 import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.vector.Vector3Impl;
 import org.jetbrains.annotations.NotNull;
 
 public enum BlockFace {
diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java
index 66f7b7d6c..048885f1f 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.event.events;
 
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.annotations.Global;
-import com.dfsek.terra.config.pack.ConfigPack;
 
 /**
  * An event with functionality directly linked to a {@link ConfigPack}.
diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackLoadEvent.java
index e995c8897..08238e3fa 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackLoadEvent.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackLoadEvent.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.api.event.events.config;
 
 import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.tectonic.exception.ConfigException;
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.PackEvent;
-import com.dfsek.terra.config.pack.ConfigPack;
 
 /**
  * An event related to the loading process of config packs.
diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPostLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPostLoadEvent.java
index 1398ec219..7ebced059 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPostLoadEvent.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPostLoadEvent.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.event.events.config;
 
 import com.dfsek.tectonic.config.ConfigTemplate;
-import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.api.config.ConfigPack;
 
 /**
  * Called when a config pack has finished loading.
diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPreLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPreLoadEvent.java
index 1ac2de54d..bd5ff66c1 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPreLoadEvent.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPreLoadEvent.java
@@ -1,8 +1,7 @@
 package com.dfsek.terra.api.event.events.config;
 
 import com.dfsek.tectonic.config.ConfigTemplate;
-import com.dfsek.tectonic.exception.ConfigException;
-import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.api.config.ConfigPack;
 
 /**
  * Called before a config pack's registries are filled. At this point, the pack manifest has been loaded, and all registries are empty.
diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/TerraWorldLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/TerraWorldLoadEvent.java
index 52e5bf956..3bc2bfeec 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/TerraWorldLoadEvent.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/TerraWorldLoadEvent.java
@@ -1,9 +1,8 @@
 package com.dfsek.terra.api.event.events.world;
 
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.PackEvent;
-import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.config.pack.WorldConfig;
-import com.dfsek.terra.world.TerraWorld;
+
 
 /**
  * Called upon initialization of a TerraWorld.
diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java
index f5748ee4c..22ac7cd66 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java
@@ -1,13 +1,12 @@
 package com.dfsek.terra.api.event.events.world.generation;
 
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.PackEvent;
-import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.entity.Entity;
-import com.dfsek.terra.api.structures.structure.buffer.items.BufferedEntity;
-import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.api.vector.Location;
 
 /**
- * Called when an entity is spawned via {@link BufferedEntity}.
+ * Called when an entity is spawned.
  */
 public class EntitySpawnEvent implements PackEvent {
     private final ConfigPack pack;
diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java
index 39657595b..392fa0528 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java
@@ -1,18 +1,15 @@
 package com.dfsek.terra.api.event.events.world.generation;
 
+import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.AbstractCancellable;
 import com.dfsek.terra.api.event.events.Cancellable;
 import com.dfsek.terra.api.event.events.PackEvent;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.state.Container;
-import com.dfsek.terra.api.structures.loot.LootTable;
-import com.dfsek.terra.api.structures.script.StructureScript;
-import com.dfsek.terra.api.structures.structure.buffer.items.BufferedLootApplication;
-import com.dfsek.terra.config.pack.ConfigPack;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Called when loot is populated via {@link BufferedLootApplication}.
+ * Called when loot is populated.
  */
 public class LootPopulateEvent extends AbstractCancellable implements PackEvent, Cancellable {
     private final Block block;
diff --git a/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java b/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java
index 7d04c5619..1509e752e 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java
@@ -1,7 +1,8 @@
 package com.dfsek.terra.api.noise;
 
-import com.dfsek.terra.api.math.vector.Vector2;
-import com.dfsek.terra.api.math.vector.Vector3;
+
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
 
 public interface NoiseSampler {
     /**
diff --git a/common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/NormalNormalizer.java b/common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/NormalNormalizer.java
index 377a43fd3..0cb62d681 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/NormalNormalizer.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/NormalNormalizer.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.noise.normalizer;
 
-import com.dfsek.terra.api.math.MathUtil;
 import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
 import net.jafama.FastMath;
 
 /**
diff --git a/common/api/src/main/java/com/dfsek/terra/api/noise/samplers/ExpressionSampler.java b/common/api/src/main/java/com/dfsek/terra/api/noise/samplers/ExpressionSampler.java
index 291384220..2f42d8bda 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/noise/samplers/ExpressionSampler.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/noise/samplers/ExpressionSampler.java
@@ -5,11 +5,6 @@ import com.dfsek.paralithic.eval.parser.Parser;
 import com.dfsek.paralithic.eval.parser.Scope;
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
 import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
-import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2;
-import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3;
-import com.dfsek.terra.api.util.seeded.NoiseSeeded;
-import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
 
 import java.util.Map;
 
diff --git a/common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/CellularSampler.java b/common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/CellularSampler.java
index 01e0f5424..8c27f612d 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/CellularSampler.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/CellularSampler.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.api.noise.samplers.noise;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.noise.samplers.noise.simplex.OpenSimplex2Sampler;
-import com.dfsek.terra.api.math.vector.Vector2;
-import com.dfsek.terra.api.math.vector.Vector3;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
 
 /**
  * NoiseSampler implementation for Cellular (Voronoi/Worley) Noise.
diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java b/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java
index f3a27d657..77bf897e6 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.transform.exception;
 
-import com.dfsek.terra.api.util.GlueList;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class AttemptsFailedException extends RuntimeException {
@@ -14,6 +14,6 @@ public class AttemptsFailedException extends RuntimeException {
     }
 
     public List<Throwable> getCauses() {
-        return new GlueList<>(causes);
+        return new ArrayList<>(causes);
     }
 }
diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java
index fea8bade5..178b18a37 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.util;
 
 import com.dfsek.terra.api.util.FastRandom;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
+import com.dfsek.terra.api.world.generator.Sampler;
 import net.jafama.FastMath;
 
 import java.util.List;
diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/ProbabilityCollection.java b/common/api/src/main/java/com/dfsek/terra/api/util/ProbabilityCollection.java
index 0753f428b..37087089f 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/util/ProbabilityCollection.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/util/ProbabilityCollection.java
@@ -8,7 +8,7 @@ import java.util.Set;
 import java.util.function.Function;
 
 public interface ProbabilityCollection<E> extends Collection<E> {
-    ProbabilityCollectionImpl<E> add(E item, int probability);
+    ProbabilityCollection<E> add(E item, int probability);
 
     E get(Random r);
 
@@ -16,7 +16,7 @@ public interface ProbabilityCollection<E> extends Collection<E> {
 
     E get(NoiseSampler n, double x, double z);
 
-    <T> ProbabilityCollectionImpl<T> map(Function<E, T> mapper, boolean carryNull);
+    <T> ProbabilityCollection<T> map(Function<E, T> mapper, boolean carryNull);
 
     int getTotalProbability();
 
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/BiomeGrid.java b/common/api/src/main/java/com/dfsek/terra/api/world/BiomeGrid.java
index 528cf7a4b..89cf26061 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/BiomeGrid.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/BiomeGrid.java
@@ -1,6 +1,7 @@
 package com.dfsek.terra.api.world;
 
 import com.dfsek.terra.api.Handle;
+import com.dfsek.terra.api.world.biome.Biome;
 import org.jetbrains.annotations.NotNull;
 
 public interface BiomeGrid extends Handle {
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java b/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java
index 44e0f7b87..536018fac 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java
@@ -1,9 +1,8 @@
 package com.dfsek.terra.api.world;
 
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.block.Block;
-import com.dfsek.terra.api.world.Chunk;
 
 import java.util.List;
 
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/Tree.java b/common/api/src/main/java/com/dfsek/terra/api/world/Tree.java
index 450ca83cf..22065ff88 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/Tree.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/Tree.java
@@ -2,7 +2,6 @@ package com.dfsek.terra.api.world;
 
 
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.util.collections.MaterialSet;
 
 import java.util.Random;
 
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/Generator.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/Generator.java
index b3e6f9628..ff446a90e 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/Generator.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/Generator.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.api.world.generator.Palette;
 
 public interface Generator {
     /**
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java
index a05210ab5..dd2cfa170 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java
@@ -2,6 +2,7 @@ package com.dfsek.terra.api.world.biome;
 
 
 import com.dfsek.terra.api.util.ProbabilityCollection;
+import com.dfsek.terra.api.world.World;
 
 import java.util.Set;
 
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/GeneratorWrapper.java b/common/api/src/main/java/com/dfsek/terra/api/world/generator/GeneratorWrapper.java
index ad41a7026..0b6cac8e4 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/generator/GeneratorWrapper.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/generator/GeneratorWrapper.java
@@ -1,7 +1,6 @@
 package com.dfsek.terra.api.world.generator;
 
 import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 
 public interface GeneratorWrapper extends Handle {
     @Override
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler.java b/common/api/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java
similarity index 85%
rename from common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler.java
rename to common/api/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java
index d7dffcbe4..082215c19 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.generation.math.samplers;
+package com.dfsek.terra.api.world.generator;
 
 @FunctionalInterface
 public interface Sampler {
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraChunkGenerator.java b/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraChunkGenerator.java
index 7c70aaca6..8a4b19c28 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraChunkGenerator.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraChunkGenerator.java
@@ -5,8 +5,6 @@ import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.BiomeGrid;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.config.pack.ConfigPackImpl;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/world/PaletteUtil.java b/common/implementation/src/main/java/com/dfsek/terra/api/util/world/PaletteUtil.java
index 59f22623f..8fafaed40 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/api/util/world/PaletteUtil.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/util/world/PaletteUtil.java
@@ -4,7 +4,7 @@ import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.api.world.palette.slant.SlantHolder;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
+import com.dfsek.terra.api.world.generator.Sampler;
 
 public final class PaletteUtil {
     public static Palette getPalette(int x, int y, int z, BiomeTemplate c, Sampler sampler) {
diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java
index 6dcbe2d09..729cff32b 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java
@@ -1,5 +1,6 @@
 package com.dfsek.terra.api.world.biome;
 
+import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.config.templates.BiomeTemplate;
@@ -12,14 +13,14 @@ import java.util.Set;
  */
 public class UserDefinedBiome implements TerraBiome {
     private final WorldGenerator gen;
-    private final ProbabilityCollectionImpl<Biome> vanilla;
+    private final ProbabilityCollection<Biome> vanilla;
     private final String id;
     private final BiomeTemplate config;
     private final int color;
     private final Set<String> tags;
 
 
-    public UserDefinedBiome(ProbabilityCollectionImpl<Biome> vanilla, WorldGenerator gen, BiomeTemplate config) {
+    public UserDefinedBiome(ProbabilityCollection<Biome> vanilla, WorldGenerator gen, BiomeTemplate config) {
         this.vanilla = vanilla;
         this.gen = gen;
         this.id = config.getID();
@@ -35,7 +36,7 @@ public class UserDefinedBiome implements TerraBiome {
      * @return Collection of biomes to represent the custom biome.
      */
     @Override
-    public ProbabilityCollectionImpl<Biome> getVanillaBiomes() {
+    public ProbabilityCollection<Biome> getVanillaBiomes() {
         return vanilla;
     }
 
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorld.java b/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorld.java
index 5faeb2007..bb882cf4a 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorld.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorld.java
@@ -11,7 +11,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.config.pack.WorldConfig;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
+import com.dfsek.terra.api.world.generator.Sampler;
 import net.jafama.FastMath;
 
 public class TerraWorld {
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java
index 58b9e1213..c94950fd5 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java
@@ -20,7 +20,7 @@ import com.dfsek.terra.world.Carver;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.carving.NoiseCarver;
 import com.dfsek.terra.world.generation.math.SamplerCache;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
+import com.dfsek.terra.api.world.generator.Sampler;
 import com.dfsek.terra.world.generation.math.samplers.Sampler2D;
 import com.dfsek.terra.world.population.CavePopulator;
 import com.dfsek.terra.world.population.OrePopulator;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
index 1421a1a9f..90fd79338 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
@@ -28,7 +28,7 @@ import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.Carver;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.carving.NoiseCarver;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
+import com.dfsek.terra.api.world.generator.Sampler;
 import com.dfsek.terra.world.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.world.population.CavePopulator;
 import com.dfsek.terra.world.population.FloraPopulator;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/SamplerCache.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/SamplerCache.java
index f80c9684a..37776fa7c 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/SamplerCache.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/SamplerCache.java
@@ -3,7 +3,7 @@ package com.dfsek.terra.world.generation.math;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.world.TerraWorld;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
+import com.dfsek.terra.api.world.generator.Sampler;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler2D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler2D.java
index 4ce0f2eae..8e0105127 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler2D.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler2D.java
@@ -2,6 +2,7 @@ package com.dfsek.terra.world.generation.math.samplers;
 
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.generator.Sampler;
 import com.dfsek.terra.world.generation.math.interpolation.ChunkInterpolator2D;
 import com.dfsek.terra.world.generation.math.interpolation.ElevationInterpolator;
 import net.jafama.FastMath;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler3D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler3D.java
index f85600c27..ea1113195 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler3D.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler3D.java
@@ -2,6 +2,7 @@ package com.dfsek.terra.world.generation.math.samplers;
 
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.generator.Sampler;
 import com.dfsek.terra.world.generation.math.interpolation.ChunkInterpolator3D;
 import com.dfsek.terra.world.generation.math.interpolation.ElevationInterpolator;
 import net.jafama.FastMath;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java
index 09a0f67a2..02e5253b3 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java
@@ -94,8 +94,6 @@ public class TerraFlora implements Flora {
 
     @Override
     public boolean plant(Location location) {
-        WorldHandle handle = main.getWorldHandle();
-
         boolean doRotation = testRotation.size() > 0;
         int size = floraPalette.getSize();
         int c = ceiling ? -1 : 1;