diff --git a/assets/minecraft/textures/entity/armadillo.png b/assets/minecraft/textures/entity/armadillo/armadillo.png
similarity index 100%
rename from assets/minecraft/textures/entity/armadillo.png
rename to assets/minecraft/textures/entity/armadillo/armadillo.png
diff --git a/assets/minecraft/textures/entity/armorstand/wood.png b/assets/minecraft/textures/entity/armorstand/armorstand.png
similarity index 100%
rename from assets/minecraft/textures/entity/armorstand/wood.png
rename to assets/minecraft/textures/entity/armorstand/armorstand.png
diff --git a/assets/minecraft/textures/entity/banner_base.png b/assets/minecraft/textures/entity/banner/banner_base.png
similarity index 100%
rename from assets/minecraft/textures/entity/banner_base.png
rename to assets/minecraft/textures/entity/banner/banner_base.png
diff --git a/assets/minecraft/textures/entity/bat.png b/assets/minecraft/textures/entity/bat/bat.png
similarity index 100%
rename from assets/minecraft/textures/entity/bat.png
rename to assets/minecraft/textures/entity/bat/bat.png
diff --git a/assets/minecraft/textures/entity/beacon_beam.png b/assets/minecraft/textures/entity/beacon/beacon_beam.png
similarity index 100%
rename from assets/minecraft/textures/entity/beacon_beam.png
rename to assets/minecraft/textures/entity/beacon/beacon_beam.png
diff --git a/assets/minecraft/textures/entity/blaze.png b/assets/minecraft/textures/entity/blaze/blaze.png
similarity index 100%
rename from assets/minecraft/textures/entity/blaze.png
rename to assets/minecraft/textures/entity/blaze/blaze.png
diff --git a/assets/minecraft/textures/entity/cat/all_black.png b/assets/minecraft/textures/entity/cat/cat_all_black.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/all_black.png
rename to assets/minecraft/textures/entity/cat/cat_all_black.png
diff --git a/assets/minecraft/textures/entity/cat/black.png b/assets/minecraft/textures/entity/cat/cat_black.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/black.png
rename to assets/minecraft/textures/entity/cat/cat_black.png
diff --git a/assets/minecraft/textures/entity/cat/british_shorthair.png b/assets/minecraft/textures/entity/cat/cat_british_shorthair.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/british_shorthair.png
rename to assets/minecraft/textures/entity/cat/cat_british_shorthair.png
diff --git a/assets/minecraft/textures/entity/cat/calico.png b/assets/minecraft/textures/entity/cat/cat_calico.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/calico.png
rename to assets/minecraft/textures/entity/cat/cat_calico.png
diff --git a/assets/minecraft/textures/entity/cat/jellie.png b/assets/minecraft/textures/entity/cat/cat_jellie.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/jellie.png
rename to assets/minecraft/textures/entity/cat/cat_jellie.png
diff --git a/assets/minecraft/textures/entity/cat/persian.png b/assets/minecraft/textures/entity/cat/cat_persian.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/persian.png
rename to assets/minecraft/textures/entity/cat/cat_persian.png
diff --git a/assets/minecraft/textures/entity/cat/ragdoll.png b/assets/minecraft/textures/entity/cat/cat_ragdoll.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/ragdoll.png
rename to assets/minecraft/textures/entity/cat/cat_ragdoll.png
diff --git a/assets/minecraft/textures/entity/cat/red.png b/assets/minecraft/textures/entity/cat/cat_red.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/red.png
rename to assets/minecraft/textures/entity/cat/cat_red.png
diff --git a/assets/minecraft/textures/entity/cat/siamese.png b/assets/minecraft/textures/entity/cat/cat_siamese.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/siamese.png
rename to assets/minecraft/textures/entity/cat/cat_siamese.png
diff --git a/assets/minecraft/textures/entity/cat/tabby.png b/assets/minecraft/textures/entity/cat/cat_tabby.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/tabby.png
rename to assets/minecraft/textures/entity/cat/cat_tabby.png
diff --git a/assets/minecraft/textures/entity/cat/white.png b/assets/minecraft/textures/entity/cat/cat_white.png
similarity index 100%
rename from assets/minecraft/textures/entity/cat/white.png
rename to assets/minecraft/textures/entity/cat/cat_white.png
diff --git a/assets/minecraft/textures/entity/chicken/cold_chicken.png b/assets/minecraft/textures/entity/chicken/chicken_cold.png
similarity index 100%
rename from assets/minecraft/textures/entity/chicken/cold_chicken.png
rename to assets/minecraft/textures/entity/chicken/chicken_cold.png
diff --git a/assets/minecraft/textures/entity/chicken/temperate_chicken.png b/assets/minecraft/textures/entity/chicken/chicken_temperate.png
similarity index 100%
rename from assets/minecraft/textures/entity/chicken/temperate_chicken.png
rename to assets/minecraft/textures/entity/chicken/chicken_temperate.png
diff --git a/assets/minecraft/textures/entity/chicken/warm_chicken.png b/assets/minecraft/textures/entity/chicken/chicken_warm.png
similarity index 100%
rename from assets/minecraft/textures/entity/chicken/warm_chicken.png
rename to assets/minecraft/textures/entity/chicken/chicken_warm.png
diff --git a/assets/minecraft/textures/entity/copper_golem/exposed_copper_golem.png b/assets/minecraft/textures/entity/copper_golem/copper_golem_exposed.png
similarity index 100%
rename from assets/minecraft/textures/entity/copper_golem/exposed_copper_golem.png
rename to assets/minecraft/textures/entity/copper_golem/copper_golem_exposed.png
diff --git a/assets/minecraft/textures/entity/copper_golem/exposed_copper_golem_eyes.png b/assets/minecraft/textures/entity/copper_golem/copper_golem_eyes_exposed.png
similarity index 100%
rename from assets/minecraft/textures/entity/copper_golem/exposed_copper_golem_eyes.png
rename to assets/minecraft/textures/entity/copper_golem/copper_golem_eyes_exposed.png
diff --git a/assets/minecraft/textures/entity/copper_golem/oxidized_copper_golem_eyes.png b/assets/minecraft/textures/entity/copper_golem/copper_golem_eyes_oxidized.png
similarity index 100%
rename from assets/minecraft/textures/entity/copper_golem/oxidized_copper_golem_eyes.png
rename to assets/minecraft/textures/entity/copper_golem/copper_golem_eyes_oxidized.png
diff --git a/assets/minecraft/textures/entity/copper_golem/weathered_copper_golem_eyes.png b/assets/minecraft/textures/entity/copper_golem/copper_golem_eyes_weathered.png
similarity index 100%
rename from assets/minecraft/textures/entity/copper_golem/weathered_copper_golem_eyes.png
rename to assets/minecraft/textures/entity/copper_golem/copper_golem_eyes_weathered.png
diff --git a/assets/minecraft/textures/entity/copper_golem/oxidized_copper_golem.png b/assets/minecraft/textures/entity/copper_golem/copper_golem_oxidized.png
similarity index 100%
rename from assets/minecraft/textures/entity/copper_golem/oxidized_copper_golem.png
rename to assets/minecraft/textures/entity/copper_golem/copper_golem_oxidized.png
diff --git a/assets/minecraft/textures/entity/copper_golem/weathered_copper_golem.png b/assets/minecraft/textures/entity/copper_golem/copper_golem_weathered.png
similarity index 100%
rename from assets/minecraft/textures/entity/copper_golem/weathered_copper_golem.png
rename to assets/minecraft/textures/entity/copper_golem/copper_golem_weathered.png
diff --git a/assets/minecraft/textures/entity/cow/cold_cow.png b/assets/minecraft/textures/entity/cow/cow_cold.png
similarity index 100%
rename from assets/minecraft/textures/entity/cow/cold_cow.png
rename to assets/minecraft/textures/entity/cow/cow_cold.png
diff --git a/assets/minecraft/textures/entity/cow/temperate_cow.png b/assets/minecraft/textures/entity/cow/cow_temperate.png
similarity index 100%
rename from assets/minecraft/textures/entity/cow/temperate_cow.png
rename to assets/minecraft/textures/entity/cow/cow_temperate.png
diff --git a/assets/minecraft/textures/entity/cow/warm_cow.png b/assets/minecraft/textures/entity/cow/cow_warm.png
similarity index 100%
rename from assets/minecraft/textures/entity/cow/warm_cow.png
rename to assets/minecraft/textures/entity/cow/cow_warm.png
diff --git a/assets/minecraft/textures/entity/cow/brown_mooshroom.png b/assets/minecraft/textures/entity/cow/mooshroom_brown.png
similarity index 100%
rename from assets/minecraft/textures/entity/cow/brown_mooshroom.png
rename to assets/minecraft/textures/entity/cow/mooshroom_brown.png
diff --git a/assets/minecraft/textures/entity/cow/red_mooshroom.png b/assets/minecraft/textures/entity/cow/mooshroom_red.png
similarity index 100%
rename from assets/minecraft/textures/entity/cow/red_mooshroom.png
rename to assets/minecraft/textures/entity/cow/mooshroom_red.png
diff --git a/assets/minecraft/textures/entity/dolphin.png b/assets/minecraft/textures/entity/dolphin/dolphin.png
similarity index 100%
rename from assets/minecraft/textures/entity/dolphin.png
rename to assets/minecraft/textures/entity/dolphin/dolphin.png
diff --git a/assets/minecraft/textures/entity/enchanting_table_book.png b/assets/minecraft/textures/entity/enchantment/enchanting_table_book.png
similarity index 100%
rename from assets/minecraft/textures/entity/enchanting_table_book.png
rename to assets/minecraft/textures/entity/enchantment/enchanting_table_book.png
diff --git a/assets/minecraft/textures/entity/end_gateway_beam.png b/assets/minecraft/textures/entity/end_portal/end_gateway_beam.png
similarity index 100%
rename from assets/minecraft/textures/entity/end_gateway_beam.png
rename to assets/minecraft/textures/entity/end_portal/end_gateway_beam.png
diff --git a/assets/minecraft/textures/entity/endermite.png b/assets/minecraft/textures/entity/endermite/endermite.png
similarity index 100%
rename from assets/minecraft/textures/entity/endermite.png
rename to assets/minecraft/textures/entity/endermite/endermite.png
diff --git a/assets/minecraft/textures/entity/experience_orb.png b/assets/minecraft/textures/entity/experience/experience_orb.png
similarity index 100%
rename from assets/minecraft/textures/entity/experience_orb.png
rename to assets/minecraft/textures/entity/experience/experience_orb.png
diff --git a/assets/minecraft/textures/entity/fishing_hook.png b/assets/minecraft/textures/entity/fishing/fishing_hook.png
similarity index 100%
rename from assets/minecraft/textures/entity/fishing_hook.png
rename to assets/minecraft/textures/entity/fishing/fishing_hook.png
diff --git a/assets/minecraft/textures/entity/fox/snow_fox.png b/assets/minecraft/textures/entity/fox/fox_snow.png
similarity index 100%
rename from assets/minecraft/textures/entity/fox/snow_fox.png
rename to assets/minecraft/textures/entity/fox/fox_snow.png
diff --git a/assets/minecraft/textures/entity/fox/snow_fox_sleep.png b/assets/minecraft/textures/entity/fox/fox_snow_sleep.png
similarity index 100%
rename from assets/minecraft/textures/entity/fox/snow_fox_sleep.png
rename to assets/minecraft/textures/entity/fox/fox_snow_sleep.png
diff --git a/assets/minecraft/textures/entity/frog/cold_frog.png b/assets/minecraft/textures/entity/frog/frog_cold.png
similarity index 100%
rename from assets/minecraft/textures/entity/frog/cold_frog.png
rename to assets/minecraft/textures/entity/frog/frog_cold.png
diff --git a/assets/minecraft/textures/entity/frog/temperate_frog.png b/assets/minecraft/textures/entity/frog/frog_temperate.png
similarity index 100%
rename from assets/minecraft/textures/entity/frog/temperate_frog.png
rename to assets/minecraft/textures/entity/frog/frog_temperate.png
diff --git a/assets/minecraft/textures/entity/frog/warm_frog.png b/assets/minecraft/textures/entity/frog/frog_warm.png
similarity index 100%
rename from assets/minecraft/textures/entity/frog/warm_frog.png
rename to assets/minecraft/textures/entity/frog/frog_warm.png
diff --git a/assets/minecraft/textures/entity/guardian.png b/assets/minecraft/textures/entity/guardian/guardian.png
similarity index 100%
rename from assets/minecraft/textures/entity/guardian.png
rename to assets/minecraft/textures/entity/guardian/guardian.png
diff --git a/assets/minecraft/textures/entity/guardian_beam.png b/assets/minecraft/textures/entity/guardian/guardian_beam.png
similarity index 100%
rename from assets/minecraft/textures/entity/guardian_beam.png
rename to assets/minecraft/textures/entity/guardian/guardian_beam.png
diff --git a/assets/minecraft/textures/entity/guardian_elder.png b/assets/minecraft/textures/entity/guardian/guardian_elder.png
similarity index 100%
rename from assets/minecraft/textures/entity/guardian_elder.png
rename to assets/minecraft/textures/entity/guardian/guardian_elder.png
diff --git a/assets/minecraft/textures/entity/lead_knot.png b/assets/minecraft/textures/entity/lead_knot/lead_knot.png
similarity index 100%
rename from assets/minecraft/textures/entity/lead_knot.png
rename to assets/minecraft/textures/entity/lead_knot/lead_knot.png
diff --git a/assets/minecraft/textures/entity/llama/brown.png b/assets/minecraft/textures/entity/llama/llama_brown.png
similarity index 100%
rename from assets/minecraft/textures/entity/llama/brown.png
rename to assets/minecraft/textures/entity/llama/llama_brown.png
diff --git a/assets/minecraft/textures/entity/llama/creamy.png b/assets/minecraft/textures/entity/llama/llama_creamy.png
similarity index 100%
rename from assets/minecraft/textures/entity/llama/creamy.png
rename to assets/minecraft/textures/entity/llama/llama_creamy.png
diff --git a/assets/minecraft/textures/entity/llama/gray.png b/assets/minecraft/textures/entity/llama/llama_gray.png
similarity index 100%
rename from assets/minecraft/textures/entity/llama/gray.png
rename to assets/minecraft/textures/entity/llama/llama_gray.png
diff --git a/assets/minecraft/textures/entity/llama/white.png b/assets/minecraft/textures/entity/llama/llama_white.png
similarity index 100%
rename from assets/minecraft/textures/entity/llama/white.png
rename to assets/minecraft/textures/entity/llama/llama_white.png
diff --git a/assets/minecraft/textures/entity/minecart.png b/assets/minecraft/textures/entity/minecart/minecart.png
similarity index 100%
rename from assets/minecraft/textures/entity/minecart.png
rename to assets/minecraft/textures/entity/minecart/minecart.png
diff --git a/assets/minecraft/textures/entity/panda/aggressive_panda.png b/assets/minecraft/textures/entity/panda/panda_aggressive.png
similarity index 100%
rename from assets/minecraft/textures/entity/panda/aggressive_panda.png
rename to assets/minecraft/textures/entity/panda/panda_aggressive.png
diff --git a/assets/minecraft/textures/entity/panda/brown_panda.png b/assets/minecraft/textures/entity/panda/panda_brown.png
similarity index 100%
rename from assets/minecraft/textures/entity/panda/brown_panda.png
rename to assets/minecraft/textures/entity/panda/panda_brown.png
diff --git a/assets/minecraft/textures/entity/panda/lazy_panda.png b/assets/minecraft/textures/entity/panda/panda_lazy.png
similarity index 100%
rename from assets/minecraft/textures/entity/panda/lazy_panda.png
rename to assets/minecraft/textures/entity/panda/panda_lazy.png
diff --git a/assets/minecraft/textures/entity/panda/playful_panda.png b/assets/minecraft/textures/entity/panda/panda_playful.png
similarity index 100%
rename from assets/minecraft/textures/entity/panda/playful_panda.png
rename to assets/minecraft/textures/entity/panda/panda_playful.png
diff --git a/assets/minecraft/textures/entity/panda/weak_panda.png b/assets/minecraft/textures/entity/panda/panda_weak.png
similarity index 100%
rename from assets/minecraft/textures/entity/panda/weak_panda.png
rename to assets/minecraft/textures/entity/panda/panda_weak.png
diff --git a/assets/minecraft/textures/entity/panda/worried_panda.png b/assets/minecraft/textures/entity/panda/panda_worried.png
similarity index 100%
rename from assets/minecraft/textures/entity/panda/worried_panda.png
rename to assets/minecraft/textures/entity/panda/panda_worried.png
diff --git a/assets/minecraft/textures/entity/phantom.png b/assets/minecraft/textures/entity/phantom/phantom.png
similarity index 100%
rename from assets/minecraft/textures/entity/phantom.png
rename to assets/minecraft/textures/entity/phantom/phantom.png
diff --git a/assets/minecraft/textures/entity/pig/cold_pig.png b/assets/minecraft/textures/entity/pig/pig_cold.png
similarity index 100%
rename from assets/minecraft/textures/entity/pig/cold_pig.png
rename to assets/minecraft/textures/entity/pig/pig_cold.png
diff --git a/assets/minecraft/textures/entity/pig/pig_saddle.png b/assets/minecraft/textures/entity/pig/pig_saddle.png
deleted file mode 100644
index e9fd7341d..000000000
Binary files a/assets/minecraft/textures/entity/pig/pig_saddle.png and /dev/null differ
diff --git a/assets/minecraft/textures/entity/pig/temperate_pig.png b/assets/minecraft/textures/entity/pig/pig_temperate.png
similarity index 100%
rename from assets/minecraft/textures/entity/pig/temperate_pig.png
rename to assets/minecraft/textures/entity/pig/pig_temperate.png
diff --git a/assets/minecraft/textures/entity/pig/warm_pig.png b/assets/minecraft/textures/entity/pig/pig_warm.png
similarity index 100%
rename from assets/minecraft/textures/entity/pig/warm_pig.png
rename to assets/minecraft/textures/entity/pig/pig_warm.png
diff --git a/assets/minecraft/textures/entity/projectiles/spectral_arrow.png b/assets/minecraft/textures/entity/projectiles/arrow_spectral.png
similarity index 100%
rename from assets/minecraft/textures/entity/projectiles/spectral_arrow.png
rename to assets/minecraft/textures/entity/projectiles/arrow_spectral.png
diff --git a/assets/minecraft/textures/entity/projectiles/tipped_arrow.png b/assets/minecraft/textures/entity/projectiles/arrow_tipped.png
similarity index 100%
rename from assets/minecraft/textures/entity/projectiles/tipped_arrow.png
rename to assets/minecraft/textures/entity/projectiles/arrow_tipped.png
diff --git a/assets/minecraft/textures/entity/rabbit/black.png b/assets/minecraft/textures/entity/rabbit/black.png
deleted file mode 100644
index feae55397..000000000
Binary files a/assets/minecraft/textures/entity/rabbit/black.png and /dev/null differ
diff --git a/assets/minecraft/textures/entity/rabbit/brown.png b/assets/minecraft/textures/entity/rabbit/brown.png
deleted file mode 100644
index 084aced35..000000000
Binary files a/assets/minecraft/textures/entity/rabbit/brown.png and /dev/null differ
diff --git a/assets/minecraft/textures/entity/rabbit/caerbannog.png b/assets/minecraft/textures/entity/rabbit/caerbannog.png
deleted file mode 100644
index 82b65956a..000000000
Binary files a/assets/minecraft/textures/entity/rabbit/caerbannog.png and /dev/null differ
diff --git a/assets/minecraft/textures/entity/rabbit/gold.png b/assets/minecraft/textures/entity/rabbit/gold.png
deleted file mode 100644
index 2352e2cfc..000000000
Binary files a/assets/minecraft/textures/entity/rabbit/gold.png and /dev/null differ
diff --git a/assets/minecraft/textures/entity/rabbit/salt.png b/assets/minecraft/textures/entity/rabbit/salt.png
deleted file mode 100644
index 4210ecf52..000000000
Binary files a/assets/minecraft/textures/entity/rabbit/salt.png and /dev/null differ
diff --git a/assets/minecraft/textures/entity/rabbit/toast.png b/assets/minecraft/textures/entity/rabbit/toast.png
deleted file mode 100644
index 8b4e89eb0..000000000
Binary files a/assets/minecraft/textures/entity/rabbit/toast.png and /dev/null differ
diff --git a/assets/minecraft/textures/entity/rabbit/white.png b/assets/minecraft/textures/entity/rabbit/white.png
deleted file mode 100644
index b7b72fce1..000000000
Binary files a/assets/minecraft/textures/entity/rabbit/white.png and /dev/null differ
diff --git a/assets/minecraft/textures/entity/shield_base.png b/assets/minecraft/textures/entity/shield/shield_base.png
similarity index 100%
rename from assets/minecraft/textures/entity/shield_base.png
rename to assets/minecraft/textures/entity/shield/shield_base.png
diff --git a/assets/minecraft/textures/entity/shield_base_nopattern.png b/assets/minecraft/textures/entity/shield/shield_base_nopattern.png
similarity index 100%
rename from assets/minecraft/textures/entity/shield_base_nopattern.png
rename to assets/minecraft/textures/entity/shield/shield_base_nopattern.png
diff --git a/assets/minecraft/textures/entity/silverfish.png b/assets/minecraft/textures/entity/silverfish/silverfish.png
similarity index 100%
rename from assets/minecraft/textures/entity/silverfish.png
rename to assets/minecraft/textures/entity/silverfish/silverfish.png
diff --git a/assets/minecraft/textures/entity/snow_golem.png b/assets/minecraft/textures/entity/snow_golem/snow_golem.png
similarity index 100%
rename from assets/minecraft/textures/entity/snow_golem.png
rename to assets/minecraft/textures/entity/snow_golem/snow_golem.png
diff --git a/assets/minecraft/textures/entity/spider_eyes.png b/assets/minecraft/textures/entity/spider/spider_eyes.png
similarity index 100%
rename from assets/minecraft/textures/entity/spider_eyes.png
rename to assets/minecraft/textures/entity/spider/spider_eyes.png
diff --git a/assets/minecraft/textures/entity/trident.png b/assets/minecraft/textures/entity/trident/trident.png
similarity index 100%
rename from assets/minecraft/textures/entity/trident.png
rename to assets/minecraft/textures/entity/trident/trident.png
diff --git a/assets/minecraft/textures/entity/trident_riptide.png b/assets/minecraft/textures/entity/trident/trident_riptide.png
similarity index 100%
rename from assets/minecraft/textures/entity/trident_riptide.png
rename to assets/minecraft/textures/entity/trident/trident_riptide.png
diff --git a/assets/minecraft/textures/entity/turtle/big_sea_turtle.png b/assets/minecraft/textures/entity/turtle/turtle.png
similarity index 100%
rename from assets/minecraft/textures/entity/turtle/big_sea_turtle.png
rename to assets/minecraft/textures/entity/turtle/turtle.png
diff --git a/assets/minecraft/textures/entity/wandering_trader.png b/assets/minecraft/textures/entity/wandering_trader/wandering_trader.png
similarity index 100%
rename from assets/minecraft/textures/entity/wandering_trader.png
rename to assets/minecraft/textures/entity/wandering_trader/wandering_trader.png
diff --git a/assets/minecraft/textures/entity/witch.png b/assets/minecraft/textures/entity/witch/witch.png
similarity index 100%
rename from assets/minecraft/textures/entity/witch.png
rename to assets/minecraft/textures/entity/witch/witch.png