diff --git a/src/main/java/com/minelittlepony/unicopia/Unicopia.java b/src/main/java/com/minelittlepony/unicopia/Unicopia.java
index a23d2ae0..2e8052fb 100644
--- a/src/main/java/com/minelittlepony/unicopia/Unicopia.java
+++ b/src/main/java/com/minelittlepony/unicopia/Unicopia.java
@@ -17,7 +17,6 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
 import com.minelittlepony.unicopia.ability.magic.spell.trait.TraitLoader;
 import com.minelittlepony.unicopia.advancement.UCriteria;
 import com.minelittlepony.unicopia.block.UBlocks;
-import com.minelittlepony.unicopia.block.UTreeGen;
 import com.minelittlepony.unicopia.block.state.StateMapLoader;
 import com.minelittlepony.unicopia.command.Commands;
 import com.minelittlepony.unicopia.container.SpellbookChapterLoader;
@@ -32,6 +31,7 @@ import com.minelittlepony.unicopia.particle.UParticles;
 import com.minelittlepony.unicopia.server.world.BlockDestructionManager;
 import com.minelittlepony.unicopia.server.world.NocturnalSleepManager;
 import com.minelittlepony.unicopia.server.world.UGameRules;
+import com.minelittlepony.unicopia.server.world.UTreeGen;
 import com.minelittlepony.unicopia.server.world.WeatherConditions;
 import com.minelittlepony.unicopia.server.world.ZapAppleStageStore;
 import com.minelittlepony.unicopia.trinkets.TrinketsDelegate;
diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
index 58ebcd5d..3587868d 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
@@ -6,6 +6,7 @@ import java.util.List;
 import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.item.UItems;
 import com.minelittlepony.unicopia.item.group.ItemGroupRegistry;
+import com.minelittlepony.unicopia.server.world.UTreeGen;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricMaterialBuilder;
diff --git a/src/main/java/com/minelittlepony/unicopia/server/world/NocturnalSleepManager.java b/src/main/java/com/minelittlepony/unicopia/server/world/NocturnalSleepManager.java
index f8d4be13..f39e0dc2 100644
--- a/src/main/java/com/minelittlepony/unicopia/server/world/NocturnalSleepManager.java
+++ b/src/main/java/com/minelittlepony/unicopia/server/world/NocturnalSleepManager.java
@@ -1,14 +1,12 @@
 package com.minelittlepony.unicopia.server.world;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.entity.player.Pony;
 
 import net.fabricmc.fabric.api.entity.event.v1.EntitySleepEvents;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.server.world.SleepManager;
diff --git a/src/main/java/com/minelittlepony/unicopia/block/Tree.java b/src/main/java/com/minelittlepony/unicopia/server/world/Tree.java
similarity index 98%
rename from src/main/java/com/minelittlepony/unicopia/block/Tree.java
rename to src/main/java/com/minelittlepony/unicopia/server/world/Tree.java
index 8ee606c2..f1d81d4c 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/Tree.java
+++ b/src/main/java/com/minelittlepony/unicopia/server/world/Tree.java
@@ -1,9 +1,11 @@
-package com.minelittlepony.unicopia.block;
+package com.minelittlepony.unicopia.server.world;
 
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import com.minelittlepony.unicopia.block.UBlocks;
+
 import net.fabricmc.fabric.api.biome.v1.*;
 import net.fabricmc.fabric.api.event.registry.DynamicRegistrySetupCallback;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
diff --git a/src/main/java/com/minelittlepony/unicopia/block/UTreeGen.java b/src/main/java/com/minelittlepony/unicopia/server/world/UTreeGen.java
similarity index 95%
rename from src/main/java/com/minelittlepony/unicopia/block/UTreeGen.java
rename to src/main/java/com/minelittlepony/unicopia/server/world/UTreeGen.java
index 8ea0fd3c..a9723e95 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/UTreeGen.java
+++ b/src/main/java/com/minelittlepony/unicopia/server/world/UTreeGen.java
@@ -1,6 +1,7 @@
-package com.minelittlepony.unicopia.block;
+package com.minelittlepony.unicopia.server.world;
 
 import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.block.UBlocks;
 
 import net.minecraft.block.*;
 import net.minecraft.util.math.intprovider.ConstantIntProvider;