diff --git a/src/main/java/com/minelittlepony/unicopia/Unicopia.java b/src/main/java/com/minelittlepony/unicopia/Unicopia.java
index 2101f7b3..2c4665f0 100644
--- a/src/main/java/com/minelittlepony/unicopia/Unicopia.java
+++ b/src/main/java/com/minelittlepony/unicopia/Unicopia.java
@@ -13,6 +13,7 @@ import org.apache.logging.log4j.Logger;
 import com.minelittlepony.unicopia.ability.data.tree.TreeTypeLoader;
 import com.minelittlepony.unicopia.advancement.UCriteria;
 import com.minelittlepony.unicopia.command.Commands;
+import com.minelittlepony.unicopia.entity.UEntities;
 import com.minelittlepony.unicopia.entity.effect.UPotions;
 import com.minelittlepony.unicopia.entity.player.Pony;
 import com.minelittlepony.unicopia.item.UItems;
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AbstractPlacedSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AbstractPlacedSpell.java
index c304c4fd..3d08024f 100644
--- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AbstractPlacedSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/AbstractPlacedSpell.java
@@ -2,11 +2,11 @@ package com.minelittlepony.unicopia.ability.magic.spell;
 
 import org.jetbrains.annotations.Nullable;
 
-import com.minelittlepony.unicopia.UEntities;
 import com.minelittlepony.unicopia.ability.magic.Attached;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.entity.CastSpellEntity;
 import com.minelittlepony.unicopia.entity.EntityReference;
+import com.minelittlepony.unicopia.entity.UEntities;
 import com.minelittlepony.unicopia.particle.OrientedBillboardParticleEffect;
 import com.minelittlepony.unicopia.particle.ParticleHandle;
 import com.minelittlepony.unicopia.particle.UParticles;
diff --git a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java
index 01020c80..bdd8d991 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java
@@ -1,6 +1,5 @@
 package com.minelittlepony.unicopia.client;
 
-import com.minelittlepony.unicopia.UEntities;
 import com.minelittlepony.unicopia.client.particle.ChangelingMagicParticle;
 import com.minelittlepony.unicopia.client.particle.CloudsEscapingParticle;
 import com.minelittlepony.unicopia.client.particle.DiskParticle;
@@ -21,6 +20,7 @@ import com.minelittlepony.unicopia.client.render.CastSpellEntityRenderer;
 import com.minelittlepony.unicopia.client.render.FloatingArtefactEntityRenderer;
 import com.minelittlepony.unicopia.client.render.IcarusWingsFeatureRenderer;
 import com.minelittlepony.unicopia.client.render.WingsFeatureRenderer;
+import com.minelittlepony.unicopia.entity.UEntities;
 import com.minelittlepony.unicopia.item.ChameleonItem;
 import com.minelittlepony.unicopia.item.GemstoneItem;
 import com.minelittlepony.unicopia.item.UItems;
diff --git a/src/main/java/com/minelittlepony/unicopia/UEntities.java b/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java
similarity index 92%
rename from src/main/java/com/minelittlepony/unicopia/UEntities.java
rename to src/main/java/com/minelittlepony/unicopia/entity/UEntities.java
index 8a77657f..2ace07a4 100644
--- a/src/main/java/com/minelittlepony/unicopia/UEntities.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java
@@ -1,10 +1,7 @@
-package com.minelittlepony.unicopia;
+package com.minelittlepony.unicopia.entity;
 
 import java.util.function.Predicate;
 
-import com.minelittlepony.unicopia.entity.ButterflyEntity;
-import com.minelittlepony.unicopia.entity.CastSpellEntity;
-import com.minelittlepony.unicopia.entity.FloatingArtefactEntity;
 import com.minelittlepony.unicopia.projectile.MagicProjectileEntity;
 
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
diff --git a/src/main/java/com/minelittlepony/unicopia/UTradeOffers.java b/src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java
similarity index 96%
rename from src/main/java/com/minelittlepony/unicopia/UTradeOffers.java
rename to src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java
index ab992986..8155cb22 100644
--- a/src/main/java/com/minelittlepony/unicopia/UTradeOffers.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia;
+package com.minelittlepony.unicopia.entity;
 
 import com.minelittlepony.unicopia.item.UItems;
 import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java b/src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java
index 964f5b6c..d8675274 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/CrystalHeartItem.java
@@ -3,9 +3,9 @@ package com.minelittlepony.unicopia.item;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.minelittlepony.unicopia.UEntities;
 import com.minelittlepony.unicopia.UTags;
 import com.minelittlepony.unicopia.entity.FloatingArtefactEntity;
+import com.minelittlepony.unicopia.entity.UEntities;
 import com.minelittlepony.unicopia.entity.FloatingArtefactEntity.State;
 import com.minelittlepony.unicopia.particle.FollowingParticleEffect;
 import com.minelittlepony.unicopia.particle.ParticleUtils;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java
index c0020ace..a29d36c6 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java
@@ -3,8 +3,8 @@ package com.minelittlepony.unicopia.item;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.minelittlepony.unicopia.UEntities;
 import com.minelittlepony.unicopia.USounds;
+import com.minelittlepony.unicopia.entity.UEntities;
 import com.minelittlepony.unicopia.item.enchantment.UEnchantments;
 import com.minelittlepony.unicopia.item.toxin.UFoodComponents;
 
diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
index fcd715a1..a0e6fab5 100644
--- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
@@ -1,7 +1,6 @@
 package com.minelittlepony.unicopia.projectile;
 
 import com.minelittlepony.unicopia.Affinity;
-import com.minelittlepony.unicopia.UEntities;
 import com.minelittlepony.unicopia.ability.magic.Affine;
 import com.minelittlepony.unicopia.ability.magic.Caster;
 import com.minelittlepony.unicopia.ability.magic.Levelled;
@@ -11,6 +10,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.SpellPredicate;
 import com.minelittlepony.unicopia.ability.magic.spell.SpellType;
 import com.minelittlepony.unicopia.entity.EntityPhysics;
 import com.minelittlepony.unicopia.entity.Physics;
+import com.minelittlepony.unicopia.entity.UEntities;
 import com.minelittlepony.unicopia.item.UItems;
 import com.minelittlepony.unicopia.network.Channel;
 import com.minelittlepony.unicopia.network.EffectSync;