diff --git a/src/main/java/com/dfsek/terra/TerraWorld.java b/src/main/java/com/dfsek/terra/TerraWorld.java
index 3fd5c6483..dbc0bd9f4 100644
--- a/src/main/java/com/dfsek/terra/TerraWorld.java
+++ b/src/main/java/com/dfsek/terra/TerraWorld.java
@@ -1,9 +1,9 @@
 package com.dfsek.terra;
 
 import com.dfsek.terra.biome.BiomeZone;
-import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.biome.UserDefinedBiome;
-import com.dfsek.terra.biome.UserDefinedGrid;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
+import com.dfsek.terra.biome.grid.UserDefinedGrid;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.base.WorldConfig;
 import com.dfsek.terra.config.genconfig.BiomeGridConfig;
diff --git a/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java b/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java
index 7f314f63e..ed8d2e59c 100644
--- a/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java
+++ b/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.async;
 
-import com.dfsek.terra.biome.TerraBiomeGrid;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import org.bukkit.Location;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java b/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java
index 3c6314b74..f6f755ecd 100644
--- a/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java
+++ b/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.async;
 
 import com.dfsek.terra.Terra;
-import com.dfsek.terra.biome.TerraBiomeGrid;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java b/src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java
index 5a0191bc8..c0f3c7bad 100644
--- a/src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java
+++ b/src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.async;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import com.dfsek.terra.config.genconfig.structure.StructureConfig;
 import com.dfsek.terra.structure.Rotation;
 import com.dfsek.terra.structure.Structure;
