diff --git a/src/main/resources/assets/minelittlepony/models/allay.json b/src/main/resources/assets/minelittlepony/models/entity/allay.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/allay.json
rename to src/main/resources/assets/minelittlepony/models/entity/allay.json
diff --git a/src/main/resources/assets/minelittlepony/models/armor/inner_pony_armor.json b/src/main/resources/assets/minelittlepony/models/entity/armor/inner_pony_armor.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/armor/inner_pony_armor.json
rename to src/main/resources/assets/minelittlepony/models/entity/armor/inner_pony_armor.json
diff --git a/src/main/resources/assets/minelittlepony/models/armor/outer_pony_armor.json b/src/main/resources/assets/minelittlepony/models/entity/armor/outer_pony_armor.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/armor/outer_pony_armor.json
rename to src/main/resources/assets/minelittlepony/models/entity/armor/outer_pony_armor.json
diff --git a/src/main/resources/assets/minelittlepony/models/armour_stand.json b/src/main/resources/assets/minelittlepony/models/entity/armour_stand.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/armour_stand.json
rename to src/main/resources/assets/minelittlepony/models/entity/armour_stand.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/bat_ears.json b/src/main/resources/assets/minelittlepony/models/entity/components/bat_ears.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/bat_ears.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/bat_ears.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/bat_wings.json b/src/main/resources/assets/minelittlepony/models/entity/components/bat_wings.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/bat_wings.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/bat_wings.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/bug_wings.json b/src/main/resources/assets/minelittlepony/models/entity/components/bug_wings.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/bug_wings.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/bug_wings.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/ears.json b/src/main/resources/assets/minelittlepony/models/entity/components/ears.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/ears.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/ears.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/fish_tail.json b/src/main/resources/assets/minelittlepony/models/entity/components/fish_tail.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/fish_tail.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/fish_tail.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/horn.json b/src/main/resources/assets/minelittlepony/models/entity/components/horn.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/horn.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/horn.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/lion_tail.json b/src/main/resources/assets/minelittlepony/models/entity/components/lion_tail.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/lion_tail.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/lion_tail.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json b/src/main/resources/assets/minelittlepony/models/entity/components/pegasus_wings.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/pegasus_wings.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/pig_snout.json b/src/main/resources/assets/minelittlepony/models/entity/components/pig_snout.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/pig_snout.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/pig_snout.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/snout.json b/src/main/resources/assets/minelittlepony/models/entity/components/snout.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/snout.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/snout.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/tail.json b/src/main/resources/assets/minelittlepony/models/entity/components/tail.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/tail.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/tail.json
diff --git a/src/main/resources/assets/minelittlepony/models/components/tail_segment.json b/src/main/resources/assets/minelittlepony/models/entity/components/tail_segment.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/components/tail_segment.json
rename to src/main/resources/assets/minelittlepony/models/entity/components/tail_segment.json
diff --git a/src/main/resources/assets/minelittlepony/models/dj_pon_three.json b/src/main/resources/assets/minelittlepony/models/entity/dj_pon_three.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/dj_pon_three.json
rename to src/main/resources/assets/minelittlepony/models/entity/dj_pon_three.json
diff --git a/src/main/resources/assets/minelittlepony/models/elytra.json b/src/main/resources/assets/minelittlepony/models/entity/elytra.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/elytra.json
rename to src/main/resources/assets/minelittlepony/models/entity/elytra.json
diff --git a/src/main/resources/assets/minelittlepony/models/enderman.json b/src/main/resources/assets/minelittlepony/models/entity/enderman.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/enderman.json
rename to src/main/resources/assets/minelittlepony/models/entity/enderman.json
diff --git a/src/main/resources/assets/minelittlepony/models/gear/antlers.json b/src/main/resources/assets/minelittlepony/models/entity/gear/antlers.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/gear/antlers.json
rename to src/main/resources/assets/minelittlepony/models/entity/gear/antlers.json
diff --git a/src/main/resources/assets/minelittlepony/models/gear/crown.json b/src/main/resources/assets/minelittlepony/models/entity/gear/crown.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/gear/crown.json
rename to src/main/resources/assets/minelittlepony/models/entity/gear/crown.json
diff --git a/src/main/resources/assets/minelittlepony/models/gear/muffin.json b/src/main/resources/assets/minelittlepony/models/entity/gear/muffin.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/gear/muffin.json
rename to src/main/resources/assets/minelittlepony/models/entity/gear/muffin.json
diff --git a/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json b/src/main/resources/assets/minelittlepony/models/entity/gear/saddlebags.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/gear/saddlebags.json
rename to src/main/resources/assets/minelittlepony/models/entity/gear/saddlebags.json
diff --git a/src/main/resources/assets/minelittlepony/models/gear/stetson.json b/src/main/resources/assets/minelittlepony/models/entity/gear/stetson.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/gear/stetson.json
rename to src/main/resources/assets/minelittlepony/models/entity/gear/stetson.json
diff --git a/src/main/resources/assets/minelittlepony/models/gear/witch_hat.json b/src/main/resources/assets/minelittlepony/models/entity/gear/witch_hat.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/gear/witch_hat.json
rename to src/main/resources/assets/minelittlepony/models/entity/gear/witch_hat.json
diff --git a/src/main/resources/assets/minelittlepony/models/guardian.json b/src/main/resources/assets/minelittlepony/models/entity/guardian.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/guardian.json
rename to src/main/resources/assets/minelittlepony/models/entity/guardian.json
diff --git a/src/main/resources/assets/minelittlepony/models/illager.json b/src/main/resources/assets/minelittlepony/models/entity/illager.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/illager.json
rename to src/main/resources/assets/minelittlepony/models/entity/illager.json
diff --git a/src/main/resources/assets/minelittlepony/models/piglin.json b/src/main/resources/assets/minelittlepony/models/entity/piglin.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/piglin.json
rename to src/main/resources/assets/minelittlepony/models/entity/piglin.json
diff --git a/src/main/resources/assets/minelittlepony/models/pillager.json b/src/main/resources/assets/minelittlepony/models/entity/pillager.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/pillager.json
rename to src/main/resources/assets/minelittlepony/models/entity/pillager.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/alicorn.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/alicorn.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/alicorn.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/alicorn.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/bat_pony.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/bat_pony.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/bat_pony.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/bat_pony.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/changeling.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/changeling.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/changeling.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/changeling.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/earth_pony.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/earth_pony.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/earth_pony.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/earth_pony.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/gryphon.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/gryphon.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/gryphon.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/gryphon.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/hippogriff.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/hippogriff.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/hippogriff.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/hippogriff.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/kirin.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/kirin.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/kirin.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/kirin.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/pegasus.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/pegasus.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/pegasus.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/pegasus.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/reformed_changeling.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/reformed_changeling.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/reformed_changeling.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/reformed_changeling.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/sea_pony.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/sea_pony.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/sea_pony.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/sea_pony.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/unicorn.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/unicorn.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/unicorn.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/unicorn.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/alex/zebra.json b/src/main/resources/assets/minelittlepony/models/entity/races/alex/zebra.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/alex/zebra.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/alex/zebra.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/alicorn.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/alicorn.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/alicorn.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/alicorn.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/bat_pony.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/bat_pony.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/bat_pony.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/bat_pony.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/changeling.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/changeling.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/changeling.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/changeling.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/earth_pony.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/earth_pony.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/earth_pony.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/earth_pony.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/gryphon.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/gryphon.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/gryphon.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/gryphon.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/hippogriff.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/hippogriff.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/kirin.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/kirin.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/kirin.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/kirin.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/pegasus.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/pegasus.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/pegasus.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/pegasus.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/reformed_changeling.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/reformed_changeling.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/reformed_changeling.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/reformed_changeling.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/sea_pony.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/sea_pony.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/unicorn.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/unicorn.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/unicorn.json
diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/zebra.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/races/steve/zebra.json
rename to src/main/resources/assets/minelittlepony/models/entity/races/steve/zebra.json
diff --git a/src/main/resources/assets/minelittlepony/models/skeleton.json b/src/main/resources/assets/minelittlepony/models/entity/skeleton.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/skeleton.json
rename to src/main/resources/assets/minelittlepony/models/entity/skeleton.json
diff --git a/src/main/resources/assets/minelittlepony/models/skeleton_clothes.json b/src/main/resources/assets/minelittlepony/models/entity/skeleton_clothes.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/skeleton_clothes.json
rename to src/main/resources/assets/minelittlepony/models/entity/skeleton_clothes.json
diff --git a/src/main/resources/assets/minelittlepony/models/steve_pony.json b/src/main/resources/assets/minelittlepony/models/entity/steve_pony.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/steve_pony.json
rename to src/main/resources/assets/minelittlepony/models/entity/steve_pony.json
diff --git a/src/main/resources/assets/minelittlepony/models/strider.json b/src/main/resources/assets/minelittlepony/models/entity/strider.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/strider.json
rename to src/main/resources/assets/minelittlepony/models/entity/strider.json
diff --git a/src/main/resources/assets/minelittlepony/models/strider_saddle.json b/src/main/resources/assets/minelittlepony/models/entity/strider_saddle.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/strider_saddle.json
rename to src/main/resources/assets/minelittlepony/models/entity/strider_saddle.json
diff --git a/src/main/resources/assets/minelittlepony/models/vex.json b/src/main/resources/assets/minelittlepony/models/entity/vex.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/vex.json
rename to src/main/resources/assets/minelittlepony/models/entity/vex.json
diff --git a/src/main/resources/assets/minelittlepony/models/villager.json b/src/main/resources/assets/minelittlepony/models/entity/villager.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/villager.json
rename to src/main/resources/assets/minelittlepony/models/entity/villager.json
diff --git a/src/main/resources/assets/minelittlepony/models/witch.json b/src/main/resources/assets/minelittlepony/models/entity/witch.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/witch.json
rename to src/main/resources/assets/minelittlepony/models/entity/witch.json
diff --git a/src/main/resources/assets/minelittlepony/models/zombie.json b/src/main/resources/assets/minelittlepony/models/entity/zombie.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/zombie.json
rename to src/main/resources/assets/minelittlepony/models/entity/zombie.json
diff --git a/src/main/resources/assets/minelittlepony/models/zombie_villager.json b/src/main/resources/assets/minelittlepony/models/entity/zombie_villager.json
similarity index 100%
rename from src/main/resources/assets/minelittlepony/models/zombie_villager.json
rename to src/main/resources/assets/minelittlepony/models/entity/zombie_villager.json