diff --git a/TerraForgedCore/src/main/java/com/terraforged/core/region/Region.java b/TerraForgedCore/src/main/java/com/terraforged/core/region/Region.java
index fdfce6a..592411c 100644
--- a/TerraForgedCore/src/main/java/com/terraforged/core/region/Region.java
+++ b/TerraForgedCore/src/main/java/com/terraforged/core/region/Region.java
@@ -27,7 +27,7 @@ package com.terraforged.core.region;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.cell.Extent;
-import com.terraforged.core.decorator.Decorator;
+import com.terraforged.core.world.decorator.Decorator;
 import com.terraforged.core.filter.Filterable;
 import com.terraforged.core.region.chunk.ChunkGenTask;
 import com.terraforged.core.region.chunk.ChunkReader;
diff --git a/TerraForgedCore/src/main/java/com/terraforged/core/world/WorldDecorators.java b/TerraForgedCore/src/main/java/com/terraforged/core/world/WorldDecorators.java
index b8c0961..382300c 100644
--- a/TerraForgedCore/src/main/java/com/terraforged/core/world/WorldDecorators.java
+++ b/TerraForgedCore/src/main/java/com/terraforged/core/world/WorldDecorators.java
@@ -25,9 +25,9 @@
 
 package com.terraforged.core.world;
 
-import com.terraforged.core.decorator.Decorator;
-import com.terraforged.core.decorator.DesertStacks;
-import com.terraforged.core.decorator.Wetlands;
+import com.terraforged.core.world.decorator.Decorator;
+import com.terraforged.core.world.decorator.DesertStacks;
+import com.terraforged.core.world.decorator.Wetlands;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/TerraForgedCore/src/main/java/com/terraforged/core/decorator/Decorator.java b/TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/Decorator.java
similarity index 96%
rename from TerraForgedCore/src/main/java/com/terraforged/core/decorator/Decorator.java
rename to TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/Decorator.java
index cd726c0..df92f3b 100644
--- a/TerraForgedCore/src/main/java/com/terraforged/core/decorator/Decorator.java
+++ b/TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/Decorator.java
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.core.decorator;
+package com.terraforged.core.world.decorator;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.world.terrain.Terrain;
diff --git a/TerraForgedCore/src/main/java/com/terraforged/core/decorator/DesertDunes.java b/TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/DesertDunes.java
similarity index 98%
rename from TerraForgedCore/src/main/java/com/terraforged/core/decorator/DesertDunes.java
rename to TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/DesertDunes.java
index 3867016..21ad1c8 100644
--- a/TerraForgedCore/src/main/java/com/terraforged/core/decorator/DesertDunes.java
+++ b/TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/DesertDunes.java
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.core.decorator;
+package com.terraforged.core.world.decorator;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.world.GeneratorContext;
diff --git a/TerraForgedCore/src/main/java/com/terraforged/core/decorator/DesertStacks.java b/TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/DesertStacks.java
similarity index 98%
rename from TerraForgedCore/src/main/java/com/terraforged/core/decorator/DesertStacks.java
rename to TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/DesertStacks.java
index 03096fa..8896675 100644
--- a/TerraForgedCore/src/main/java/com/terraforged/core/decorator/DesertStacks.java
+++ b/TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/DesertStacks.java
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.core.decorator;
+package com.terraforged.core.world.decorator;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.util.Seed;
diff --git a/TerraForgedCore/src/main/java/com/terraforged/core/decorator/Wetlands.java b/TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/Wetlands.java
similarity index 98%
rename from TerraForgedCore/src/main/java/com/terraforged/core/decorator/Wetlands.java
rename to TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/Wetlands.java
index 07e8953..661d3cc 100644
--- a/TerraForgedCore/src/main/java/com/terraforged/core/decorator/Wetlands.java
+++ b/TerraForgedCore/src/main/java/com/terraforged/core/world/decorator/Wetlands.java
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.core.decorator;
+package com.terraforged.core.world.decorator;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.util.Seed;
diff --git a/TerraForgedMod/src/main/java/com/terraforged/mod/biome/provider/BiomeProvider.java b/TerraForgedMod/src/main/java/com/terraforged/mod/biome/provider/BiomeProvider.java
index 7d46d80..a1a0df1 100644
--- a/TerraForgedMod/src/main/java/com/terraforged/mod/biome/provider/BiomeProvider.java
+++ b/TerraForgedMod/src/main/java/com/terraforged/mod/biome/provider/BiomeProvider.java
@@ -27,7 +27,7 @@ package com.terraforged.mod.biome.provider;
 
 import com.google.common.collect.Sets;
 import com.terraforged.core.cell.Cell;
-import com.terraforged.core.decorator.Decorator;
+import com.terraforged.core.world.decorator.Decorator;
 import com.terraforged.core.region.chunk.ChunkReader;
 import com.terraforged.core.util.concurrent.ObjectPool;
 import com.terraforged.core.world.terrain.Terrain;
diff --git a/TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java b/TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java
index b53912e..c1e1a17 100644
--- a/TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java
+++ b/TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java
@@ -32,7 +32,7 @@ import com.terraforged.api.chunk.surface.SurfaceContext;
 import com.terraforged.api.chunk.surface.SurfaceManager;
 import com.terraforged.api.material.layer.LayerManager;
 import com.terraforged.core.cell.Cell;
-import com.terraforged.core.decorator.Decorator;
+import com.terraforged.core.world.decorator.Decorator;
 import com.terraforged.core.region.RegionCache;
 import com.terraforged.core.region.RegionGenerator;
 import com.terraforged.core.region.Size;
diff --git a/TerraForgedMod/src/main/java/com/terraforged/mod/command/task/FindBiomeTask.java b/TerraForgedMod/src/main/java/com/terraforged/mod/command/task/FindBiomeTask.java
index a430f7a..8124af6 100644
--- a/TerraForgedMod/src/main/java/com/terraforged/mod/command/task/FindBiomeTask.java
+++ b/TerraForgedMod/src/main/java/com/terraforged/mod/command/task/FindBiomeTask.java
@@ -26,7 +26,7 @@
 package com.terraforged.mod.command.task;
 
 import com.terraforged.core.cell.Cell;
-import com.terraforged.core.decorator.Decorator;
+import com.terraforged.core.world.decorator.Decorator;
 import com.terraforged.core.world.WorldGenerator;
 import com.terraforged.core.world.terrain.Terrain;
 import com.terraforged.mod.biome.provider.BiomeProvider;