diff --git a/src/main/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java b/src/main/java/com/minelittlepony/client/model/ModelDeadMau5Ears.java
similarity index 90%
rename from src/main/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java
rename to src/main/java/com/minelittlepony/client/model/ModelDeadMau5Ears.java
index 47931da6..95ff0026 100644
--- a/src/main/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java
+++ b/src/main/java/com/minelittlepony/client/model/ModelDeadMau5Ears.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model;
 
 import net.minecraft.client.render.entity.model.SkullEntityModel;
 
diff --git a/src/main/java/com/minelittlepony/client/model/components/ModelPonyHead.java b/src/main/java/com/minelittlepony/client/model/ModelPonyHead.java
similarity index 91%
rename from src/main/java/com/minelittlepony/client/model/components/ModelPonyHead.java
rename to src/main/java/com/minelittlepony/client/model/ModelPonyHead.java
index 5371459c..e75b52c7 100644
--- a/src/main/java/com/minelittlepony/client/model/components/ModelPonyHead.java
+++ b/src/main/java/com/minelittlepony/client/model/ModelPonyHead.java
@@ -1,5 +1,7 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model;
 
+import com.minelittlepony.client.model.components.PonySnout;
+import com.minelittlepony.client.model.components.UnicornHorn;
 import com.minelittlepony.client.pony.PonyData;
 import com.minelittlepony.client.util.render.Part;
 import com.minelittlepony.model.ICapitated;
diff --git a/src/main/java/com/minelittlepony/client/model/components/PonyElytra.java b/src/main/java/com/minelittlepony/client/model/PonyElytra.java
similarity index 96%
rename from src/main/java/com/minelittlepony/client/model/components/PonyElytra.java
rename to src/main/java/com/minelittlepony/client/model/PonyElytra.java
index 6e080309..85a0908f 100644
--- a/src/main/java/com/minelittlepony/client/model/components/PonyElytra.java
+++ b/src/main/java/com/minelittlepony/client/model/PonyElytra.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
@@ -9,7 +9,6 @@ import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.Vec3d;
 
 import com.google.common.collect.ImmutableList;
-import com.minelittlepony.client.model.AbstractPonyModel;
 import com.minelittlepony.client.util.render.Part;
 
 import static com.minelittlepony.model.PonyModelConstants.*;
diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java b/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java
index 547ee512..1e5c95e7 100644
--- a/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java
+++ b/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java
@@ -8,7 +8,7 @@ import net.minecraft.client.render.entity.model.EntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 
 import com.minelittlepony.client.model.IPonyModel;
-import com.minelittlepony.client.model.components.ModelDeadMau5Ears;
+import com.minelittlepony.client.model.ModelDeadMau5Ears;
 import com.minelittlepony.client.render.IPonyRender;
 import com.minelittlepony.model.BodyPart;
 
diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java b/src/main/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java
index bc81f86d..52c353ed 100644
--- a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java
+++ b/src/main/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java
@@ -1,7 +1,7 @@
 package com.minelittlepony.client.render.layer;
 
 import com.minelittlepony.client.model.IPonyModel;
-import com.minelittlepony.client.model.components.PonyElytra;
+import com.minelittlepony.client.model.PonyElytra;
 import com.minelittlepony.client.render.IPonyRender;
 import com.minelittlepony.model.BodyPart;
 import com.mojang.blaze3d.platform.GlStateManager;
diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java
index 4a5803b0..ad131af6 100644
--- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java
@@ -1,7 +1,7 @@
 package com.minelittlepony.client.render.tileentities.skull;
 
 import com.minelittlepony.client.SkinsProxy;
-import com.minelittlepony.client.model.components.ModelDeadMau5Ears;
+import com.minelittlepony.client.model.ModelDeadMau5Ears;
 import com.minelittlepony.settings.PonyConfig;
 import com.minelittlepony.settings.PonyLevel;
 import com.mojang.authlib.GameProfile;
diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java
index d12d0178..07137086 100644
--- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java
+++ b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java
@@ -3,7 +3,7 @@ package com.minelittlepony.client.render.tileentities.skull;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.util.math.MatrixStack;
 
-import com.minelittlepony.client.model.components.ModelPonyHead;
+import com.minelittlepony.client.model.ModelPonyHead;
 import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer.ISkull;
 import com.minelittlepony.pony.IPony;