diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_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/block/machines/energy/lapotronic_su_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/block/machines/energy/lapotronic_su_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/block/machines/energy/lapotronic_su_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/data/techreborn/recipes/crafting_table/ingot/copper_ingot_from_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/conversion/copper_block.json
similarity index 57%
rename from src/main/resources/data/techreborn/recipes/crafting_table/ingot/copper_ingot_from_storage_block.json
rename to src/main/resources/data/techreborn/recipes/crafting_table/conversion/copper_block.json
index e05627bb7..f5855d05d 100644
--- a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/copper_ingot_from_storage_block.json
+++ b/src/main/resources/data/techreborn/recipes/crafting_table/conversion/copper_block.json
@@ -2,11 +2,11 @@
     "type": "minecraft:crafting_shapeless",
     "ingredients": [
         {
-            "tag": "c:copper_blocks"
+            "item": "techreborn:copper_storage_block"
         }
     ],
     "result": {
-        "item": "techreborn:copper_ingot",
+        "item": "minecraft:copper_ingot",
         "count": 9
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/data/techreborn/recipes/extractor/light_gray_dye_from_bluet.json b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/light_gray_dye_from_bluet.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/light_gray_dye_from_daisy.json b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_1.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/light_gray_dye_from_daisy.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_1.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/light_gray_dye_from_tulip.json b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_2.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/light_gray_dye_from_tulip.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_2.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/magenta_dye_from_allium.json b/src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/magenta_dye_from_allium.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/magenta_dye_from_lilac.json b/src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye_1.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/magenta_dye_from_lilac.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye_1.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_tulip.json b/src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_tulip.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_peony.json b/src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye_1.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/pink_dye_from_peony.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye_1.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_tulip.json b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/red_dye_from_tulip.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/red_dye.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_poppy.json b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_1.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/red_dye_from_poppy.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_1.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/red_dye_from_rose.json b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_2.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/red_dye_from_rose.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_2.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/wheat_seeds_from_tallgrass.json b/src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/wheat_seeds_from_tallgrass.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/wheat_seeds_from_fern.json b/src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds_1.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/wheat_seeds_from_fern.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds_1.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_dandelion.json b/src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_dandelion.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye.json
diff --git a/src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_sunflower.json b/src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye_1.json
similarity index 100%
rename from src/main/resources/data/techreborn/recipes/extractor/yellow_dye_from_sunflower.json
rename to src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye_1.json