diff --git a/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java b/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java
index 5c41b42b3..ffde9a9a6 100644
--- a/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java
+++ b/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java
@@ -24,7 +24,7 @@ import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.world.population.items.TerraStructure;
 import com.dfsek.terra.addons.flora.flora.FloraLayer;
-import com.dfsek.terra.world.population.items.ores.OreHolder;
+import com.dfsek.terra.addons.ore.ores.OreHolder;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;
 
 import java.util.ArrayList;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/factories/OreFactory.java b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java
similarity index 68%
rename from common/implementation/src/main/java/com/dfsek/terra/config/factories/OreFactory.java
rename to common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java
index 38ab2f742..2a90b9a8b 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/factories/OreFactory.java
+++ b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java
@@ -1,11 +1,10 @@
-package com.dfsek.terra.config.factories;
+package com.dfsek.terra.addons.ore;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigFactory;
-import com.dfsek.terra.config.templates.OreTemplate;
-import com.dfsek.terra.world.population.items.ores.Ore;
-import com.dfsek.terra.world.population.items.ores.VanillaOre;
+import com.dfsek.terra.addons.ore.ores.Ore;
+import com.dfsek.terra.addons.ore.ores.VanillaOre;
 
 public class OreFactory implements ConfigFactory<OreTemplate, Ore> {
     @Override
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java
similarity index 98%
rename from common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java
rename to common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java
index 1aee7e43e..2ed3b6195 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java
+++ b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.population;
+package com.dfsek.terra.addons.ore;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.profiler.ProfileFrame;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java
similarity index 97%
rename from common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
rename to common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java
index a6c38265f..30ac4b1a3 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
+++ b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.config.templates;
+package com.dfsek.terra.addons.ore;
 
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java
similarity index 95%
rename from common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java
rename to common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java
index a4bf774ce..8e0ccb892 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java
+++ b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.population.items.ores;
+package com.dfsek.terra.addons.ore.ores;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreConfig.java b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreConfig.java
similarity index 87%
rename from common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreConfig.java
rename to common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreConfig.java
index 8b9286dd6..4238c3d5d 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreConfig.java
+++ b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreConfig.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.population.items.ores;
+package com.dfsek.terra.addons.ore.ores;
 
 import com.dfsek.terra.api.util.Range;
 
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreHolder.java b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreHolder.java
similarity index 95%
rename from common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreHolder.java
rename to common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreHolder.java
index 43e461895..625299af1 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreHolder.java
+++ b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreHolder.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.population.items.ores;
+package com.dfsek.terra.addons.ore.ores;
 
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java
similarity index 98%
rename from common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java
rename to common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java
index 9ef13c3f0..1dbfa2df4 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java
+++ b/common/addons/ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.population.items.ores;
+package com.dfsek.terra.addons.ore.ores;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java
index 1fa41a90a..09a0fc624 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java
@@ -46,8 +46,8 @@ import com.dfsek.terra.addons.palette.palette.PaletteLayerLoader;
 import com.dfsek.terra.addons.palette.palette.slant.SlantHolderLoader;
 import com.dfsek.terra.addons.flora.flora.FloraLayer;
 import com.dfsek.terra.addons.flora.flora.TerraFlora;
-import com.dfsek.terra.world.population.items.ores.OreConfig;
-import com.dfsek.terra.world.population.items.ores.OreHolder;
+import com.dfsek.terra.addons.ore.ores.OreConfig;
+import com.dfsek.terra.addons.ore.ores.OreHolder;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;
 
 import java.util.LinkedHashMap;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java
index 52167ced2..62df379f1 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java
@@ -4,7 +4,7 @@ import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.util.Range;
-import com.dfsek.terra.world.population.items.ores.OreConfig;
+import com.dfsek.terra.addons.ore.ores.OreConfig;
 
 import java.lang.reflect.Type;
 import java.util.Map;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreHolderLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreHolderLoader.java
index 08f682171..d7640bd5f 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreHolderLoader.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreHolderLoader.java
@@ -3,9 +3,9 @@ package com.dfsek.terra.config.loaders.config;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.world.population.items.ores.Ore;
-import com.dfsek.terra.world.population.items.ores.OreConfig;
-import com.dfsek.terra.world.population.items.ores.OreHolder;
+import com.dfsek.terra.addons.ore.ores.Ore;
+import com.dfsek.terra.addons.ore.ores.OreConfig;
+import com.dfsek.terra.addons.ore.ores.OreHolder;
 
 import java.lang.reflect.Type;
 import java.util.Map;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java
index a75f03eae..488ba91d0 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java
@@ -30,7 +30,7 @@ import com.dfsek.terra.config.templates.StructureTemplate;
 import com.dfsek.terra.config.templates.TreeTemplate;
 import com.dfsek.terra.registry.OpenRegistryImpl;
 import com.dfsek.terra.world.population.items.TerraStructure;
-import com.dfsek.terra.world.population.items.ores.Ore;
+import com.dfsek.terra.addons.ore.ores.Ore;
 
 import java.util.LinkedHashMap;
 import java.util.function.BiConsumer;