diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/ThermalGenerator_other.png b/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_other.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/ThermalGenerator_other.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_other.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/ThermalGenerator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/ThermalGenerator_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/advanced_machine_casing.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_casing.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/advanced_machine_casing.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_casing.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/advanced_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/advanced_machine_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/aesu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_front.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/aesu_front.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/aesu_front.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/aesu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/aesu_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/aesu_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_bottom.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_bottom.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_bottom.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/alloy_furnace_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/assembling_machine_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/assembling_machine_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/assembling_machine_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/assembling_machine_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/assembling_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/assembling_machine_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/casingadvanced.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/casingadvanced.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/casingreinforced.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/casingreinforced.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/casingstandard.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/casingstandard.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/centrifuge_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/centrifuge_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/chemical_reactor_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/chemical_reactor_side_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/chemical_reactor_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/chemical_reactor_side_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/diesel_generator_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/diesel_generator_top_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/diesel_generator_top_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.mcmeta
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/diesel_generator_top_on.mcmeta
rename to src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.mcmeta
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/diesel_generator_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/diesel_generator_top_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/distillation_tower_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/distillation_tower_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/distillation_tower_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/distillation_tower_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/dragon_egg_energy_siphon_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/dragon_egg_energy_siphon_side_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/dragon_egg_energy_siphon_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/dragon_egg_energy_siphon_side_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/dragon_egg_energy_siphon_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/dragon_egg_energy_siphon_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/electric_alloy_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/electric_alloy_furnace_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/electric_alloy_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/electric_alloy_furnace_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/electric_crafting_table_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_front.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/electric_crafting_table_front.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_front.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/electric_crafting_table_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/electric_crafting_table_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/extreme_voltage_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/extreme_voltage_machine_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/extreme_voltage_machine_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/extreme_voltage_machine_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/fusion_coil.png b/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_coil.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/fusion_coil.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/fusion_coil.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/fusion_control_computer_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/fusion_control_computer_front.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/fusion_control_computer_front.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/fusion_control_computer_front.png.mcmeta
rename to src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png.mcmeta
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/gas_generator_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_bottom.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/gas_generator_bottom.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_bottom.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/gas_generator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/gas_generator_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/highlyadvancedmachine.png b/src/main/resources/assets/techreborn/textures/blocks/machine/highlyadvancedmachine.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/highlyadvancedmachine.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/highlyadvancedmachine.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/idsu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_front.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/idsu_front.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/idsu_front.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/idsu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/idsu_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/idsu_side.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/idsu_side.png.mcmeta
rename to src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png.mcmeta
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/implosion_compressor_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_bottom.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/implosion_compressor_bottom.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_bottom.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/implosion_compressor_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/implosion_compressor_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/implosion_compressor_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/implosion_compressor_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_blast_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_blast_furnace_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_blast_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_blast_furnace_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_bottom.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_bottom.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_bottom.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_side_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_side_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.mcmeta
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_side_on.mcmeta
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.mcmeta
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_side_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_top_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_top_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.mcmeta
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_top_on.mcmeta
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.mcmeta
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_centrifuge_top_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_chunk_loader_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_chunk_loader_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_chunk_loader_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_chunk_loader_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_electrolyzer_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_electrolyzer_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_electrolyzer_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_electrolyzer_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_top_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_top_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/industrial_grinder_top_on.png.mcmeta
rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png.mcmeta
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lathe_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/lathe_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lathe_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/lathe_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lesu_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_block.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/lesu_block.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/lesu_block.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lesu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_front.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/lesu_front.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/lesu_front.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lesu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/lesu_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/lesu_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lightning_rod_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lightning_rod_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/lightning_rod_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/lightning_rod_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/machine_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_bottom.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/machine_bottom.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_bottom.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/machine_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/machine_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/machine_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_absorber_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_bottom.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_absorber_bottom.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_bottom.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_absorber_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_absorber_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_absorber_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_absorber_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_bottom.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_bottom.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_bottom.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_front on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_front on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/magic_energy_converter_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/matter_fabricator_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/matter_fabricator_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/matter_fabricator_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/matter_fabricator_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/matterfab_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/matterfab_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/matterfab_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/matterfab_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/metal_shelf_books.png b/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_books.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/metal_shelf_books.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_books.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/metal_shelf_cans.png b/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_cans.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/metal_shelf_cans.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_cans.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/metal_shelf_empty.png b/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_empty.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/metal_shelf_empty.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_empty.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/metal_shelf_paper.png b/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_paper.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/metal_shelf_paper.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_paper.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/plasma_generator_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_front.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/plasma_generator_front.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_front.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/plasma_generator_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/plasma_generator_side_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/plasma_generator_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/plasma_generator_side_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/plate_cutting_machine_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/plate_cutting_machine_front_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/plate_cutting_machine_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/plate_cutting_machine_front_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/qchest_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/qchest_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/qchest_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/qchest_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/quantum_chest.png b/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_chest.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/quantum_chest.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/quantum_chest.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/quantum_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/quantum_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/quantum_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/reinforced_machine_casing.png b/src/main/resources/assets/techreborn/textures/blocks/machine/reinforced_machine_casing.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/reinforced_machine_casing.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/reinforced_machine_casing.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/rolling_machine_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/rolling_machine_side_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/rolling_machine_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/rolling_machine_side_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/semifluid_generator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/semifluid_generator_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/semifluid_generator_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/semifluid_generator_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/standard_machine_casing.png b/src/main/resources/assets/techreborn/textures/blocks/machine/standard_machine_casing.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/standard_machine_casing.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/standard_machine_casing.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/supercondensator_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_front.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/supercondensator_front.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_front.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/supercondensator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/supercondensator_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_side.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/thermal_generator_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/thermal_generator_side_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/thermal_generator_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/thermal_generator_side_on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/thermal_generator_top on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top on.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/thermal_generator_top on.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top on.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/thermal_generator_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_off.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/thermal_generator_top_off.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_off.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/vacuum_freezer_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_front.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/vacuum_freezer_front.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_front.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/vacuum_freezer_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_top.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/vacuum_freezer_top.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_top.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_books.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_books.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_books.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_books.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_cans.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_cans.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_cans.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_cans.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_empty.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_empty.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_empty.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_empty.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_paper.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_paper.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_paper.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_paper.png
diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_side.png
similarity index 100%
rename from src/main/resources/assets/techreborn/textures/blocks/machines/wood_shelf_side.png
rename to src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_side.png