diff --git a/src/main/java/com/dfsek/terra/biome/BiomeZone.java b/src/main/java/com/dfsek/terra/biome/BiomeZone.java
index 77c6c7220..fd216bf54 100644
--- a/src/main/java/com/dfsek/terra/biome/BiomeZone.java
+++ b/src/main/java/com/dfsek/terra/biome/BiomeZone.java
@@ -40,7 +40,7 @@ public class BiomeZone {
      * @param z Z coordinate
      * @return BiomeGrid at coordinates.
      */
-    protected BiomeGrid getGrid(int x, int z) {
+    public BiomeGrid getGrid(int x, int z) {
         return grids[NormalizationUtil.normalize(useImage ? Objects.requireNonNull(imageLoader).getNoiseVal(x, z, channel) : noise.getNoise(x, z), grids.length, 4)];
     }
 
diff --git a/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java b/src/main/java/com/dfsek/terra/biome/grid/TerraBiomeGrid.java
similarity index 90%
rename from src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java
rename to src/main/java/com/dfsek/terra/biome/grid/TerraBiomeGrid.java
index dbc47eb3f..045d69f03 100644
--- a/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java
+++ b/src/main/java/com/dfsek/terra/biome/grid/TerraBiomeGrid.java
@@ -1,5 +1,9 @@
-package com.dfsek.terra.biome;
+package com.dfsek.terra.biome.grid;
 
+import com.dfsek.terra.biome.BiomeZone;
+import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.biome.postprocessing.CoordinatePerturb;
+import com.dfsek.terra.biome.postprocessing.ErosionNoise;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.base.ConfigUtil;
 import com.dfsek.terra.config.lang.LangUtil;
diff --git a/src/main/java/com/dfsek/terra/biome/UserDefinedGrid.java b/src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java
similarity index 94%
rename from src/main/java/com/dfsek/terra/biome/UserDefinedGrid.java
rename to src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java
index 61498a08a..4a7d547cf 100644
--- a/src/main/java/com/dfsek/terra/biome/UserDefinedGrid.java
+++ b/src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java
@@ -1,5 +1,6 @@
-package com.dfsek.terra.biome;
+package com.dfsek.terra.biome.grid;
 
+import com.dfsek.terra.biome.UserDefinedBiome;
 import com.dfsek.terra.config.base.WorldConfig;
 import com.dfsek.terra.image.ImageLoader;
 import org.bukkit.Location;
diff --git a/src/main/java/com/dfsek/terra/biome/CoordinatePerturb.java b/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java
similarity index 96%
rename from src/main/java/com/dfsek/terra/biome/CoordinatePerturb.java
rename to src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java
index 2fa838235..00b57b122 100644
--- a/src/main/java/com/dfsek/terra/biome/CoordinatePerturb.java
+++ b/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.biome;
+package com.dfsek.terra.biome.postprocessing;
 
 import com.dfsek.terra.procgen.math.Vector2;
 import org.polydev.gaea.math.FastNoiseLite;
diff --git a/src/main/java/com/dfsek/terra/biome/ErosionNoise.java b/src/main/java/com/dfsek/terra/biome/postprocessing/ErosionNoise.java
similarity index 90%
rename from src/main/java/com/dfsek/terra/biome/ErosionNoise.java
rename to src/main/java/com/dfsek/terra/biome/postprocessing/ErosionNoise.java
index a09200cb2..35e55ba96 100644
--- a/src/main/java/com/dfsek/terra/biome/ErosionNoise.java
+++ b/src/main/java/com/dfsek/terra/biome/postprocessing/ErosionNoise.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.biome;
+package com.dfsek.terra.biome.postprocessing;
 
 import org.polydev.gaea.math.FastNoiseLite;
 
@@ -26,7 +26,7 @@ public class ErosionNoise {
      * @param z Z coordinate
      * @return Whether location is eroded
      */
-    boolean isEroded(int x, int z) {
+    public boolean isEroded(int x, int z) {
         double abs = Math.pow(noise.getNoise(x, z), 2);
         return abs < thresh;
     }
diff --git a/src/main/java/com/dfsek/terra/command/biome/BiomeCommand.java b/src/main/java/com/dfsek/terra/command/biome/BiomeCommand.java
index 0f1716f5f..fbbd47429 100644
--- a/src/main/java/com/dfsek/terra/command/biome/BiomeCommand.java
+++ b/src/main/java/com/dfsek/terra/command/biome/BiomeCommand.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.command.biome;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import com.dfsek.terra.config.lang.LangUtil;
 import org.bukkit.World;
 import org.bukkit.command.Command;
diff --git a/src/main/java/com/dfsek/terra/config/genconfig/BiomeGridConfig.java b/src/main/java/com/dfsek/terra/config/genconfig/BiomeGridConfig.java
index 1a8c8f749..5edbd517c 100644
--- a/src/main/java/com/dfsek/terra/config/genconfig/BiomeGridConfig.java
+++ b/src/main/java/com/dfsek/terra/config/genconfig/BiomeGridConfig.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.config.genconfig;
 
 import com.dfsek.terra.biome.UserDefinedBiome;
-import com.dfsek.terra.biome.UserDefinedGrid;
+import com.dfsek.terra.biome.grid.UserDefinedGrid;
 import com.dfsek.terra.config.TerraConfig;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.base.WorldConfig;
diff --git a/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java b/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java
index 92634b2bc..e6d2c896d 100644
--- a/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java
+++ b/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation;
 
-import com.dfsek.terra.biome.TerraBiomeGrid;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import org.bukkit.World;
 import org.polydev.gaea.generation.GenerationPhase;
 import org.polydev.gaea.math.FastNoiseLite;
diff --git a/src/main/java/com/dfsek/terra/image/ImageLoader.java b/src/main/java/com/dfsek/terra/image/ImageLoader.java
index be3b521b3..e0865a5bb 100644
--- a/src/main/java/com/dfsek/terra/image/ImageLoader.java
+++ b/src/main/java/com/dfsek/terra/image/ImageLoader.java
@@ -2,7 +2,7 @@ package com.dfsek.terra.image;
 
 import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.biome.BiomeZone;
-import com.dfsek.terra.biome.TerraBiomeGrid;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import com.dfsek.terra.config.base.ConfigUtil;
 import com.dfsek.terra.debug.gui.DebugGUI;
 import org.bukkit.World;
diff --git a/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java b/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java
index eb18376fb..3ced708c3 100644
--- a/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java
+++ b/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.image;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.biome.TerraBiomeGrid;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import org.bukkit.World;
 import org.polydev.gaea.biome.NormalizationUtil;
 
diff --git a/src/main/java/com/dfsek/terra/population/FloraPopulator.java b/src/main/java/com/dfsek/terra/population/FloraPopulator.java
index 99d5e2723..23b7827bf 100644
--- a/src/main/java/com/dfsek/terra/population/FloraPopulator.java
+++ b/src/main/java/com/dfsek/terra/population/FloraPopulator.java
@@ -3,8 +3,8 @@ package com.dfsek.terra.population;
 import com.dfsek.terra.Terra;
 import com.dfsek.terra.TerraProfiler;
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.genconfig.biome.BiomeConfig;
 import com.dfsek.terra.config.genconfig.biome.BiomeFloraConfig;
diff --git a/src/main/java/com/dfsek/terra/population/SnowPopulator.java b/src/main/java/com/dfsek/terra/population/SnowPopulator.java
index 515860d04..4abba7978 100644
--- a/src/main/java/com/dfsek/terra/population/SnowPopulator.java
+++ b/src/main/java/com/dfsek/terra/population/SnowPopulator.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraProfiler;
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import com.dfsek.terra.config.base.ConfigUtil;
 import com.dfsek.terra.config.genconfig.biome.BiomeConfig;
 import com.dfsek.terra.util.DataUtil;
diff --git a/src/main/java/com/dfsek/terra/population/StructurePopulator.java b/src/main/java/com/dfsek/terra/population/StructurePopulator.java
index 2539a9635..c37ac42d4 100644
--- a/src/main/java/com/dfsek/terra/population/StructurePopulator.java
+++ b/src/main/java/com/dfsek/terra/population/StructurePopulator.java
@@ -3,8 +3,8 @@ package com.dfsek.terra.population;
 import com.dfsek.terra.Debug;
 import com.dfsek.terra.TerraProfiler;
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.biome.grid.TerraBiomeGrid;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.genconfig.structure.StructureConfig;
 import com.dfsek.terra.procgen.math.Vector2;