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 ffde9a9a6..5f506517a 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
@@ -25,7 +25,7 @@ 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.addons.ore.ores.OreHolder;
-import com.dfsek.terra.world.population.items.tree.TreeLayer;
+import com.dfsek.terra.addons.tree.tree.TreeLayer;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/factories/TreeFactory.java b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreeFactory.java
similarity index 70%
rename from common/implementation/src/main/java/com/dfsek/terra/config/factories/TreeFactory.java
rename to common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreeFactory.java
index d14bc62a8..eff88f97c 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/factories/TreeFactory.java
+++ b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreeFactory.java
@@ -1,10 +1,9 @@
-package com.dfsek.terra.config.factories;
+package com.dfsek.terra.addons.tree;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.ConfigFactory;
 import com.dfsek.terra.api.world.Tree;
-import com.dfsek.terra.config.templates.TreeTemplate;
-import com.dfsek.terra.world.population.items.tree.TerraTree;
+import com.dfsek.terra.addons.tree.tree.TerraTree;
 
 public class TreeFactory implements ConfigFactory<TreeTemplate, Tree> {
     @Override
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreePopulator.java
similarity index 94%
rename from common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java
rename to common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreePopulator.java
index 6edb0f308..1e0893e03 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java
+++ b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreePopulator.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.population;
+package com.dfsek.terra.addons.tree;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.profiler.ProfileFrame;
@@ -10,7 +10,7 @@ import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
-import com.dfsek.terra.world.population.items.tree.TreeLayer;
+import com.dfsek.terra.addons.tree.tree.TreeLayer;
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreeTemplate.java
similarity index 96%
rename from common/implementation/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java
rename to common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreeTemplate.java
index fb3c1f4a9..b15f2b2ea 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java
+++ b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/TreeTemplate.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.config.templates;
+package com.dfsek.terra.addons.tree;
 
 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/tree/TerraTree.java b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/tree/TerraTree.java
similarity index 95%
rename from common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java
rename to common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/tree/TerraTree.java
index 50c367c85..bb7497dc4 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java
+++ b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/tree/TerraTree.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.population.items.tree;
+package com.dfsek.terra.addons.tree.tree;
 
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.rotation.Rotation;
diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/tree/TreeLayer.java
similarity index 96%
rename from common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java
rename to common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/tree/TreeLayer.java
index 5b0d88625..5029a365f 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java
+++ b/common/addons/tree/src/main/java/com/dfsek/terra/addons/tree/tree/TreeLayer.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.world.population.items.tree;
+package com.dfsek.terra.addons.tree.tree;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.PopulationUtil;
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 09a0fc624..dc27ca205 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
@@ -48,7 +48,7 @@ import com.dfsek.terra.addons.flora.flora.FloraLayer;
 import com.dfsek.terra.addons.flora.flora.TerraFlora;
 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 com.dfsek.terra.addons.tree.tree.TreeLayer;
 
 import java.util.LinkedHashMap;
 
diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java
index 293b879f2..8d93e33af 100644
--- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java
@@ -9,7 +9,7 @@ import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.config.loaders.Types;
 import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler;
-import com.dfsek.terra.world.population.items.tree.TreeLayer;
+import com.dfsek.terra.addons.tree.tree.TreeLayer;
 
 import java.lang.reflect.Type;
 import java.util.Map;