diff --git a/Makefile b/Makefile
deleted file mode 100644
index 11be59f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# General makefile for factorio mods.
-#
-# Presumes the development work is done in a <factoriodir>/dev/<modname>/
-# directory where this makefile resides.  This directory must be parallel to
-# the <factoriodir>/mods/ directory where mods are installed. Run `make
-# install` from dev/<modname> to install the mod as a zip file. That zip file
-# should also be ready to upload to the mod portal
-
-.PHONY: copy lint-changelog install
-
-libdir = "../bzlib"
-libfiles = $(shell ls $(libdir)/*.lua | grep -o '[^/]*.lua')
-pwd = $(shell pwd)
-v = $(shell basename "$(pwd)")_$(shell jq -r .version info.json)
-
-link:
-	for f in $(libfiles) ; do \
-		echo "using $(libdir)/$$f" ;\
-		cp $(libdir)/$$f .; \
-	done; 
-
-copy: link
-	rm -rf ../$(v)
-	mkdir -p ../$(v)
-	cp -rf * ../$(v)
-	rm -f ../$(v).zip
-	cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" -x "*.blend*"
-
-install: lint-changelog copy
-	cp -f ../$(v).zip ../../mods/
-
-lint-changelog: copy
-	python3 ../da-changelog-tools_0.0.14/changelog-checker.py --changelog ../$(v).zip
-
-zorro:
-	python3 ../da-changelog-tools_0.0.14/changelog-checker.py --zorro --changelog ../$(v).zip
-
diff --git a/aluminum-ore.lua b/aluminum-ore.lua
deleted file mode 100644
index 4dcd811..0000000
--- a/aluminum-ore.lua
+++ /dev/null
@@ -1,84 +0,0 @@
-local resource_autoplace = require('resource-autoplace');
-
-local util = require("data-util");
-
-data.raw.planet.nauvis.map_gen_settings.autoplace_controls["aluminum-ore"] = {}
-data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["aluminum-ore"] = {}
-resource_autoplace.initialize_patch_set("aluminum-ore", true)
-
-data:extend({
-	{
-    type = "autoplace-control",
-    category = "resource",
-    name = "aluminum-ore",
-    richness = true,
-    order = "b-e"
-	},
-	{
-    type = "resource",
-    icon_size = 64, icon_mipmaps = 3,
-    name = "aluminum-ore",
-    icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
-    flags = {"placeable-neutral"},
-    order="a-b-a",
-    map_color = {r=1.00, g=0.80, b=0.50},
-    tree_removal_probability = 0.7,
-    tree_removal_max_distance = 32 * 32,
-    minable =
-    {
-      hardness = 1,
-      mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle",
-      mining_time = 1,
-      result = "aluminum-ore"
-    },
-    collision_box = {{ -0.1, -0.1}, {0.1, 0.1}},
-    selection_box = {{ -0.5, -0.5}, {0.5, 0.5}},
-
-    autoplace = resource_autoplace.resource_autoplace_settings{
-      name = "aluminum-ore",
-      order = "b-z",
-      base_density = 6,
-      base_spots_per_km2 = 1,
-      has_starting_area_placement = true,
-      regular_rq_factor_multiplier = 1.2,
-      starting_rq_factor_multiplier = 1.7,
-    },
-
-    stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80},
-        stages =
-        {
-          sheet =
-          {
-      filename = "__bzaluminum2__/graphics/entity/ores/aluminum-ore.png",
-      priority = "extra-high",
-      size = 64,
-      frame_count = 8,
-      variation_count = 8,
-      hr_version =
-      {
-      filename = "__bzaluminum2__/graphics/entity/ores/hr-aluminum-ore.png",
-        priority = "extra-high",
-        size = 128,
-        frame_count = 8,
-        variation_count = 8,
-        scale = 0.5
-      }
-          }
-    },
-  },
-  {
-      type = "item",
-      name = "aluminum-ore",
-      icon_size = 64, icon_mipmaps = 3,
-      icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
-      pictures = {
-        {filename="__bzaluminum2__/graphics/icons/aluminum-ore.png", size=64, scale=0.5},
-        {filename="__bzaluminum2__/graphics/icons/aluminum-ore-2.png", size=64, scale=0.5},
-        {filename="__bzaluminum2__/graphics/icons/aluminum-ore-3.png", size=64, scale=0.5},
-        {filename="__bzaluminum2__/graphics/icons/aluminum-ore-4.png", size=64, scale=0.5},
-      },
-      subgroup = "raw-resource",
-      order = "t-c-a",
-      stack_size = 50
-  },
-})
diff --git a/LICENSE.md b/bzaluminum2/LICENSE.md
similarity index 100%
rename from LICENSE.md
rename to bzaluminum2/LICENSE.md
diff --git a/aluminum-burner-phase.lua b/bzaluminum2/aluminum-burner-phase.lua
similarity index 100%
rename from aluminum-burner-phase.lua
rename to bzaluminum2/aluminum-burner-phase.lua
diff --git a/aluminum-enriched.lua b/bzaluminum2/aluminum-enriched.lua
similarity index 100%
rename from aluminum-enriched.lua
rename to bzaluminum2/aluminum-enriched.lua
diff --git a/aluminum-matter.lua b/bzaluminum2/aluminum-matter.lua
similarity index 100%
rename from aluminum-matter.lua
rename to bzaluminum2/aluminum-matter.lua
diff --git a/bzaluminum2/aluminum-ore.lua b/bzaluminum2/aluminum-ore.lua
new file mode 100644
index 0000000..304bccb
--- /dev/null
+++ b/bzaluminum2/aluminum-ore.lua
@@ -0,0 +1,76 @@
+local resource_autoplace = require('resource-autoplace');
+
+data.raw.planet.nauvis.map_gen_settings.autoplace_controls["aluminum-ore"] = {}
+data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["aluminum-ore"] = {}
+resource_autoplace.initialize_patch_set("aluminum-ore", true)
+
+data:extend({
+  {
+    type = "autoplace-control",
+    category = "resource",
+    name = "aluminum-ore",
+    richness = true,
+    order = "b-e"
+  },
+  {
+    type = "resource",
+    icon_size = 64,
+    icon_mipmaps = 3,
+    name = "aluminum-ore",
+    icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
+    flags = { "placeable-neutral" },
+    order = "a-b-a",
+    map_color = { r = 1.00, g = 0.80, b = 0.50 },
+    tree_removal_probability = 0.7,
+    tree_removal_max_distance = 32 * 32,
+    minable =
+    {
+      hardness = 1,
+      mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle",
+      mining_time = 1,
+      result = "aluminum-ore"
+    },
+    collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } },
+    selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } },
+
+    autoplace = resource_autoplace.resource_autoplace_settings {
+      name = "aluminum-ore",
+      order = "b-z",
+      base_density = 6,
+      base_spots_per_km2 = 1,
+      has_starting_area_placement = true,
+      regular_rq_factor_multiplier = 1.2,
+      starting_rq_factor_multiplier = 1.7,
+    },
+
+    stage_counts = { 15000, 9500, 5500, 2900, 1300, 400, 150, 80 },
+    stages =
+    {
+      sheet =
+      {
+        filename = "__bzaluminum2__/graphics/entity/ores/hr-aluminum-ore.png",
+        priority = "extra-high",
+        size = 128,
+        frame_count = 8,
+        variation_count = 8,
+        scale = 0.5
+      }
+    },
+  },
+  {
+    type = "item",
+    name = "aluminum-ore",
+    icon_size = 64,
+    icon_mipmaps = 3,
+    icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
+    pictures = {
+      { filename = "__bzaluminum2__/graphics/icons/aluminum-ore.png", size = 64, scale = 0.5 },
+      { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-2.png", size = 64, scale = 0.5 },
+      { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-3.png", size = 64, scale = 0.5 },
+      { filename = "__bzaluminum2__/graphics/icons/aluminum-ore-4.png", size = 64, scale = 0.5 },
+    },
+    subgroup = "raw-resource",
+    order = "t-c-a",
+    stack_size = 50
+  },
+})
diff --git a/aluminum-recipe-final-rrr.lua b/bzaluminum2/aluminum-recipe-final-rrr.lua
similarity index 100%
rename from aluminum-recipe-final-rrr.lua
rename to bzaluminum2/aluminum-recipe-final-rrr.lua
diff --git a/aluminum-recipe-final-stacking.lua b/bzaluminum2/aluminum-recipe-final-stacking.lua
similarity index 100%
rename from aluminum-recipe-final-stacking.lua
rename to bzaluminum2/aluminum-recipe-final-stacking.lua
diff --git a/aluminum-recipe-modules.lua b/bzaluminum2/aluminum-recipe-modules.lua
similarity index 100%
rename from aluminum-recipe-modules.lua
rename to bzaluminum2/aluminum-recipe-modules.lua
diff --git a/aluminum-recipe-se.lua b/bzaluminum2/aluminum-recipe-se.lua
similarity index 100%
rename from aluminum-recipe-se.lua
rename to bzaluminum2/aluminum-recipe-se.lua
diff --git a/aluminum-recipe-updates-jetpack.lua b/bzaluminum2/aluminum-recipe-updates-jetpack.lua
similarity index 100%
rename from aluminum-recipe-updates-jetpack.lua
rename to bzaluminum2/aluminum-recipe-updates-jetpack.lua
diff --git a/aluminum-recipe-updates-lds.lua b/bzaluminum2/aluminum-recipe-updates-lds.lua
similarity index 100%
rename from aluminum-recipe-updates-lds.lua
rename to bzaluminum2/aluminum-recipe-updates-lds.lua
diff --git a/aluminum-recipe-updates-power.lua b/bzaluminum2/aluminum-recipe-updates-power.lua
similarity index 100%
rename from aluminum-recipe-updates-power.lua
rename to bzaluminum2/aluminum-recipe-updates-power.lua
diff --git a/aluminum-recipe-updates-storage.lua b/bzaluminum2/aluminum-recipe-updates-storage.lua
similarity index 100%
rename from aluminum-recipe-updates-storage.lua
rename to bzaluminum2/aluminum-recipe-updates-storage.lua
diff --git a/aluminum-recipe-updates-transport.lua b/bzaluminum2/aluminum-recipe-updates-transport.lua
similarity index 100%
rename from aluminum-recipe-updates-transport.lua
rename to bzaluminum2/aluminum-recipe-updates-transport.lua
diff --git a/aluminum-recipe-updates.lua b/bzaluminum2/aluminum-recipe-updates.lua
similarity index 100%
rename from aluminum-recipe-updates.lua
rename to bzaluminum2/aluminum-recipe-updates.lua
diff --git a/aluminum-recipe.lua b/bzaluminum2/aluminum-recipe.lua
similarity index 100%
rename from aluminum-recipe.lua
rename to bzaluminum2/aluminum-recipe.lua
diff --git a/cables.lua b/bzaluminum2/cables.lua
similarity index 100%
rename from cables.lua
rename to bzaluminum2/cables.lua
diff --git a/changelog.txt b/bzaluminum2/changelog.txt
similarity index 100%
rename from changelog.txt
rename to bzaluminum2/changelog.txt
diff --git a/compatibility/248k-recipes.lua b/bzaluminum2/compatibility/248k-recipes.lua
similarity index 100%
rename from compatibility/248k-recipes.lua
rename to bzaluminum2/compatibility/248k-recipes.lua
diff --git a/compatibility/248k.lua b/bzaluminum2/compatibility/248k.lua
similarity index 100%
rename from compatibility/248k.lua
rename to bzaluminum2/compatibility/248k.lua
diff --git a/compatibility/crafting-efficiency.lua b/bzaluminum2/compatibility/crafting-efficiency.lua
similarity index 100%
rename from compatibility/crafting-efficiency.lua
rename to bzaluminum2/compatibility/crafting-efficiency.lua
diff --git a/compatibility/rsc.lua b/bzaluminum2/compatibility/rsc.lua
similarity index 100%
rename from compatibility/rsc.lua
rename to bzaluminum2/compatibility/rsc.lua
diff --git a/compatibility/sciencecosttweakerm.lua b/bzaluminum2/compatibility/sciencecosttweakerm.lua
similarity index 100%
rename from compatibility/sciencecosttweakerm.lua
rename to bzaluminum2/compatibility/sciencecosttweakerm.lua
diff --git a/compatibility/textplates.lua b/bzaluminum2/compatibility/textplates.lua
similarity index 100%
rename from compatibility/textplates.lua
rename to bzaluminum2/compatibility/textplates.lua
diff --git a/control-util.lua b/bzaluminum2/control-util.lua
similarity index 100%
rename from control-util.lua
rename to bzaluminum2/control-util.lua
diff --git a/control.lua b/bzaluminum2/control.lua
similarity index 100%
rename from control.lua
rename to bzaluminum2/control.lua
diff --git a/data-final-fixes.lua b/bzaluminum2/data-final-fixes.lua
similarity index 100%
rename from data-final-fixes.lua
rename to bzaluminum2/data-final-fixes.lua
diff --git a/data-updates.lua b/bzaluminum2/data-updates.lua
similarity index 100%
rename from data-updates.lua
rename to bzaluminum2/data-updates.lua
diff --git a/data-util.lua b/bzaluminum2/data-util.lua
similarity index 100%
rename from data-util.lua
rename to bzaluminum2/data-util.lua
diff --git a/data.lua b/bzaluminum2/data.lua
similarity index 100%
rename from data.lua
rename to bzaluminum2/data.lua
diff --git a/graphics/entity/ores/hr-aluminum-ore.png b/bzaluminum2/graphics/entity/ores/hr-aluminum-ore.png
similarity index 100%
rename from graphics/entity/ores/hr-aluminum-ore.png
rename to bzaluminum2/graphics/entity/ores/hr-aluminum-ore.png
diff --git a/graphics/icons/acsr-cable.png b/bzaluminum2/graphics/icons/acsr-cable.png
similarity index 100%
rename from graphics/icons/acsr-cable.png
rename to bzaluminum2/graphics/icons/acsr-cable.png
diff --git a/graphics/icons/alumina-1.png b/bzaluminum2/graphics/icons/alumina-1.png
similarity index 100%
rename from graphics/icons/alumina-1.png
rename to bzaluminum2/graphics/icons/alumina-1.png
diff --git a/graphics/icons/alumina-2.png b/bzaluminum2/graphics/icons/alumina-2.png
similarity index 100%
rename from graphics/icons/alumina-2.png
rename to bzaluminum2/graphics/icons/alumina-2.png
diff --git a/graphics/icons/alumina-3.png b/bzaluminum2/graphics/icons/alumina-3.png
similarity index 100%
rename from graphics/icons/alumina-3.png
rename to bzaluminum2/graphics/icons/alumina-3.png
diff --git a/graphics/icons/alumina.blend.png b/bzaluminum2/graphics/icons/alumina.blend.png
similarity index 100%
rename from graphics/icons/alumina.blend.png
rename to bzaluminum2/graphics/icons/alumina.blend.png
diff --git a/graphics/icons/alumina.png b/bzaluminum2/graphics/icons/alumina.png
similarity index 100%
rename from graphics/icons/alumina.png
rename to bzaluminum2/graphics/icons/alumina.png
diff --git a/graphics/icons/aluminum-2219.png b/bzaluminum2/graphics/icons/aluminum-2219.png
similarity index 100%
rename from graphics/icons/aluminum-2219.png
rename to bzaluminum2/graphics/icons/aluminum-2219.png
diff --git a/graphics/icons/aluminum-6061.png b/bzaluminum2/graphics/icons/aluminum-6061.png
similarity index 100%
rename from graphics/icons/aluminum-6061.png
rename to bzaluminum2/graphics/icons/aluminum-6061.png
diff --git a/graphics/icons/aluminum-cable.png b/bzaluminum2/graphics/icons/aluminum-cable.png
similarity index 100%
rename from graphics/icons/aluminum-cable.png
rename to bzaluminum2/graphics/icons/aluminum-cable.png
diff --git a/graphics/icons/aluminum-ingot.png b/bzaluminum2/graphics/icons/aluminum-ingot.png
similarity index 100%
rename from graphics/icons/aluminum-ingot.png
rename to bzaluminum2/graphics/icons/aluminum-ingot.png
diff --git a/graphics/icons/aluminum-ore-2.png b/bzaluminum2/graphics/icons/aluminum-ore-2.png
similarity index 100%
rename from graphics/icons/aluminum-ore-2.png
rename to bzaluminum2/graphics/icons/aluminum-ore-2.png
diff --git a/graphics/icons/aluminum-ore-3.png b/bzaluminum2/graphics/icons/aluminum-ore-3.png
similarity index 100%
rename from graphics/icons/aluminum-ore-3.png
rename to bzaluminum2/graphics/icons/aluminum-ore-3.png
diff --git a/graphics/icons/aluminum-ore-4.png b/bzaluminum2/graphics/icons/aluminum-ore-4.png
similarity index 100%
rename from graphics/icons/aluminum-ore-4.png
rename to bzaluminum2/graphics/icons/aluminum-ore-4.png
diff --git a/graphics/icons/aluminum-ore-powder.png b/bzaluminum2/graphics/icons/aluminum-ore-powder.png
similarity index 100%
rename from graphics/icons/aluminum-ore-powder.png
rename to bzaluminum2/graphics/icons/aluminum-ore-powder.png
diff --git a/graphics/icons/aluminum-ore.png b/bzaluminum2/graphics/icons/aluminum-ore.png
similarity index 100%
rename from graphics/icons/aluminum-ore.png
rename to bzaluminum2/graphics/icons/aluminum-ore.png
diff --git a/graphics/icons/aluminum-plate.png b/bzaluminum2/graphics/icons/aluminum-plate.png
similarity index 100%
rename from graphics/icons/aluminum-plate.png
rename to bzaluminum2/graphics/icons/aluminum-plate.png
diff --git a/graphics/icons/automation-core.png b/bzaluminum2/graphics/icons/automation-core.png
similarity index 100%
rename from graphics/icons/automation-core.png
rename to bzaluminum2/graphics/icons/automation-core.png
diff --git a/graphics/icons/enriched-aluminum-1.png b/bzaluminum2/graphics/icons/enriched-aluminum-1.png
similarity index 100%
rename from graphics/icons/enriched-aluminum-1.png
rename to bzaluminum2/graphics/icons/enriched-aluminum-1.png
diff --git a/graphics/icons/enriched-aluminum-2.png b/bzaluminum2/graphics/icons/enriched-aluminum-2.png
similarity index 100%
rename from graphics/icons/enriched-aluminum-2.png
rename to bzaluminum2/graphics/icons/enriched-aluminum-2.png
diff --git a/graphics/icons/enriched-aluminum-3.png b/bzaluminum2/graphics/icons/enriched-aluminum-3.png
similarity index 100%
rename from graphics/icons/enriched-aluminum-3.png
rename to bzaluminum2/graphics/icons/enriched-aluminum-3.png
diff --git a/graphics/icons/enriched-aluminum.png b/bzaluminum2/graphics/icons/enriched-aluminum.png
similarity index 100%
rename from graphics/icons/enriched-aluminum.png
rename to bzaluminum2/graphics/icons/enriched-aluminum.png
diff --git a/graphics/icons/molten-aluminum.png b/bzaluminum2/graphics/icons/molten-aluminum.png
similarity index 100%
rename from graphics/icons/molten-aluminum.png
rename to bzaluminum2/graphics/icons/molten-aluminum.png
diff --git a/graphics/icons/spark-plug.png b/bzaluminum2/graphics/icons/spark-plug.png
similarity index 100%
rename from graphics/icons/spark-plug.png
rename to bzaluminum2/graphics/icons/spark-plug.png
diff --git a/graphics/icons/stacked/acsr-cable-stacked.png b/bzaluminum2/graphics/icons/stacked/acsr-cable-stacked.png
similarity index 100%
rename from graphics/icons/stacked/acsr-cable-stacked.png
rename to bzaluminum2/graphics/icons/stacked/acsr-cable-stacked.png
diff --git a/graphics/icons/stacked/alumina-stacked.png b/bzaluminum2/graphics/icons/stacked/alumina-stacked.png
similarity index 100%
rename from graphics/icons/stacked/alumina-stacked.png
rename to bzaluminum2/graphics/icons/stacked/alumina-stacked.png
diff --git a/graphics/icons/stacked/aluminum-2219-stacked.png b/bzaluminum2/graphics/icons/stacked/aluminum-2219-stacked.png
similarity index 100%
rename from graphics/icons/stacked/aluminum-2219-stacked.png
rename to bzaluminum2/graphics/icons/stacked/aluminum-2219-stacked.png
diff --git a/graphics/icons/stacked/aluminum-6061-stacked.png b/bzaluminum2/graphics/icons/stacked/aluminum-6061-stacked.png
similarity index 100%
rename from graphics/icons/stacked/aluminum-6061-stacked.png
rename to bzaluminum2/graphics/icons/stacked/aluminum-6061-stacked.png
diff --git a/graphics/icons/stacked/aluminum-ore-stacked.png b/bzaluminum2/graphics/icons/stacked/aluminum-ore-stacked.png
similarity index 100%
rename from graphics/icons/stacked/aluminum-ore-stacked.png
rename to bzaluminum2/graphics/icons/stacked/aluminum-ore-stacked.png
diff --git a/graphics/icons/stacked/aluminum-plate-stacked.png b/bzaluminum2/graphics/icons/stacked/aluminum-plate-stacked.png
similarity index 100%
rename from graphics/icons/stacked/aluminum-plate-stacked.png
rename to bzaluminum2/graphics/icons/stacked/aluminum-plate-stacked.png
diff --git a/graphics/icons/stacked/automation-core-stacked.png b/bzaluminum2/graphics/icons/stacked/automation-core-stacked.png
similarity index 100%
rename from graphics/icons/stacked/automation-core-stacked.png
rename to bzaluminum2/graphics/icons/stacked/automation-core-stacked.png
diff --git a/graphics/icons/stacked/enriched-aluminum-ore-stacked.png b/bzaluminum2/graphics/icons/stacked/enriched-aluminum-ore-stacked.png
similarity index 100%
rename from graphics/icons/stacked/enriched-aluminum-ore-stacked.png
rename to bzaluminum2/graphics/icons/stacked/enriched-aluminum-ore-stacked.png
diff --git a/graphics/icons/stacked/spark-plug-stacked.png b/bzaluminum2/graphics/icons/stacked/spark-plug-stacked.png
similarity index 100%
rename from graphics/icons/stacked/spark-plug-stacked.png
rename to bzaluminum2/graphics/icons/stacked/spark-plug-stacked.png
diff --git a/graphics/icons/stacked/ti-sapphire-stacked.png b/bzaluminum2/graphics/icons/stacked/ti-sapphire-stacked.png
similarity index 100%
rename from graphics/icons/stacked/ti-sapphire-stacked.png
rename to bzaluminum2/graphics/icons/stacked/ti-sapphire-stacked.png
diff --git a/graphics/icons/ti-sapphire.png b/bzaluminum2/graphics/icons/ti-sapphire.png
similarity index 100%
rename from graphics/icons/ti-sapphire.png
rename to bzaluminum2/graphics/icons/ti-sapphire.png
diff --git a/graphics/technology/automation-core.png b/bzaluminum2/graphics/technology/automation-core.png
similarity index 100%
rename from graphics/technology/automation-core.png
rename to bzaluminum2/graphics/technology/automation-core.png
diff --git a/graphics/technology/reinforced-cable.png b/bzaluminum2/graphics/technology/reinforced-cable.png
similarity index 100%
rename from graphics/technology/reinforced-cable.png
rename to bzaluminum2/graphics/technology/reinforced-cable.png
diff --git a/info.json b/bzaluminum2/info.json
similarity index 100%
rename from info.json
rename to bzaluminum2/info.json
diff --git a/locale/cs/aluminum.cfg b/bzaluminum2/locale/cs/aluminum.cfg
similarity index 100%
rename from locale/cs/aluminum.cfg
rename to bzaluminum2/locale/cs/aluminum.cfg
diff --git a/locale/de/aluminum.cfg b/bzaluminum2/locale/de/aluminum.cfg
similarity index 100%
rename from locale/de/aluminum.cfg
rename to bzaluminum2/locale/de/aluminum.cfg
diff --git a/locale/en/aluminum.cfg b/bzaluminum2/locale/en/aluminum.cfg
similarity index 100%
rename from locale/en/aluminum.cfg
rename to bzaluminum2/locale/en/aluminum.cfg
diff --git a/locale/ja/aluminum.cfg b/bzaluminum2/locale/ja/aluminum.cfg
similarity index 100%
rename from locale/ja/aluminum.cfg
rename to bzaluminum2/locale/ja/aluminum.cfg
diff --git a/locale/ko/aluminum.cfg b/bzaluminum2/locale/ko/aluminum.cfg
similarity index 100%
rename from locale/ko/aluminum.cfg
rename to bzaluminum2/locale/ko/aluminum.cfg
diff --git a/locale/ru/aluminum.cfg b/bzaluminum2/locale/ru/aluminum.cfg
similarity index 100%
rename from locale/ru/aluminum.cfg
rename to bzaluminum2/locale/ru/aluminum.cfg
diff --git a/locale/zh-CN/bzaluminum.cfg b/bzaluminum2/locale/zh-CN/bzaluminum.cfg
similarity index 100%
rename from locale/zh-CN/bzaluminum.cfg
rename to bzaluminum2/locale/zh-CN/bzaluminum.cfg
diff --git a/map-gen-preset-updates.lua b/bzaluminum2/map-gen-preset-updates.lua
similarity index 100%
rename from map-gen-preset-updates.lua
rename to bzaluminum2/map-gen-preset-updates.lua
diff --git a/me.lua b/bzaluminum2/me.lua
similarity index 100%
rename from me.lua
rename to bzaluminum2/me.lua
diff --git a/settings-util.lua b/bzaluminum2/settings-util.lua
similarity index 100%
rename from settings-util.lua
rename to bzaluminum2/settings-util.lua
diff --git a/settings.lua b/bzaluminum2/settings.lua
similarity index 100%
rename from settings.lua
rename to bzaluminum2/settings.lua
diff --git a/strange-matter.lua b/bzaluminum2/strange-matter.lua
similarity index 100%
rename from strange-matter.lua
rename to bzaluminum2/strange-matter.lua
diff --git a/thumbnail.png b/bzaluminum2/thumbnail.png
similarity index 100%
rename from thumbnail.png
rename to bzaluminum2/thumbnail.png
diff --git a/graphics/entity/ores/aluminum-ore.png b/graphics/entity/ores/aluminum-ore.png
deleted file mode 100644
index 11aa1df..0000000
Binary files a/graphics/entity/ores/aluminum-ore.png and /dev/null differ
diff --git a/migrations/bzaluminum.0.2.0.json b/migrations/bzaluminum.0.2.0.json
deleted file mode 100644
index b2b44aa..0000000
--- a/migrations/bzaluminum.0.2.0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "item":
-  [
-    ["el_aluminum_item", "aluminum-plate"]
-  ]
-}
-
diff --git a/graphics/entity/ores/hr-aluminum-ore.xcf b/sources/graphics/entity/ores/hr-aluminum-ore.xcf
similarity index 100%
rename from graphics/entity/ores/hr-aluminum-ore.xcf
rename to sources/graphics/entity/ores/hr-aluminum-ore.xcf
diff --git a/graphics/icons/acsr-cable.xcf b/sources/graphics/icons/acsr-cable.xcf
similarity index 100%
rename from graphics/icons/acsr-cable.xcf
rename to sources/graphics/icons/acsr-cable.xcf
diff --git a/graphics/icons/alumina-1.xcf b/sources/graphics/icons/alumina-1.xcf
similarity index 100%
rename from graphics/icons/alumina-1.xcf
rename to sources/graphics/icons/alumina-1.xcf
diff --git a/graphics/icons/alumina-2.xcf b/sources/graphics/icons/alumina-2.xcf
similarity index 100%
rename from graphics/icons/alumina-2.xcf
rename to sources/graphics/icons/alumina-2.xcf
diff --git a/graphics/icons/alumina-3.xcf b/sources/graphics/icons/alumina-3.xcf
similarity index 100%
rename from graphics/icons/alumina-3.xcf
rename to sources/graphics/icons/alumina-3.xcf
diff --git a/graphics/icons/alumina.blend b/sources/graphics/icons/alumina.blend
similarity index 100%
rename from graphics/icons/alumina.blend
rename to sources/graphics/icons/alumina.blend
diff --git a/graphics/icons/alumina.blend1 b/sources/graphics/icons/alumina.blend1
similarity index 100%
rename from graphics/icons/alumina.blend1
rename to sources/graphics/icons/alumina.blend1
diff --git a/graphics/icons/alumina.xcf b/sources/graphics/icons/alumina.xcf
similarity index 100%
rename from graphics/icons/alumina.xcf
rename to sources/graphics/icons/alumina.xcf
diff --git a/graphics/icons/aluminum-2219.xcf b/sources/graphics/icons/aluminum-2219.xcf
similarity index 100%
rename from graphics/icons/aluminum-2219.xcf
rename to sources/graphics/icons/aluminum-2219.xcf
diff --git a/graphics/icons/aluminum-6061.xcf b/sources/graphics/icons/aluminum-6061.xcf
similarity index 100%
rename from graphics/icons/aluminum-6061.xcf
rename to sources/graphics/icons/aluminum-6061.xcf
diff --git a/graphics/icons/aluminum-cable.xcf b/sources/graphics/icons/aluminum-cable.xcf
similarity index 100%
rename from graphics/icons/aluminum-cable.xcf
rename to sources/graphics/icons/aluminum-cable.xcf
diff --git a/graphics/icons/aluminum-ingot.xcf b/sources/graphics/icons/aluminum-ingot.xcf
similarity index 100%
rename from graphics/icons/aluminum-ingot.xcf
rename to sources/graphics/icons/aluminum-ingot.xcf
diff --git a/graphics/icons/aluminum-ore-2.xcf b/sources/graphics/icons/aluminum-ore-2.xcf
similarity index 100%
rename from graphics/icons/aluminum-ore-2.xcf
rename to sources/graphics/icons/aluminum-ore-2.xcf
diff --git a/graphics/icons/aluminum-ore-3.xcf b/sources/graphics/icons/aluminum-ore-3.xcf
similarity index 100%
rename from graphics/icons/aluminum-ore-3.xcf
rename to sources/graphics/icons/aluminum-ore-3.xcf
diff --git a/graphics/icons/aluminum-ore-4.xcf b/sources/graphics/icons/aluminum-ore-4.xcf
similarity index 100%
rename from graphics/icons/aluminum-ore-4.xcf
rename to sources/graphics/icons/aluminum-ore-4.xcf
diff --git a/graphics/icons/aluminum-ore-powder.xcf b/sources/graphics/icons/aluminum-ore-powder.xcf
similarity index 100%
rename from graphics/icons/aluminum-ore-powder.xcf
rename to sources/graphics/icons/aluminum-ore-powder.xcf
diff --git a/graphics/icons/aluminum-ore.xcf b/sources/graphics/icons/aluminum-ore.xcf
similarity index 100%
rename from graphics/icons/aluminum-ore.xcf
rename to sources/graphics/icons/aluminum-ore.xcf
diff --git a/graphics/icons/aluminum-plate.xcf b/sources/graphics/icons/aluminum-plate.xcf
similarity index 100%
rename from graphics/icons/aluminum-plate.xcf
rename to sources/graphics/icons/aluminum-plate.xcf
diff --git a/graphics/icons/automation-core.xcf b/sources/graphics/icons/automation-core.xcf
similarity index 100%
rename from graphics/icons/automation-core.xcf
rename to sources/graphics/icons/automation-core.xcf
diff --git a/graphics/icons/enriched-aluminum-1.xcf b/sources/graphics/icons/enriched-aluminum-1.xcf
similarity index 100%
rename from graphics/icons/enriched-aluminum-1.xcf
rename to sources/graphics/icons/enriched-aluminum-1.xcf
diff --git a/graphics/icons/enriched-aluminum-2.xcf b/sources/graphics/icons/enriched-aluminum-2.xcf
similarity index 100%
rename from graphics/icons/enriched-aluminum-2.xcf
rename to sources/graphics/icons/enriched-aluminum-2.xcf
diff --git a/graphics/icons/enriched-aluminum-3.xcf b/sources/graphics/icons/enriched-aluminum-3.xcf
similarity index 100%
rename from graphics/icons/enriched-aluminum-3.xcf
rename to sources/graphics/icons/enriched-aluminum-3.xcf
diff --git a/graphics/icons/enriched-aluminum.xcf b/sources/graphics/icons/enriched-aluminum.xcf
similarity index 100%
rename from graphics/icons/enriched-aluminum.xcf
rename to sources/graphics/icons/enriched-aluminum.xcf
diff --git a/graphics/icons/molten-aluminum.xcf b/sources/graphics/icons/molten-aluminum.xcf
similarity index 100%
rename from graphics/icons/molten-aluminum.xcf
rename to sources/graphics/icons/molten-aluminum.xcf
diff --git a/graphics/icons/spark-plug.xcf b/sources/graphics/icons/spark-plug.xcf
similarity index 100%
rename from graphics/icons/spark-plug.xcf
rename to sources/graphics/icons/spark-plug.xcf
diff --git a/graphics/icons/stacked/acsr-cable-stacked.xcf b/sources/graphics/icons/stacked/acsr-cable-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/acsr-cable-stacked.xcf
rename to sources/graphics/icons/stacked/acsr-cable-stacked.xcf
diff --git a/graphics/icons/stacked/alumina-stacked.xcf b/sources/graphics/icons/stacked/alumina-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/alumina-stacked.xcf
rename to sources/graphics/icons/stacked/alumina-stacked.xcf
diff --git a/graphics/icons/stacked/aluminum-2219-stacked.xcf b/sources/graphics/icons/stacked/aluminum-2219-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/aluminum-2219-stacked.xcf
rename to sources/graphics/icons/stacked/aluminum-2219-stacked.xcf
diff --git a/graphics/icons/stacked/aluminum-6061-stacked.xcf b/sources/graphics/icons/stacked/aluminum-6061-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/aluminum-6061-stacked.xcf
rename to sources/graphics/icons/stacked/aluminum-6061-stacked.xcf
diff --git a/graphics/icons/stacked/aluminum-ore-stacked.xcf b/sources/graphics/icons/stacked/aluminum-ore-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/aluminum-ore-stacked.xcf
rename to sources/graphics/icons/stacked/aluminum-ore-stacked.xcf
diff --git a/graphics/icons/stacked/aluminum-plate-stacked.xcf b/sources/graphics/icons/stacked/aluminum-plate-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/aluminum-plate-stacked.xcf
rename to sources/graphics/icons/stacked/aluminum-plate-stacked.xcf
diff --git a/graphics/icons/stacked/automation-core-stacked.xcf b/sources/graphics/icons/stacked/automation-core-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/automation-core-stacked.xcf
rename to sources/graphics/icons/stacked/automation-core-stacked.xcf
diff --git a/graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf b/sources/graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf
rename to sources/graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf
diff --git a/graphics/icons/stacked/spark-plug-stacked.xcf b/sources/graphics/icons/stacked/spark-plug-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/spark-plug-stacked.xcf
rename to sources/graphics/icons/stacked/spark-plug-stacked.xcf
diff --git a/graphics/icons/stacked/ti-sapphire-stacked.xcf b/sources/graphics/icons/stacked/ti-sapphire-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/ti-sapphire-stacked.xcf
rename to sources/graphics/icons/stacked/ti-sapphire-stacked.xcf
diff --git a/graphics/icons/ti-sapphire.xcf b/sources/graphics/icons/ti-sapphire.xcf
similarity index 100%
rename from graphics/icons/ti-sapphire.xcf
rename to sources/graphics/icons/ti-sapphire.xcf
diff --git a/graphics/technology/automation-core.xcf b/sources/graphics/technology/automation-core.xcf
similarity index 100%
rename from graphics/technology/automation-core.xcf
rename to sources/graphics/technology/automation-core.xcf
diff --git a/graphics/technology/reinforced-cable.xcf b/sources/graphics/technology/reinforced-cable.xcf
similarity index 100%
rename from graphics/technology/reinforced-cable.xcf
rename to sources/graphics/technology/reinforced-cable.xcf
diff --git a/thumbnail.xcf b/sources/thumbnail.xcf
similarity index 100%
rename from thumbnail.xcf
rename to sources/thumbnail.xcf