diff --git a/src/main/java/techreborn/events/ModelRegistryEventHandler.java b/src/main/java/techreborn/events/ModelRegistryEventHandler.java index bfebada07..5fc312fb8 100644 --- a/src/main/java/techreborn/events/ModelRegistryEventHandler.java +++ b/src/main/java/techreborn/events/ModelRegistryEventHandler.java @@ -55,7 +55,7 @@ public class ModelRegistryEventHandler { registerFluidBlocks(); registerItems(); ModelDynamicCell.init(); - RebornModelRegistry.registerModels(TechReborn.MOD_ID); + //RebornModelRegistry.registerModels(TechReborn.MOD_ID); } private static void registerBlocks() { diff --git a/src/main/resources/assets/techreborn/blockstates/grinder.json b/src/main/resources/assets/techreborn/blockstates/grinder.json new file mode 100644 index 000000000..ada1248ad --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/grinder.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,active=false": { "model": "techreborn:block/grinder" }, + "facing=south,active=false": { "model": "techreborn:block/grinder", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/grinder", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/grinder", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/grinder_on" }, + "facing=south,active=true": { "model": "techreborn:block/grinder_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/grinder_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/grinder_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/models/block/grinder.json b/src/main/resources/assets/techreborn/models/block/grinder.json new file mode 100644 index 000000000..f1f48a257 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/grinder.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "techreborn:block/machines/tier1_machines/grinder_top_off", + "front": "techreborn:block/machines/tier1_machines/grinder_front_off", + "side": "techreborn:block/machines/tier1_machines/machine_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/grinder_on.json b/src/main/resources/assets/techreborn/models/block/grinder_on.json new file mode 100644 index 000000000..cfa5403f5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/grinder_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "techreborn:block/machines/tier1_machines/grinder_top_on", + "front": "techreborn:block/machines/tier1_machines/grinder_front_on", + "side": "techreborn:block/machines/tier1_machines/machine_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_inventory.json b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_inventory.json index bf8f400bc..9b22bb5c9 100644 --- a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_inventory.json +++ b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_inventory.json @@ -1,6 +1,6 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "blocks/iron_block" + "texture": "block/iron_block" } } diff --git a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_post.json b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_post.json index 3bc4d52e6..1a7a38171 100644 --- a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_post.json +++ b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_post.json @@ -1,6 +1,6 @@ { "parent": "block/fence_post", "textures": { - "texture": "blocks/iron_block" + "texture": "block/iron_block" } } diff --git a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_side.json b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_side.json index 09e893da1..e3743bb1d 100644 --- a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_side.json +++ b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_side.json @@ -1,6 +1,6 @@ { "parent": "block/fence_side", "textures": { - "texture": "blocks/iron_block" + "texture": "block/iron_block" } } diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/copper_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/copper_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/copper_insulated_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/copper_insulated_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/glass_fiber_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/glass_fiber_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/glass_fiber_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/glass_fiber_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/gold_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/gold_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/gold_insulated_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/gold_insulated_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/hv_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/hv_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/hv_insulated_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/hv_insulated_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/superconductor_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/superconductor_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/superconductor_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/superconductor_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/cables/tin_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/tin_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/cables/tin_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/tin_cable.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/berylium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/berylium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/berylium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/berylium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/berylium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/berylium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/berylium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/berylium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/calcium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/calcium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/calcium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/calcium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/calcium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/calciumcarbonate_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/calciumcarbonate_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/calciumcarbonate_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/calciumcarbonate_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/calciumcarbonate_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/calciumcarbonate_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/calciumcarbonate_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/calciumcarbonate_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/carbon_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/carbonfiber_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/carbonfiber_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/carbonfiber_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/carbonfiber_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/chlorite_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/chlorite_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/chlorite_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/chlorite_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/chlorite_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/compressedair_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/compressedair_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/compressedair_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/compressedair_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/deuterium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/deuterium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/deuterium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/deuterium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/deuterium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/diesel_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzedwater_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/electrolyzedwater_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/electrolyzedwater_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/electrolyzedwater_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/glyceryl_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/glyceryl_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/glyceryl_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/glyceryl_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/glyceryl_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/helium3_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/helium3_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/helium3_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/helium3_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/helium3_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/helium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/helium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/helium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/helium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/helium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/heliumplasma_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/heliumplasma_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/heliumplasma_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/heliumplasma_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/heliumplasma_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/hydrogen_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/hydrogen_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/hydrogen_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/hydrogen_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/hydrogen_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/lithium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/lithium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/lithium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/lithium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/lithium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/mercury_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/mercury_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/mercury_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/mercury_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/mercury_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/methane_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/methane_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/methane_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/methane_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/methane_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocarbon_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrocarbon_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocarbon_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrocarbon_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocoalfuel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoalfuel_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocoalfuel_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrocoalfuel_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocoalfuel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrocoalfuel_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocoalfuel_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrocoalfuel_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrodiesel_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrodiesel_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrodiesel_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrodiesel_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrofuel_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrofuel_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrofuel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrofuel_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrofuel_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrogen_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrogen_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrogen_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrogen_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrogen_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrogendioxide_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogendioxide_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrogendioxide_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrogendioxide_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrogendioxide_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/nitrogendioxide_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/nitrogendioxide_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/nitrogendioxide_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/oil_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/potassium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/potassium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/potassium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/potassium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/potassium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/silicon_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/silicon_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/silicon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/silicon_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/silicon_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sodium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sodium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sodium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sodium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/sodium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumpersulfate_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodiumpersulfate_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumpersulfate_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/sodiumpersulfate_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumpersulfate_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodiumpersulfate_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumpersulfate_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/sodiumpersulfate_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sodiumsulfide_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/sodiumsulfide_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sodiumsulfide_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/sodiumsulfide_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/sulfur_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuricacid_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/sulfuricacid_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/sulfuricacid_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/sulfuricacid_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/tritium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/tritium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/tritium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/tritium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/tritium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/wolframium_flowing.png b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/wolframium_flowing.png rename to src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/wolframium_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/fluids/wolframium_flowing.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/fluids/wolframium_flowing.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/adjustable_su_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/adjustable_su_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/adjustable_su_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/adjustable_su_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/adjustable_su_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/adjustable_su_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/adjustable_su_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/adjustable_su_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_ctm.ctx b/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_ctm.ctx similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_ctm.ctx rename to src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_ctm.ctx diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_front_ctm.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_front_ctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_front_ctm.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_front_ctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_side_ctm.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_side_ctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_side_ctm.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_side_ctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_storage_transmitter_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/ev_storage_transmitter_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_storage_transmitter_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/ev_storage_transmitter_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_transformer_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_transformer_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_transformer_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/ev_transformer_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_transformer_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_transformer_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_transformer_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/ev_transformer_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/hv_storage_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/hv_storage_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/hv_storage_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/hv_storage_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/hv_storage_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/hv_storage_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/hv_storage_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/hv_storage_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/hv_transformer_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/hv_transformer_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/hv_transformer_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/hv_transformer_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/hv_transformer_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/hv_transformer_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/hv_transformer_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/hv_transformer_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_side.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/lapotronic_su_side.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_storage_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/lv_storage_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_storage_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lv_storage_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_storage_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/lv_storage_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_storage_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lv_storage_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_transformer_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/lv_transformer_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_transformer_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lv_transformer_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_transformer_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/lv_transformer_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_transformer_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lv_transformer_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/mv_storage_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/mv_storage_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/mv_storage_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/mv_storage_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/mv_storage_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/mv_storage_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/mv_storage_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/mv_storage_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/mv_transformer_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/mv_transformer_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/mv_transformer_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/mv_transformer_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/energy/mv_transformer_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/mv_transformer_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/energy/mv_transformer_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/mv_transformer_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_side_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_side_on_overlay.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_side_on_overlay.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_side_on_overlay.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/diesel_generator_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/generators/diesel_generator_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/dragon_egg_syphon_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/dragon_egg_syphon_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/dragon_egg_syphon_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/dragon_egg_syphon_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_side_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/dragon_egg_syphon_side_on_overlay.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_side_on_overlay.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/dragon_egg_syphon_side_on_overlay.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/dragon_egg_syphon_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/dragon_egg_syphon_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/fusion_reactor_east.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/fusion_reactor_east.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/fusion_reactor_east.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/fusion_reactor_east.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/fusion_reactor_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/fusion_reactor_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/fusion_reactor_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/fusion_reactor_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/fusion_reactor_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/fusion_reactor_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/fusion_reactor_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/fusion_reactor_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/fusion_reactor_west.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/fusion_reactor_west.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/fusion_reactor_west.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/fusion_reactor_west.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/gas_turbine_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/gas_turbine_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/gas_turbine_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/gas_turbine_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/gas_turbine_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/generators/gas_turbine_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/generator_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/generator_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_side.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/generator_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/generator_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/generator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/generator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/generator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/generator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/generator_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/generator_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/generator_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/lightning_rod_side.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/lightning_rod_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/lightning_rod_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/lightning_rod_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/lightning_rod_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/lightning_rod_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/lightning_rod_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/lightning_rod_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on_overlay.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_on_overlay.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on_overlay.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on_overlay.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_on_overlay.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on_overlay.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_side_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on_overlay.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_side_on_overlay.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on_overlay.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on_overlay.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_on_overlay.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on_overlay.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/advanced_solar_panel_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/advanced_solar_panel_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/advanced_solar_panel_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/advanced_solar_panel_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/basic_solar_panel_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/basic_solar_panel_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/basic_solar_panel_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/basic_solar_panel_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/creative_panel_side.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/creative_panel_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/creative_panel_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/creative_panel_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/creative_panel_side.psd b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/creative_panel_side.psd similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/creative_panel_side.psd rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/creative_panel_side.psd diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/creative_panel_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/creative_panel_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/creative_panel_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/creative_panel_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/industrial_solar_panel_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/industrial_solar_panel_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/industrial_solar_panel_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/industrial_solar_panel_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/quantum_solar_panel_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/quantum_solar_panel_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/quantum_solar_panel_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/quantum_solar_panel_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/solar_panel_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/solar_panel_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/solar_panel_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/solar_panel_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/solar_panel_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/solar_panel_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/solar_panel_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/solar_panel_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/solar_panel_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/solar_panel_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/solar_panel_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/solar_panel_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/ultimate_solar_panel_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/panels/ultimate_solar_panel_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/panels/ultimate_solar_panel_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/panels/ultimate_solar_panel_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_glow.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_side_glow.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_glow.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_side_glow.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/generators/plasmagenerator_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/semi_fluid_generator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/semi_fluid_generator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/semi_fluid_generator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/semi_fluid_generator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/semi_fluid_generator_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/semi_fluid_generator_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/semi_fluid_generator_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/semi_fluid_generator_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_side_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/generators/thermal_generator_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_side_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_side_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/generators/watermill_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_left.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_left.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_left.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_left.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_right.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_right.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_right.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_right.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_top.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/generators/wind_mill_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png b/src/main/resources/assets/techreborn/textures/block/machines/lighting/alarm_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/lighting/alarm_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png b/src/main/resources/assets/techreborn/textures/block/machines/lighting/alarm_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/lighting/alarm_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/lighting/alarm_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/lighting/alarm_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/lamp.png b/src/main/resources/assets/techreborn/textures/block/machines/lighting/lamp.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/lighting/lamp.png rename to src/main/resources/assets/techreborn/textures/block/machines/lighting/lamp.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/lamp_lit.png b/src/main/resources/assets/techreborn/textures/block/machines/lighting/lamp_lit.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/lighting/lamp_lit.png rename to src/main/resources/assets/techreborn/textures/block/machines/lighting/lamp_lit.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/fusion_coil_heart.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/fusion_coil_heart.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/fusion_coil_heart.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/fusion_coil_heart.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/fusion_coil_side.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/fusion_coil_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/fusion_coil_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/fusion_coil_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_ctm.ctx b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctm.ctx similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_ctm.ctx rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctm.ctx diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_ctmh.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctmh.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_ctmh.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctmh.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_sctm.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_sctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_sctm.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_sctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_machine_block.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_machine_block.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing_ctmh.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing_ctmh.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing_ctmh.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing_ctmh.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing_sctm.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing_sctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing_sctm.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing_sctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_machine_block.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_machine_block.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing_ctmh.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing_ctmh.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing_ctmh.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing_ctmh.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing_sctm.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing_sctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing_sctm.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing_sctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_machine_block.png b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_machine_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_machine_block.png rename to src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_machine_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/alloy_furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/alloy_furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/alloy_furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/alloy_furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/alloy_furnace_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/alloy_furnace_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/furnace_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/furnace_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/machine_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/machine_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/machine_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/machine_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/machine_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/machine_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/machine_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/machine_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/machine_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/machine_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier0_machines/machine_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier0_machines/machine_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/assembling_machine_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/assembling_machine_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/assembling_machine_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/assembling_machine_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/assembling_machine_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/assembling_machine_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/chemical_reactor_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/chemical_reactor_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/chemical_reactor_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/chemical_reactor_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/chemical_reactor_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/chemical_reactor_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/compressor_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/compressor_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/compressor_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/compressor_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/compressor_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/compressor_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_alloy_smelter_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_alloy_smelter_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_alloy_smelter_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_alloy_smelter_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_on_glow.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_alloy_smelter_front_on_glow.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_on_glow.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_alloy_smelter_front_on_glow.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_crafting_table_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_crafting_table_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_crafting_table_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_crafting_table_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_crafting_table_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_crafting_table_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_crafting_table_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_crafting_table_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/electric_furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/electric_furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/extractor_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/extractor_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/extractor_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/extractor_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/extractor_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/extractor_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/grinder_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/machine_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/machine_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/machine_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/machine_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/machine_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/machine_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/machine_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/machine_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/machine_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/machine_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/machine_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/machine_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_all.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/player_detector_all.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_all.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/player_detector_all.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_others.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/player_detector_others.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_others.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/player_detector_others.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_you.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/player_detector_you.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_you.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/player_detector_you.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/recycler_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/recycler_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/recycler_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/recycler_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/recycler_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/recycler_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/rolling_machine_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/rolling_machine_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/rolling_machine_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/rolling_machine_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/rolling_machine_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/rolling_machine_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/scrapboxinator_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/scrapboxinator_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/scrapboxinator_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/scrapboxinator_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/scrapboxinator_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/scrapboxinator_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/computer_cube_front.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/computer_cube_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/computer_cube_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/computer_cube_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/computer_cube_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/computer_cube_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/computer_cube_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/computer_cube_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/digital_chest_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/digital_chest_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/digital_chest_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/digital_chest_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/digital_chest_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/digital_chest_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/distillation_tower_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/distillation_tower_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/distillation_tower_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/distillation_tower_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/distillation_tower_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/distillation_tower_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/distillation_tower_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/distillation_tower_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/distillation_tower_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/distillation_tower_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/distillation_tower_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/distillation_tower_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_east_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_east_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_east_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_east_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_east_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_east_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_east_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_east_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_east_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_east_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_east_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_east_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_west_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_west_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_west_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_west_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_west_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_west_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_west_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_west_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_west_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_west_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_west_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/implosion_compressor_west_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_east_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_east_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_east_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_east_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_east_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_east_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_east_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_east_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_east_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_east_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_east_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_east_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_west_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_west_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_west_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_west_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_west_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_west_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_west_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_west_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_west_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_west_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_west_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_blast_furnace_west_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_centrifuge_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_grinder_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_sawmill_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_sawmill_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_sawmill_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_sawmill_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_sawmill_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_sawmill_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_sawmill_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_sawmill_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_sawmill_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_sawmill_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_sawmill_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_sawmill_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_back.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_back.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_back.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_back.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_east.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_east.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_east.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_east.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_west.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_west.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/machine_west.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/machine_west.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/vacuum_freezer_top_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/vacuum_freezer_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/creative_quantum_chest_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/creative_quantum_chest_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/creative_quantum_chest_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/creative_quantum_chest_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/creative_quantum_tank_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/creative_quantum_tank_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/creative_quantum_tank_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/creative_quantum_tank_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/fluid_replicator_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/fluid_replicator_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/fluid_replicator_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/fluid_replicator_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/fluid_replicator_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/fluid_replicator_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/fluid_replicator_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/fluid_replicator_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/fluid_replicator_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/fluid_replicator_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/fluid_replicator_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/fluid_replicator_front_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/fusion_reactor_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/fusion_reactor_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/fusion_reactor_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/fusion_reactor_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/industrial_chunkloader_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/industrial_chunkloader_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/industrial_chunkloader_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/industrial_chunkloader_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/industrial_chunkloader_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/industrial_chunkloader_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/industrial_chunkloader_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/industrial_chunkloader_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_back.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_back.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_back.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_back.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_east.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_east.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_east.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_east.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_west.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_west.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/machine_west.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/machine_west.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_side_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_top_on.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_chest_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_chest_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_chest_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_chest_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_chest_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_chest_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_tank_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_tank_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_tank_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_tank_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_tank_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_tank_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_tank_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_tank_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_tank_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_tank_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_tank_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/quantum_tank_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/metal_shelf_books.png b/src/main/resources/assets/techreborn/textures/block/metal_shelf_books.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/metal_shelf_books.png rename to src/main/resources/assets/techreborn/textures/block/metal_shelf_books.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/metal_shelf_cans.png b/src/main/resources/assets/techreborn/textures/block/metal_shelf_cans.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/metal_shelf_cans.png rename to src/main/resources/assets/techreborn/textures/block/metal_shelf_cans.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/metal_shelf_empty.png b/src/main/resources/assets/techreborn/textures/block/metal_shelf_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/metal_shelf_empty.png rename to src/main/resources/assets/techreborn/textures/block/metal_shelf_empty.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/metal_shelf_paper.png b/src/main/resources/assets/techreborn/textures/block/metal_shelf_paper.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/metal_shelf_paper.png rename to src/main/resources/assets/techreborn/textures/block/metal_shelf_paper.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/nuke_front.png b/src/main/resources/assets/techreborn/textures/block/nuke_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/nuke_front.png rename to src/main/resources/assets/techreborn/textures/block/nuke_front.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/nuke_side.png b/src/main/resources/assets/techreborn/textures/block/nuke_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/nuke_side.png rename to src/main/resources/assets/techreborn/textures/block/nuke_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/nuke_top.png b/src/main/resources/assets/techreborn/textures/block/nuke_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/nuke_top.png rename to src/main/resources/assets/techreborn/textures/block/nuke_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/bauxite_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/bauxite_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/bauxite_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/bauxite_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/cinnabar_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/cinnabar_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/cinnabar_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/cinnabar_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/copper_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/copper_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/copper_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/copper_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/galena_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/galena_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/galena_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/galena_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/iridium_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/iridium_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/iridium_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/iridium_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/lead_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/lead_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/lead_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/lead_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/peridot_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/peridot_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/peridot_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/peridot_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/peridot_ore_stone.png b/src/main/resources/assets/techreborn/textures/block/ore/peridot_ore_stone.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/peridot_ore_stone.png rename to src/main/resources/assets/techreborn/textures/block/ore/peridot_ore_stone.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/pyrite_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/pyrite_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/pyrite_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/pyrite_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/ruby_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/ruby_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/ruby_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/ruby_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/sapphire_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/sapphire_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/sapphire_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/sapphire_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/sheldonite_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/sheldonite_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/sheldonite_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/sheldonite_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/sheldonite_ore_stone.png b/src/main/resources/assets/techreborn/textures/block/ore/sheldonite_ore_stone.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/sheldonite_ore_stone.png rename to src/main/resources/assets/techreborn/textures/block/ore/sheldonite_ore_stone.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/silver_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/silver_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/silver_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/silver_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/sodalite_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/sodalite_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/sodalite_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/sodalite_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/sodalite_ore_stone.png b/src/main/resources/assets/techreborn/textures/block/ore/sodalite_ore_stone.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/sodalite_ore_stone.png rename to src/main/resources/assets/techreborn/textures/block/ore/sodalite_ore_stone.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/sphalerite_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/sphalerite_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/sphalerite_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/sphalerite_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/tin_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/tin_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/tin_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/tin_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/tungsten_ore.png b/src/main/resources/assets/techreborn/textures/block/ore/tungsten_ore.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/tungsten_ore.png rename to src/main/resources/assets/techreborn/textures/block/ore/tungsten_ore.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/tungsten_ore_stone.png b/src/main/resources/assets/techreborn/textures/block/ore/tungsten_ore_stone.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/tungsten_ore_stone.png rename to src/main/resources/assets/techreborn/textures/block/ore/tungsten_ore_stone.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass.png b/src/main/resources/assets/techreborn/textures/block/reinforced_glass.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/reinforced_glass.png rename to src/main/resources/assets/techreborn/textures/block/reinforced_glass.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass_ctm.png b/src/main/resources/assets/techreborn/textures/block/reinforced_glass_ctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/reinforced_glass_ctm.png rename to src/main/resources/assets/techreborn/textures/block/reinforced_glass_ctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass_sctm.png b/src/main/resources/assets/techreborn/textures/block/reinforced_glass_sctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/reinforced_glass_sctm.png rename to src/main/resources/assets/techreborn/textures/block/reinforced_glass_sctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_leaves.png b/src/main/resources/assets/techreborn/textures/block/rubber_leaves.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/rubber_leaves.png rename to src/main/resources/assets/techreborn/textures/block/rubber_leaves.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_log_sap.png b/src/main/resources/assets/techreborn/textures/block/rubber_log_sap.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/rubber_log_sap.png rename to src/main/resources/assets/techreborn/textures/block/rubber_log_sap.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_log_side.png b/src/main/resources/assets/techreborn/textures/block/rubber_log_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/rubber_log_side.png rename to src/main/resources/assets/techreborn/textures/block/rubber_log_side.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_log_top.png b/src/main/resources/assets/techreborn/textures/block/rubber_log_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/rubber_log_top.png rename to src/main/resources/assets/techreborn/textures/block/rubber_log_top.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_planks.png b/src/main/resources/assets/techreborn/textures/block/rubber_planks.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/rubber_planks.png rename to src/main/resources/assets/techreborn/textures/block/rubber_planks.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_sapling.png b/src/main/resources/assets/techreborn/textures/block/rubber_sapling.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/rubber_sapling.png rename to src/main/resources/assets/techreborn/textures/block/rubber_sapling.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/aluminum_block.png b/src/main/resources/assets/techreborn/textures/block/storage/aluminum_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/aluminum_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/aluminum_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/brass_block.png b/src/main/resources/assets/techreborn/textures/block/storage/brass_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/brass_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/brass_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/bronze_block.png b/src/main/resources/assets/techreborn/textures/block/storage/bronze_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/bronze_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/bronze_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/chrome_block.png b/src/main/resources/assets/techreborn/textures/block/storage/chrome_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/chrome_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/chrome_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/copper_block.png b/src/main/resources/assets/techreborn/textures/block/storage/copper_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/copper_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/copper_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/electrum_block.png b/src/main/resources/assets/techreborn/textures/block/storage/electrum_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/electrum_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/electrum_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/invar_block.png b/src/main/resources/assets/techreborn/textures/block/storage/invar_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/invar_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/invar_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/iridium_block.png b/src/main/resources/assets/techreborn/textures/block/storage/iridium_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/iridium_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/iridium_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/iridium_reinforced_stone_block.png b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_stone_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/iridium_reinforced_stone_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_stone_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/iridium_reinforced_tungstensteel_block.png b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/iridium_reinforced_tungstensteel_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/iridium_reinforced_tungstensteel_block_ctm.png b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_block_ctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/iridium_reinforced_tungstensteel_block_ctm.png rename to src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_block_ctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/iridum_reinforced_stone_ctm.png b/src/main/resources/assets/techreborn/textures/block/storage/iridum_reinforced_stone_ctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/iridum_reinforced_stone_ctm.png rename to src/main/resources/assets/techreborn/textures/block/storage/iridum_reinforced_stone_ctm.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/lead_block.png b/src/main/resources/assets/techreborn/textures/block/storage/lead_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/lead_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/lead_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/nickel_block.png b/src/main/resources/assets/techreborn/textures/block/storage/nickel_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/nickel_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/nickel_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/osmium_block.png b/src/main/resources/assets/techreborn/textures/block/storage/osmium_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/osmium_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/osmium_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/peridot_block.png b/src/main/resources/assets/techreborn/textures/block/storage/peridot_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/peridot_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/peridot_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/platinum_block.png b/src/main/resources/assets/techreborn/textures/block/storage/platinum_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/platinum_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/platinum_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/redgarnet_block.png b/src/main/resources/assets/techreborn/textures/block/storage/redgarnet_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/redgarnet_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/redgarnet_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/refinediron_block.png b/src/main/resources/assets/techreborn/textures/block/storage/refinediron_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/refinediron_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/refinediron_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/ruby_block.png b/src/main/resources/assets/techreborn/textures/block/storage/ruby_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/ruby_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/ruby_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/sapphire_block.png b/src/main/resources/assets/techreborn/textures/block/storage/sapphire_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/sapphire_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/sapphire_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/silver_block.png b/src/main/resources/assets/techreborn/textures/block/storage/silver_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/silver_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/silver_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/steel_block.png b/src/main/resources/assets/techreborn/textures/block/storage/steel_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/steel_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/steel_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/tin_block.png b/src/main/resources/assets/techreborn/textures/block/storage/tin_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/tin_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/tin_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/titanium_block.png b/src/main/resources/assets/techreborn/textures/block/storage/titanium_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/titanium_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/titanium_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/tungsten_block.png b/src/main/resources/assets/techreborn/textures/block/storage/tungsten_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/tungsten_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/tungsten_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/tungstensteel_block.png b/src/main/resources/assets/techreborn/textures/block/storage/tungstensteel_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/tungstensteel_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/tungstensteel_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/yellowgarnet_block.png b/src/main/resources/assets/techreborn/textures/block/storage/yellowgarnet_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/yellowgarnet_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/yellowgarnet_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/zinc_block.png b/src/main/resources/assets/techreborn/textures/block/storage/zinc_block.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/storage/zinc_block.png rename to src/main/resources/assets/techreborn/textures/block/storage/zinc_block.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_books.png b/src/main/resources/assets/techreborn/textures/block/wood_shelf_books.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/wood_shelf_books.png rename to src/main/resources/assets/techreborn/textures/block/wood_shelf_books.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_cans.png b/src/main/resources/assets/techreborn/textures/block/wood_shelf_cans.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/wood_shelf_cans.png rename to src/main/resources/assets/techreborn/textures/block/wood_shelf_cans.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_empty.png b/src/main/resources/assets/techreborn/textures/block/wood_shelf_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/wood_shelf_empty.png rename to src/main/resources/assets/techreborn/textures/block/wood_shelf_empty.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_paper.png b/src/main/resources/assets/techreborn/textures/block/wood_shelf_paper.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/wood_shelf_paper.png rename to src/main/resources/assets/techreborn/textures/block/wood_shelf_paper.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/wood_shelf_side.png b/src/main/resources/assets/techreborn/textures/block/wood_shelf_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/wood_shelf_side.png rename to src/main/resources/assets/techreborn/textures/block/wood_shelf_side.png