From 5faec2839c24a52b6526cf76a44fdcedcfacbb7c Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Thu, 10 Jan 2019 20:06:24 +1100
Subject: [PATCH] Wanderer now works, reverted texture path changes

---
 src/main/java/biomesoplenty/init/ModItems.java    |   2 +-
 .../biomesoplenty/models/block/ash_block.json     |   2 +-
 .../biomesoplenty/models/block/ash_block.json.rej |   9 +++++++++
 .../biomesoplenty/textures/blocks/ash_block.png   | Bin 0 -> 525 bytes
 .../textures/{block => blocks}/barley.png         | Bin
 .../textures/{block => blocks}/berrybush.png      | Bin
 .../{block => blocks}/berrybush_berry.png         | Bin
 .../textures/{block => blocks}/blood_flowing.png  | Bin
 .../{block => blocks}/blood_flowing.png.mcmeta    |   0
 .../textures/{block => blocks}/blood_still.png    | Bin
 .../{block => blocks}/blood_still.png.mcmeta      |   0
 .../{block => blocks}/blue_fire_layer_0.png       | Bin
 .../blue_fire_layer_0.png.mcmeta                  |   0
 .../{block => blocks}/blue_fire_layer_1.png       | Bin
 .../blue_fire_layer_1.png.mcmeta                  |   0
 .../textures/{block => blocks}/blue_hydrangea.png | Bin
 .../textures/{block => blocks}/bramble_plant.png  | Bin
 .../textures/{block => blocks}/bramble_thorns.png | Bin
 .../{block => blocks}/burning_blossom.png         | Bin
 .../textures/{block => blocks}/bush.png           | Bin
 .../textures/{block => blocks}/bush_branch.png    | Bin
 .../textures/{block => blocks}/cattail.png        | Bin
 .../textures/{block => blocks}/cherry_log.png     | Bin
 .../textures/{block => blocks}/cherry_log_top.png | Bin
 .../textures/{block => blocks}/cherry_planks.png  | Bin
 .../{block => blocks}/cherry_trapdoor.png         | Bin
 .../{block => blocks}/coarse_dirt_loamy.png       | Bin
 .../{block => blocks}/coarse_dirt_sandy.png       | Bin
 .../{block => blocks}/coarse_dirt_silty.png       | Bin
 .../textures/{block => blocks}/dead_log.png       | Bin
 .../textures/{block => blocks}/dead_log_top.png   | Bin
 .../textures/{block => blocks}/deadgrass.png      | Bin
 .../textures/{block => blocks}/deadleafpile.png   | Bin
 .../textures/{block => blocks}/deathbloom.png     | Bin
 .../textures/{block => blocks}/desertgrass.png    | Bin
 .../textures/{block => blocks}/devilweed.png      | Bin
 .../textures/{block => blocks}/dirt_loamy.png     | Bin
 .../textures/{block => blocks}/dirt_sandy.png     | Bin
 .../textures/{block => blocks}/dirt_silty.png     | Bin
 .../{block => blocks}/door_cherry_lower.png       | Bin
 .../{block => blocks}/door_cherry_upper.png       | Bin
 .../{block => blocks}/door_ethereal_lower.png     | Bin
 .../{block => blocks}/door_ethereal_upper.png     | Bin
 .../textures/{block => blocks}/door_fir_lower.png | Bin
 .../textures/{block => blocks}/door_fir_upper.png | Bin
 .../{block => blocks}/door_hellbark_lower.png     | Bin
 .../{block => blocks}/door_hellbark_upper.png     | Bin
 .../{block => blocks}/door_jacaranda_lower.png    | Bin
 .../{block => blocks}/door_jacaranda_upper.png    | Bin
 .../{block => blocks}/door_magic_lower.png        | Bin
 .../{block => blocks}/door_magic_upper.png        | Bin
 .../{block => blocks}/door_mahogany_lower.png     | Bin
 .../{block => blocks}/door_mahogany_upper.png     | Bin
 .../{block => blocks}/door_palm_lower.png         | Bin
 .../{block => blocks}/door_palm_upper.png         | Bin
 .../{block => blocks}/door_redwood_lower.png      | Bin
 .../{block => blocks}/door_redwood_upper.png      | Bin
 .../{block => blocks}/door_umbran_lower.png       | Bin
 .../{block => blocks}/door_umbran_upper.png       | Bin
 .../{block => blocks}/door_willow_lower.png       | Bin
 .../{block => blocks}/door_willow_upper.png       | Bin
 .../textures/{block => blocks}/dried_sand.png     | Bin
 .../textures/{block => blocks}/dunegrass.png      | Bin
 .../textures/{block => blocks}/ethereal_log.png   | Bin
 .../{block => blocks}/ethereal_log_top.png        | Bin
 .../{block => blocks}/ethereal_planks.png         | Bin
 .../{block => blocks}/ethereal_trapdoor.png       | Bin
 .../{block => blocks}/farmland_dry_loamy.png      | Bin
 .../{block => blocks}/farmland_dry_sandy.png      | Bin
 .../{block => blocks}/farmland_dry_silty.png      | Bin
 .../{block => blocks}/farmland_moist_loamy.png    | Bin
 .../{block => blocks}/farmland_moist_sandy.png    | Bin
 .../{block => blocks}/farmland_moist_silty.png    | Bin
 .../textures/{block => blocks}/fir_log.png        | Bin
 .../textures/{block => blocks}/fir_log_top.png    | Bin
 .../textures/{block => blocks}/fir_planks.png     | Bin
 .../textures/{block => blocks}/fir_trapdoor.png   | Bin
 .../textures/{block => blocks}/flax_flowers.png   | Bin
 .../textures/{block => blocks}/flax_lower.png     | Bin
 .../textures/{block => blocks}/flax_upper.png     | Bin
 .../textures/{block => blocks}/flesh.png          | Bin
 .../textures/{block => blocks}/glowflower.png     | Bin
 .../textures/{block => blocks}/glowshroom.png     | Bin
 .../textures/{block => blocks}/goldenrod.png      | Bin
 .../{block => blocks}/grass_loamy_path_side.png   | Bin
 .../{block => blocks}/grass_loamy_side.png        | Bin
 .../{block => blocks}/grass_loamy_side_snowed.png | Bin
 .../{block => blocks}/grass_origin_side.png       | Bin
 .../grass_origin_side_snowed.png                  | Bin
 .../{block => blocks}/grass_origin_top.png        | Bin
 .../{block => blocks}/grass_sandy_path_side.png   | Bin
 .../{block => blocks}/grass_sandy_side.png        | Bin
 .../{block => blocks}/grass_sandy_side_snowed.png | Bin
 .../{block => blocks}/grass_side_overlay.png      | Bin
 .../{block => blocks}/grass_silty_path_side.png   | Bin
 .../{block => blocks}/grass_silty_side.png        | Bin
 .../{block => blocks}/grass_silty_side_snowed.png | Bin
 .../textures/{block => blocks}/grass_top.png      | Bin
 .../textures/{block => blocks}/hellbark_log.png   | Bin
 .../{block => blocks}/hellbark_log_top.png        | Bin
 .../{block => blocks}/hellbark_planks.png         | Bin
 .../hot_spring_water_flowing.png                  | Bin
 .../hot_spring_water_flowing.png.mcmeta           |   0
 .../{block => blocks}/hot_spring_water_still.png  | Bin
 .../hot_spring_water_still.png.mcmeta             |   0
 .../textures/{block => blocks}/ivy.png            | Bin
 .../textures/{block => blocks}/jacaranda_log.png  | Bin
 .../{block => blocks}/jacaranda_log_top.png       | Bin
 .../{block => blocks}/jacaranda_planks.png        | Bin
 .../{block => blocks}/jacaranda_trapdoor.png      | Bin
 .../textures/{block => blocks}/lavender.png       | Bin
 .../textures/{block => blocks}/leaves_dead.png    | Bin
 .../{block => blocks}/leaves_ethereal.png         | Bin
 .../textures/{block => blocks}/leaves_fir.png     | Bin
 .../{block => blocks}/leaves_flowering.png        | Bin
 .../{block => blocks}/leaves_flowering_fast.png   | Bin
 .../leaves_flowering_overlay.png                  | Bin
 .../{block => blocks}/leaves_hellbark.png         | Bin
 .../{block => blocks}/leaves_jacaranda.png        | Bin
 .../textures/{block => blocks}/leaves_magic.png   | Bin
 .../{block => blocks}/leaves_mahogany.png         | Bin
 .../textures/{block => blocks}/leaves_maple.png   | Bin
 .../{block => blocks}/leaves_orange_autumn.png    | Bin
 .../textures/{block => blocks}/leaves_origin.png  | Bin
 .../textures/{block => blocks}/leaves_palm.png    | Bin
 .../{block => blocks}/leaves_pink_cherry.png      | Bin
 .../textures/{block => blocks}/leaves_redwood.png | Bin
 .../textures/{block => blocks}/leaves_umbran.png  | Bin
 .../{block => blocks}/leaves_white_cherry.png     | Bin
 .../textures/{block => blocks}/leaves_willow.png  | Bin
 .../{block => blocks}/leaves_yellow_autumn.png    | Bin
 .../textures/{block => blocks}/magic_log.png      | Bin
 .../textures/{block => blocks}/magic_log_top.png  | Bin
 .../textures/{block => blocks}/magic_planks.png   | Bin
 .../textures/{block => blocks}/magic_trapdoor.png | Bin
 .../textures/{block => blocks}/mahogany_log.png   | Bin
 .../{block => blocks}/mahogany_log_top.png        | Bin
 .../{block => blocks}/mahogany_planks.png         | Bin
 .../{block => blocks}/mahogany_trapdoor.png       | Bin
 .../textures/{block => blocks}/mud.png            | Bin
 .../{block => blocks}/mud_brick_block.png         | Bin
 .../mycelial_netherrack_side.png                  | Bin
 .../textures/{block => blocks}/orange_cosmos.png  | Bin
 .../overgrown_netherrack_side.png                 | Bin
 .../overgrown_netherrack_top.png                  | Bin
 .../{block => blocks}/overgrown_stone_side.png    | Bin
 .../overgrown_stone_side_overlay.png              | Bin
 .../overgrown_stone_side_snowed.png               | Bin
 .../textures/{block => blocks}/palm_log.png       | Bin
 .../textures/{block => blocks}/palm_log_top.png   | Bin
 .../textures/{block => blocks}/palm_planks.png    | Bin
 .../textures/{block => blocks}/palm_trapdoor.png  | Bin
 .../textures/{block => blocks}/pink_daffodil.png  | Bin
 .../textures/{block => blocks}/pink_hibiscus.png  | Bin
 .../textures/{block => blocks}/redwood_log.png    | Bin
 .../{block => blocks}/redwood_log_top.png         | Bin
 .../textures/{block => blocks}/redwood_planks.png | Bin
 .../{block => blocks}/redwood_trapdoor.png        | Bin
 .../textures/{block => blocks}/reed.png           | Bin
 .../textures/{block => blocks}/reed_bottom.png    | Bin
 .../textures/{block => blocks}/root.png           | Bin
 .../textures/{block => blocks}/rose.png           | Bin
 .../textures/{block => blocks}/sapling_dead.png   | Bin
 .../{block => blocks}/sapling_ethereal.png        | Bin
 .../textures/{block => blocks}/sapling_fir.png    | Bin
 .../{block => blocks}/sapling_flowering.png       | Bin
 .../{block => blocks}/sapling_hellbark.png        | Bin
 .../{block => blocks}/sapling_jacaranda.png       | Bin
 .../textures/{block => blocks}/sapling_magic.png  | Bin
 .../{block => blocks}/sapling_mahogany.png        | Bin
 .../textures/{block => blocks}/sapling_maple.png  | Bin
 .../{block => blocks}/sapling_orange_autumn.png   | Bin
 .../textures/{block => blocks}/sapling_origin.png | Bin
 .../textures/{block => blocks}/sapling_palm.png   | Bin
 .../{block => blocks}/sapling_pink_cherry.png     | Bin
 .../{block => blocks}/sapling_redwood.png         | Bin
 .../textures/{block => blocks}/sapling_umbran.png | Bin
 .../{block => blocks}/sapling_white_cherry.png    | Bin
 .../textures/{block => blocks}/sapling_willow.png | Bin
 .../{block => blocks}/sapling_yellow_autumn.png   | Bin
 .../textures/{block => blocks}/shortgrass.png     | Bin
 .../{block => blocks}/spectral_moss_side.png      | Bin
 .../{block => blocks}/spectral_moss_top.png       | Bin
 .../textures/{block => blocks}/spectralfern.png   | Bin
 .../{block => blocks}/stripped_cherry_log.png     | Bin
 .../{block => blocks}/stripped_cherry_log_top.png | Bin
 .../{block => blocks}/stripped_ethereal_log.png   | Bin
 .../stripped_ethereal_log_top.png                 | Bin
 .../{block => blocks}/stripped_fir_log.png        | Bin
 .../{block => blocks}/stripped_fir_log_top.png    | Bin
 .../{block => blocks}/stripped_jacaranda_log.png  | Bin
 .../stripped_jacaranda_log_top.png                | Bin
 .../{block => blocks}/stripped_magic_log.png      | Bin
 .../{block => blocks}/stripped_magic_log_top.png  | Bin
 .../{block => blocks}/stripped_mahogany_log.png   | Bin
 .../stripped_mahogany_log_top.png                 | Bin
 .../{block => blocks}/stripped_palm_log.png       | Bin
 .../{block => blocks}/stripped_palm_log_top.png   | Bin
 .../{block => blocks}/stripped_redwood_log.png    | Bin
 .../stripped_redwood_log_top.png                  | Bin
 .../{block => blocks}/stripped_umbran_log.png     | Bin
 .../{block => blocks}/stripped_umbran_log_top.png | Bin
 .../{block => blocks}/stripped_willow_log.png     | Bin
 .../{block => blocks}/stripped_willow_log_top.png | Bin
 .../{block => blocks}/tall_cattail_lower.png      | Bin
 .../{block => blocks}/tall_cattail_upper.png      | Bin
 .../textures/{block => blocks}/thorn.png          | Bin
 .../textures/{block => blocks}/tinycactus.png     | Bin
 .../textures/{block => blocks}/toadstool.png      | Bin
 .../textures/{block => blocks}/umbran_log.png     | Bin
 .../textures/{block => blocks}/umbran_log_top.png | Bin
 .../textures/{block => blocks}/umbran_planks.png  | Bin
 .../{block => blocks}/umbran_trapdoor.png         | Bin
 .../textures/{block => blocks}/violet.png         | Bin
 .../textures/{block => blocks}/watergrass.png     | Bin
 .../{block => blocks}/watergrass_bottom.png       | Bin
 .../textures/{block => blocks}/wheatgrass.png     | Bin
 .../textures/{block => blocks}/white_sand.png     | Bin
 .../{block => blocks}/white_sandstone_bottom.png  | Bin
 .../{block => blocks}/white_sandstone_carved.png  | Bin
 .../{block => blocks}/white_sandstone_normal.png  | Bin
 .../{block => blocks}/white_sandstone_smooth.png  | Bin
 .../{block => blocks}/white_sandstone_top.png     | Bin
 .../textures/{block => blocks}/wildflower.png     | Bin
 .../textures/{block => blocks}/willow_log.png     | Bin
 .../textures/{block => blocks}/willow_log_top.png | Bin
 .../textures/{block => blocks}/willow_planks.png  | Bin
 .../{block => blocks}/willow_trapdoor.png         | Bin
 .../textures/{block => blocks}/willow_vine.png    | Bin
 .../textures/{block => blocks}/wilted_lily.png    | Bin
 .../textures/{item => items}/ash.png              | Bin
 .../textures/{item => items}/berries.png          | Bin
 .../textures/{item => items}/berrybush.png        | Bin
 .../textures/{item => items}/blood_bucket.png     | Bin
 .../textures/{item => items}/boat_cherry.png      | Bin
 .../textures/{item => items}/boat_ethereal.png    | Bin
 .../textures/{item => items}/boat_fir.png         | Bin
 .../textures/{item => items}/boat_hellbark.png    | Bin
 .../textures/{item => items}/boat_jacaranda.png   | Bin
 .../textures/{item => items}/boat_magic.png       | Bin
 .../textures/{item => items}/boat_mahogany.png    | Bin
 .../textures/{item => items}/boat_palm.png        | Bin
 .../textures/{item => items}/boat_redwood.png     | Bin
 .../textures/{item => items}/boat_umbran.png      | Bin
 .../textures/{item => items}/boat_willow.png      | Bin
 .../textures/{item => items}/bop_icon.png         | Bin
 .../textures/{item => items}/bush.png             | Bin
 .../textures/{item => items}/cattail.png          | Bin
 .../textures/{item => items}/door_cherry.png      | Bin
 .../textures/{item => items}/door_ethereal.png    | Bin
 .../textures/{item => items}/door_fir.png         | Bin
 .../textures/{item => items}/door_hellbark.png    | Bin
 .../textures/{item => items}/door_jacaranda.png   | Bin
 .../textures/{item => items}/door_magic.png       | Bin
 .../textures/{item => items}/door_mahogany.png    | Bin
 .../textures/{item => items}/door_palm.png        | Bin
 .../textures/{item => items}/door_redwood.png     | Bin
 .../textures/{item => items}/door_umbran.png      | Bin
 .../textures/{item => items}/door_willow.png      | Bin
 .../textures/{item => items}/flax.png             | Bin
 .../textures/{item => items}/fleshchunk.png       | Bin
 .../{item => items}/hot_spring_water_bucket.png   | Bin
 .../textures/{item => items}/leaves_flowering.png | Bin
 .../textures/{item => items}/mud_brick.png        | Bin
 .../textures/{item => items}/mudball.png          | Bin
 .../textures/{item => items}/peach.png            | Bin
 .../textures/{item => items}/pear.png             | Bin
 .../textures/{item => items}/persimmon.png        | Bin
 .../textures/{item => items}/record_wanderer.png  | Bin
 .../textures/{item => items}/reed.png             | Bin
 .../textures/{item => items}/root.png             | Bin
 .../textures/{item => items}/watergrass.png       | Bin
 272 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/assets/biomesoplenty/models/block/ash_block.json.rej
 create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/ash_block.png
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/barley.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/berrybush.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/berrybush_berry.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blood_flowing.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blood_flowing.png.mcmeta (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blood_still.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blood_still.png.mcmeta (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blue_fire_layer_0.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blue_fire_layer_0.png.mcmeta (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blue_fire_layer_1.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blue_fire_layer_1.png.mcmeta (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/blue_hydrangea.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/bramble_plant.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/bramble_thorns.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/burning_blossom.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/bush.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/bush_branch.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/cattail.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/cherry_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/cherry_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/cherry_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/cherry_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/coarse_dirt_loamy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/coarse_dirt_sandy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/coarse_dirt_silty.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/dead_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/dead_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/deadgrass.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/deadleafpile.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/deathbloom.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/desertgrass.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/devilweed.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/dirt_loamy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/dirt_sandy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/dirt_silty.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_cherry_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_cherry_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_ethereal_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_ethereal_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_fir_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_fir_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_hellbark_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_hellbark_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_jacaranda_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_jacaranda_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_magic_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_magic_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_mahogany_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_mahogany_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_palm_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_palm_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_redwood_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_redwood_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_umbran_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_umbran_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_willow_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/door_willow_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/dried_sand.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/dunegrass.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/ethereal_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/ethereal_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/ethereal_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/ethereal_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/farmland_dry_loamy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/farmland_dry_sandy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/farmland_dry_silty.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/farmland_moist_loamy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/farmland_moist_sandy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/farmland_moist_silty.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/fir_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/fir_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/fir_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/fir_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/flax_flowers.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/flax_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/flax_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/flesh.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/glowflower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/glowshroom.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/goldenrod.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_loamy_path_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_loamy_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_loamy_side_snowed.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_origin_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_origin_side_snowed.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_origin_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_sandy_path_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_sandy_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_sandy_side_snowed.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_side_overlay.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_silty_path_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_silty_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_silty_side_snowed.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/grass_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/hellbark_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/hellbark_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/hellbark_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/hot_spring_water_flowing.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/hot_spring_water_flowing.png.mcmeta (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/hot_spring_water_still.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/hot_spring_water_still.png.mcmeta (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/ivy.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/jacaranda_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/jacaranda_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/jacaranda_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/jacaranda_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/lavender.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_dead.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_ethereal.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_fir.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_flowering.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_flowering_fast.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_flowering_overlay.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_hellbark.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_jacaranda.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_magic.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_mahogany.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_maple.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_orange_autumn.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_origin.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_palm.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_pink_cherry.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_redwood.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_umbran.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_white_cherry.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_willow.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/leaves_yellow_autumn.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/magic_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/magic_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/magic_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/magic_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/mahogany_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/mahogany_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/mahogany_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/mahogany_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/mud.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/mud_brick_block.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/mycelial_netherrack_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/orange_cosmos.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/overgrown_netherrack_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/overgrown_netherrack_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/overgrown_stone_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/overgrown_stone_side_overlay.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/overgrown_stone_side_snowed.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/palm_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/palm_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/palm_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/palm_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/pink_daffodil.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/pink_hibiscus.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/redwood_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/redwood_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/redwood_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/redwood_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/reed.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/reed_bottom.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/root.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/rose.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_dead.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_ethereal.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_fir.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_flowering.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_hellbark.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_jacaranda.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_magic.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_mahogany.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_maple.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_orange_autumn.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_origin.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_palm.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_pink_cherry.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_redwood.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_umbran.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_white_cherry.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_willow.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/sapling_yellow_autumn.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/shortgrass.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/spectral_moss_side.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/spectral_moss_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/spectralfern.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_cherry_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_cherry_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_ethereal_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_ethereal_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_fir_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_fir_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_jacaranda_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_jacaranda_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_magic_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_magic_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_mahogany_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_mahogany_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_palm_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_palm_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_redwood_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_redwood_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_umbran_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_umbran_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_willow_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/stripped_willow_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/tall_cattail_lower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/tall_cattail_upper.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/thorn.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/tinycactus.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/toadstool.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/umbran_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/umbran_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/umbran_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/umbran_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/violet.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/watergrass.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/watergrass_bottom.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/wheatgrass.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/white_sand.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/white_sandstone_bottom.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/white_sandstone_carved.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/white_sandstone_normal.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/white_sandstone_smooth.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/white_sandstone_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/wildflower.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/willow_log.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/willow_log_top.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/willow_planks.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/willow_trapdoor.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/willow_vine.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{block => blocks}/wilted_lily.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/ash.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/berries.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/berrybush.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/blood_bucket.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_cherry.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_ethereal.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_fir.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_hellbark.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_jacaranda.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_magic.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_mahogany.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_palm.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_redwood.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_umbran.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/boat_willow.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/bop_icon.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/bush.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/cattail.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_cherry.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_ethereal.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_fir.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_hellbark.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_jacaranda.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_magic.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_mahogany.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_palm.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_redwood.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_umbran.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/door_willow.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/flax.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/fleshchunk.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/hot_spring_water_bucket.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/leaves_flowering.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/mud_brick.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/mudball.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/peach.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/pear.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/persimmon.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/record_wanderer.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/reed.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/root.png (100%)
 rename src/main/resources/assets/biomesoplenty/textures/{item => items}/watergrass.png (100%)

diff --git a/src/main/java/biomesoplenty/init/ModItems.java b/src/main/java/biomesoplenty/init/ModItems.java
index 5b38e741b..bfa34f502 100644
--- a/src/main/java/biomesoplenty/init/ModItems.java
+++ b/src/main/java/biomesoplenty/init/ModItems.java
@@ -35,7 +35,7 @@ public class ModItems
         fleshchunk = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "fleshchunk");
 
         // TODO: This needs to be ItemBOPRecord and/or registered with its sounds
-        //record_wanderer = registerItem(new ItemBOPRecord(BOPSounds.records_wanderer), "record_wanderer");
+        record_wanderer = registerItem(new ItemBOPRecord(BOPSounds.records_wanderer), "record_wanderer");
 
         // TODO: These all need to be associated with their entities
         boat_fir = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "boat_fir");
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json
index e3304b3f7..c6f5ffc9b 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json
@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "biomesoplenty:block/ash_block"
+        "all": "biomesoplenty:blocks/ash_block"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json.rej b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json.rej
new file mode 100644
index 000000000..75ccb07f5
--- /dev/null
+++ b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json.rej
@@ -0,0 +1,9 @@
+diff a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json	(rejected hunks)
+@@ -1,6 +1,6 @@
+ {
+     "parent": "block/cube_all",
+     "textures": {
+-        "all": "biomesoplenty:blocks/ash_block"
++        "all": "biomesoplenty:block/ash_block"
+     }
+ }
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ash_block.png b/src/main/resources/assets/biomesoplenty/textures/blocks/ash_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..af36ebf3be9bb04be8f5b27281fed96dc6dfc277
GIT binary patch
literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004eNkl<ZI8P<g2@--Z429v|0vSdTcia_s
zQSN^$KTK!rw8_h#*I*h92B*_$I2^84tHok*KA-3Fxya>m8IQ*fd7d{-lVzFgZnsOD
z&8DiV>-Bm(9@p!&P*D`rv)RnPTrLlX!+yU9as^EipU=ld8Io&RmeIscUDx$=I#sDm
zFags|CKKuB^Qn~rt)wm8ZnxX^zv7yxN28G_Z+Kvl(^HwnI-CyBvWaOYeu$*ikm{!X
z@pzE(4N7{y-}?d<rBNxuG}!C)a&@qOzhA*Xcws`7fC1*-vrN-W@O03eS}?fw#63ST
z3c8@$*?@5PKe+GDyyE0X4W=DY+qQV`_uC}ADiB;~Xodv6C4OQK2BJQe&O|J!x8R)n
z59jCOBk36PapobuCY(wiM-8ZdP(LMUQ483+|DLxLjM)(_sVGkR@+w5cRg747agHs|
z4S|$+l6DV(G$aG;S$uOV;<=1CFqu3Q41l`pI+h?U2%|G=xcC~*bzT1eKA?nWXrFL_
P00000NkvXXu0mjf-@D>(

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/biomesoplenty/textures/block/barley.png b/src/main/resources/assets/biomesoplenty/textures/blocks/barley.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/barley.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/barley.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/berrybush.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/berrybush_berry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/berrybush_berry.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blood_flowing.png b/src/main/resources/assets/biomesoplenty/textures/blocks/blood_flowing.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blood_flowing.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blood_flowing.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blood_flowing.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/blocks/blood_flowing.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blood_flowing.png.mcmeta
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blood_flowing.png.mcmeta
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blood_still.png b/src/main/resources/assets/biomesoplenty/textures/blocks/blood_still.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blood_still.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blood_still.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blood_still.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/blocks/blood_still.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blood_still.png.mcmeta
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blood_still.png.mcmeta
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_0.png b/src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_0.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_0.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_0.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_0.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_0.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_0.png.mcmeta
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_0.png.mcmeta
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_1.png b/src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_1.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_1.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_1.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_1.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_1.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_1.png.mcmeta
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_1.png.mcmeta
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/blue_hydrangea.png b/src/main/resources/assets/biomesoplenty/textures/blocks/blue_hydrangea.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/blue_hydrangea.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/blue_hydrangea.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/bramble_plant.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bramble_plant.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/bramble_plant.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/bramble_plant.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/bramble_thorns.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bramble_thorns.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/bramble_thorns.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/bramble_thorns.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/burning_blossom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/burning_blossom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/bush.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/bush.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/bush.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/bush_branch.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bush_branch.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/bush_branch.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/bush_branch.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cattail.png b/src/main/resources/assets/biomesoplenty/textures/blocks/cattail.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/cattail.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/cattail.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cherry_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/cherry_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cherry_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/cherry_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cherry_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/cherry_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/cherry_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cherry_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/cherry_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/cherry_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_loamy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_loamy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_loamy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_loamy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_sandy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_sandy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_sandy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_sandy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_silty.png b/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_silty.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_silty.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_silty.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/dead_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/dead_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/dead_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/dead_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/deadgrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/deadgrass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/deadgrass.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/deadgrass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/deadleafpile.png b/src/main/resources/assets/biomesoplenty/textures/blocks/deadleafpile.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/deadleafpile.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/deadleafpile.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/deathbloom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/deathbloom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/deathbloom.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/deathbloom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/desertgrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/desertgrass.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/devilweed.png b/src/main/resources/assets/biomesoplenty/textures/blocks/devilweed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/devilweed.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/devilweed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/dirt_loamy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dirt_loamy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/dirt_loamy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/dirt_loamy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/dirt_sandy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dirt_sandy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/dirt_sandy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/dirt_sandy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/dirt_silty.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dirt_silty.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/dirt_silty.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/dirt_silty.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_cherry_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_cherry_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_cherry_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_cherry_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_cherry_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_cherry_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_cherry_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_cherry_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_ethereal_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_ethereal_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_ethereal_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_ethereal_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_ethereal_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_ethereal_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_ethereal_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_ethereal_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_fir_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_fir_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_fir_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_fir_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_fir_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_fir_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_fir_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_fir_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_hellbark_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_hellbark_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_hellbark_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_hellbark_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_hellbark_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_hellbark_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_hellbark_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_hellbark_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_jacaranda_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_jacaranda_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_jacaranda_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_jacaranda_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_jacaranda_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_jacaranda_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_jacaranda_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_jacaranda_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_magic_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_magic_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_magic_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_magic_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_magic_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_magic_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_magic_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_magic_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_mahogany_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_mahogany_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_mahogany_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_mahogany_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_mahogany_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_mahogany_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_mahogany_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_mahogany_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_palm_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_palm_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_palm_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_palm_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_palm_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_palm_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_palm_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_palm_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_redwood_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_redwood_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_redwood_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_redwood_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_redwood_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_redwood_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_redwood_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_redwood_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_umbran_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_umbran_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_umbran_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_umbran_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_willow_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_willow_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_willow_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_willow_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/door_willow_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/door_willow_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/door_willow_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/door_willow_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/dried_sand.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dried_sand.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/dried_sand.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/dried_sand.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/dunegrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dunegrass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/dunegrass.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/dunegrass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/ethereal_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/ethereal_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/ethereal_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/ethereal_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/ethereal_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/ethereal_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/ethereal_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/ethereal_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_loamy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_loamy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_loamy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_loamy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_sandy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_sandy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_sandy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_sandy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_silty.png b/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_silty.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_silty.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_silty.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_loamy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_loamy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_loamy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_loamy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_sandy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_sandy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_sandy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_sandy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_silty.png b/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_silty.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_silty.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_silty.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/fir_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/fir_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/fir_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/fir_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/fir_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/fir_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/fir_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/fir_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/fir_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/fir_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/fir_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/fir_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/fir_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/fir_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/fir_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/fir_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/flax_flowers.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/flax_flowers.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/flax_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flax_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/flax_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/flax_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/flax_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flax_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/flax_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/flax_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/flesh.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flesh.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/flesh.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/flesh.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/glowflower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/glowflower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/glowflower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/glowflower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/glowshroom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/glowshroom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/glowshroom.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/glowshroom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/goldenrod.png b/src/main/resources/assets/biomesoplenty/textures/blocks/goldenrod.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/goldenrod.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/goldenrod.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_path_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_path_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_path_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_path_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_side_snowed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_side_snowed.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_side_snowed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_origin_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_origin_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_origin_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_side_snowed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_origin_side_snowed.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_side_snowed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_origin_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_origin_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_path_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_path_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_path_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_path_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_side_snowed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_side_snowed.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_side_snowed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_side_overlay.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_side_overlay.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_side_overlay.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_side_overlay.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_silty_path_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_path_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_silty_path_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_path_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_silty_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_silty_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_silty_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_side_snowed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_silty_side_snowed.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_side_snowed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/grass_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/grass_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/grass_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/hellbark_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/hellbark_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/hellbark_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/hellbark_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/hellbark_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/hellbark_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_flowing.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_flowing.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_flowing.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_flowing.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_flowing.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_flowing.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_flowing.png.mcmeta
rename to src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_flowing.png.mcmeta
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_still.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_still.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_still.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_still.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_still.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_still.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_still.png.mcmeta
rename to src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_still.png.mcmeta
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/ivy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/ivy.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/ivy.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/ivy.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/jacaranda_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/jacaranda_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/lavender.png b/src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/lavender.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_dead.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_dead.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_dead.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_dead.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_ethereal.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_ethereal.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_ethereal.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_fir.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_fir.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_fir.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_fir.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering_fast.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering_fast.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering_fast.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering_fast.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering_overlay.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering_overlay.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering_overlay.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering_overlay.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_hellbark.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_hellbark.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_hellbark.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_hellbark.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_jacaranda.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_jacaranda.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_jacaranda.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_jacaranda.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_magic.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_magic.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_magic.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_magic.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_mahogany.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_maple.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_maple.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_maple.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_maple.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_orange_autumn.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_orange_autumn.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_orange_autumn.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_orange_autumn.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_origin.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_origin.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_origin.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_origin.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_palm.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_palm.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_palm.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_palm.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_pink_cherry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_pink_cherry.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_pink_cherry.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_pink_cherry.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_redwood.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_redwood.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_redwood.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_redwood.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_umbran.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_umbran.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_umbran.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_umbran.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_white_cherry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_white_cherry.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_white_cherry.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_white_cherry.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_willow.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_willow.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_willow.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_willow.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/leaves_yellow_autumn.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_yellow_autumn.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/leaves_yellow_autumn.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/leaves_yellow_autumn.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/magic_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/magic_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/magic_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/magic_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/magic_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/magic_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/magic_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/magic_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/magic_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/magic_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/magic_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/magic_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/magic_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/magic_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/magic_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/magic_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mahogany_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/mahogany_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mahogany_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/mahogany_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mahogany_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/mahogany_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mahogany_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/mahogany_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mud.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mud.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/mud.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/mud.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mud_brick_block.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mud_brick_block.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/mud_brick_block.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/mud_brick_block.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mycelial_netherrack_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mycelial_netherrack_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/mycelial_netherrack_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/mycelial_netherrack_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png b/src/main/resources/assets/biomesoplenty/textures/blocks/orange_cosmos.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/orange_cosmos.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/overgrown_netherrack_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_netherrack_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/overgrown_netherrack_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_netherrack_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/overgrown_netherrack_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_netherrack_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/overgrown_netherrack_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_netherrack_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side_overlay.png b/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side_overlay.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side_overlay.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side_overlay.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side_snowed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side_snowed.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side_snowed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/palm_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/palm_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/palm_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/palm_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/palm_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/palm_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/palm_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/palm_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/palm_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/palm_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/palm_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/palm_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/palm_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/palm_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/palm_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/palm_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/pink_daffodil.png b/src/main/resources/assets/biomesoplenty/textures/blocks/pink_daffodil.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/pink_daffodil.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/pink_daffodil.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/pink_hibiscus.png b/src/main/resources/assets/biomesoplenty/textures/blocks/pink_hibiscus.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/pink_hibiscus.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/pink_hibiscus.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/redwood_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/redwood_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/redwood_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/redwood_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/redwood_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/redwood_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/reed.png b/src/main/resources/assets/biomesoplenty/textures/blocks/reed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/reed.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/reed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/reed_bottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/reed_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/reed_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/reed_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/root.png b/src/main/resources/assets/biomesoplenty/textures/blocks/root.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/root.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/root.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/rose.png b/src/main/resources/assets/biomesoplenty/textures/blocks/rose.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/rose.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/rose.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_dead.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_dead.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_dead.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_dead.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_ethereal.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_ethereal.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_ethereal.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_fir.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_fir.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_fir.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_fir.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_flowering.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_flowering.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_flowering.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_flowering.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_hellbark.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_hellbark.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_hellbark.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_hellbark.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_jacaranda.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_jacaranda.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_jacaranda.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_jacaranda.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_magic.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_magic.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_magic.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_magic.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_mahogany.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_mahogany.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_mahogany.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_maple.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_maple.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_maple.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_maple.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_orange_autumn.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_orange_autumn.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_orange_autumn.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_orange_autumn.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_origin.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_origin.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_origin.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_origin.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_palm.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_palm.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_palm.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_palm.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_pink_cherry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_pink_cherry.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_pink_cherry.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_pink_cherry.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_redwood.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_redwood.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_redwood.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_redwood.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_umbran.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_umbran.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_umbran.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_umbran.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_white_cherry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_white_cherry.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_white_cherry.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_white_cherry.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_willow.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_willow.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_willow.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_willow.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/sapling_yellow_autumn.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_yellow_autumn.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/sapling_yellow_autumn.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/sapling_yellow_autumn.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/shortgrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/shortgrass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/shortgrass.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/shortgrass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/spectral_moss_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/spectral_moss_side.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/spectral_moss_side.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/spectral_moss_side.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/spectral_moss_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/spectral_moss_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/spectral_moss_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/spectral_moss_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/spectralfern.png b/src/main/resources/assets/biomesoplenty/textures/blocks/spectralfern.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/spectralfern.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/spectralfern.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_cherry_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_cherry_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_cherry_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_cherry_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_ethereal_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_ethereal_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_ethereal_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_ethereal_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_fir_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_fir_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_fir_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_fir_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_jacaranda_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_jacaranda_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_jacaranda_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_jacaranda_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_magic_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_magic_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_magic_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_magic_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_mahogany_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_mahogany_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_mahogany_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_mahogany_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_palm_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_palm_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_palm_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_palm_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_redwood_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_redwood_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_redwood_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_redwood_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_umbran_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_umbran_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_umbran_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_umbran_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_willow_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_willow_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_willow_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/stripped_willow_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_lower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_lower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_lower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_upper.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_upper.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_upper.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/thorn.png b/src/main/resources/assets/biomesoplenty/textures/blocks/thorn.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/thorn.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/thorn.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/tinycactus.png b/src/main/resources/assets/biomesoplenty/textures/blocks/tinycactus.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/tinycactus.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/tinycactus.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/toadstool.png b/src/main/resources/assets/biomesoplenty/textures/blocks/toadstool.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/toadstool.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/toadstool.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/umbran_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/umbran_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/umbran_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/umbran_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/umbran_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/umbran_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/umbran_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/umbran_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/violet.png b/src/main/resources/assets/biomesoplenty/textures/blocks/violet.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/violet.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/violet.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/watergrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/watergrass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/watergrass.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/watergrass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/watergrass_bottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/watergrass_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/watergrass_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/watergrass_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/wheatgrass.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wheatgrass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/wheatgrass.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/wheatgrass.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/white_sand.png b/src/main/resources/assets/biomesoplenty/textures/blocks/white_sand.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/white_sand.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/white_sand.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_bottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_bottom.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_bottom.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_bottom.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_carved.png b/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_carved.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_carved.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_carved.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_normal.png b/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_normal.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_normal.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_normal.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_smooth.png b/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_smooth.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_smooth.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_smooth.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/wildflower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wildflower.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/wildflower.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/wildflower.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/willow_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/willow_log.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/willow_log.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/willow_log.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/willow_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/willow_log_top.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/willow_log_top.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/willow_log_top.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/willow_planks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/willow_planks.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/willow_planks.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/willow_planks.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/willow_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/willow_trapdoor.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/willow_trapdoor.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/willow_trapdoor.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/willow_vine.png b/src/main/resources/assets/biomesoplenty/textures/blocks/willow_vine.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/willow_vine.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/willow_vine.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/wilted_lily.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/block/wilted_lily.png
rename to src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/ash.png b/src/main/resources/assets/biomesoplenty/textures/items/ash.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/ash.png
rename to src/main/resources/assets/biomesoplenty/textures/items/ash.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/berries.png b/src/main/resources/assets/biomesoplenty/textures/items/berries.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/berries.png
rename to src/main/resources/assets/biomesoplenty/textures/items/berries.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/berrybush.png
rename to src/main/resources/assets/biomesoplenty/textures/items/berrybush.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/blood_bucket.png b/src/main/resources/assets/biomesoplenty/textures/items/blood_bucket.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/blood_bucket.png
rename to src/main/resources/assets/biomesoplenty/textures/items/blood_bucket.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_cherry.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_cherry.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_cherry.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_cherry.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_ethereal.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_ethereal.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_ethereal.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_fir.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_fir.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_fir.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_fir.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_hellbark.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_hellbark.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_hellbark.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_hellbark.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_jacaranda.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_jacaranda.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_jacaranda.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_jacaranda.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_magic.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_magic.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_magic.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_magic.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_mahogany.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_mahogany.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_mahogany.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_palm.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_palm.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_palm.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_palm.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_redwood.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_redwood.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_redwood.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_redwood.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_umbran.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_umbran.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_umbran.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_umbran.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/boat_willow.png b/src/main/resources/assets/biomesoplenty/textures/items/boat_willow.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/boat_willow.png
rename to src/main/resources/assets/biomesoplenty/textures/items/boat_willow.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/bop_icon.png b/src/main/resources/assets/biomesoplenty/textures/items/bop_icon.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/bop_icon.png
rename to src/main/resources/assets/biomesoplenty/textures/items/bop_icon.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/bush.png b/src/main/resources/assets/biomesoplenty/textures/items/bush.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/bush.png
rename to src/main/resources/assets/biomesoplenty/textures/items/bush.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/cattail.png b/src/main/resources/assets/biomesoplenty/textures/items/cattail.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/cattail.png
rename to src/main/resources/assets/biomesoplenty/textures/items/cattail.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_cherry.png b/src/main/resources/assets/biomesoplenty/textures/items/door_cherry.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_cherry.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_cherry.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/items/door_ethereal.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_ethereal.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_ethereal.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_fir.png b/src/main/resources/assets/biomesoplenty/textures/items/door_fir.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_fir.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_fir.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_hellbark.png b/src/main/resources/assets/biomesoplenty/textures/items/door_hellbark.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_hellbark.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_hellbark.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_jacaranda.png b/src/main/resources/assets/biomesoplenty/textures/items/door_jacaranda.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_jacaranda.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_jacaranda.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_magic.png b/src/main/resources/assets/biomesoplenty/textures/items/door_magic.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_magic.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_magic.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/items/door_mahogany.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_mahogany.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_mahogany.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_palm.png b/src/main/resources/assets/biomesoplenty/textures/items/door_palm.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_palm.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_palm.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_redwood.png b/src/main/resources/assets/biomesoplenty/textures/items/door_redwood.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_redwood.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_redwood.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_umbran.png b/src/main/resources/assets/biomesoplenty/textures/items/door_umbran.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_umbran.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_umbran.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/door_willow.png b/src/main/resources/assets/biomesoplenty/textures/items/door_willow.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/door_willow.png
rename to src/main/resources/assets/biomesoplenty/textures/items/door_willow.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/flax.png b/src/main/resources/assets/biomesoplenty/textures/items/flax.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/flax.png
rename to src/main/resources/assets/biomesoplenty/textures/items/flax.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/fleshchunk.png b/src/main/resources/assets/biomesoplenty/textures/items/fleshchunk.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/fleshchunk.png
rename to src/main/resources/assets/biomesoplenty/textures/items/fleshchunk.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/hot_spring_water_bucket.png b/src/main/resources/assets/biomesoplenty/textures/items/hot_spring_water_bucket.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/hot_spring_water_bucket.png
rename to src/main/resources/assets/biomesoplenty/textures/items/hot_spring_water_bucket.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/leaves_flowering.png b/src/main/resources/assets/biomesoplenty/textures/items/leaves_flowering.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/leaves_flowering.png
rename to src/main/resources/assets/biomesoplenty/textures/items/leaves_flowering.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/mud_brick.png b/src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/mud_brick.png
rename to src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/mudball.png b/src/main/resources/assets/biomesoplenty/textures/items/mudball.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/mudball.png
rename to src/main/resources/assets/biomesoplenty/textures/items/mudball.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/peach.png b/src/main/resources/assets/biomesoplenty/textures/items/peach.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/peach.png
rename to src/main/resources/assets/biomesoplenty/textures/items/peach.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/pear.png b/src/main/resources/assets/biomesoplenty/textures/items/pear.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/pear.png
rename to src/main/resources/assets/biomesoplenty/textures/items/pear.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/persimmon.png b/src/main/resources/assets/biomesoplenty/textures/items/persimmon.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/persimmon.png
rename to src/main/resources/assets/biomesoplenty/textures/items/persimmon.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/record_wanderer.png b/src/main/resources/assets/biomesoplenty/textures/items/record_wanderer.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/record_wanderer.png
rename to src/main/resources/assets/biomesoplenty/textures/items/record_wanderer.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/reed.png b/src/main/resources/assets/biomesoplenty/textures/items/reed.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/reed.png
rename to src/main/resources/assets/biomesoplenty/textures/items/reed.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/root.png b/src/main/resources/assets/biomesoplenty/textures/items/root.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/root.png
rename to src/main/resources/assets/biomesoplenty/textures/items/root.png
diff --git a/src/main/resources/assets/biomesoplenty/textures/item/watergrass.png b/src/main/resources/assets/biomesoplenty/textures/items/watergrass.png
similarity index 100%
rename from src/main/resources/assets/biomesoplenty/textures/item/watergrass.png
rename to src/main/resources/assets/biomesoplenty/textures/items/watergrass.png