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/LICENSE.md b/bztin2/LICENSE.md
similarity index 100%
rename from LICENSE.md
rename to bztin2/LICENSE.md
diff --git a/alloy-separation.lua b/bztin2/alloy-separation.lua
similarity index 100%
rename from alloy-separation.lua
rename to bztin2/alloy-separation.lua
diff --git a/cables.lua b/bztin2/cables.lua
similarity index 100%
rename from cables.lua
rename to bztin2/cables.lua
diff --git a/changelog.txt b/bztin2/changelog.txt
similarity index 100%
rename from changelog.txt
rename to bztin2/changelog.txt
diff --git a/compatibility/248k.lua b/bztin2/compatibility/248k.lua
similarity index 100%
rename from compatibility/248k.lua
rename to bztin2/compatibility/248k.lua
diff --git a/compatibility/data/hot-metals.lua b/bztin2/compatibility/data/hot-metals.lua
similarity index 100%
rename from compatibility/data/hot-metals.lua
rename to bztin2/compatibility/data/hot-metals.lua
diff --git a/compatibility/sciencecosttweakerm.lua b/bztin2/compatibility/sciencecosttweakerm.lua
similarity index 100%
rename from compatibility/sciencecosttweakerm.lua
rename to bztin2/compatibility/sciencecosttweakerm.lua
diff --git a/control-util.lua b/bztin2/control-util.lua
similarity index 100%
rename from control-util.lua
rename to bztin2/control-util.lua
diff --git a/control.lua b/bztin2/control.lua
similarity index 100%
rename from control.lua
rename to bztin2/control.lua
diff --git a/data-final-fixes.lua b/bztin2/data-final-fixes.lua
similarity index 100%
rename from data-final-fixes.lua
rename to bztin2/data-final-fixes.lua
diff --git a/data-updates.lua b/bztin2/data-updates.lua
similarity index 100%
rename from data-updates.lua
rename to bztin2/data-updates.lua
diff --git a/data-util.lua b/bztin2/data-util.lua
similarity index 100%
rename from data-util.lua
rename to bztin2/data-util.lua
diff --git a/data.lua b/bztin2/data.lua
similarity index 100%
rename from data.lua
rename to bztin2/data.lua
diff --git a/graphics/entity/ores/hr-tin-ore.png b/bztin2/graphics/entity/ores/hr-tin-ore.png
similarity index 100%
rename from graphics/entity/ores/hr-tin-ore.png
rename to bztin2/graphics/entity/ores/hr-tin-ore.png
diff --git a/graphics/icons/bronze-plate.png b/bztin2/graphics/icons/bronze-plate.png
similarity index 100%
rename from graphics/icons/bronze-plate.png
rename to bztin2/graphics/icons/bronze-plate.png
diff --git a/graphics/icons/enriched-tin-1.png b/bztin2/graphics/icons/enriched-tin-1.png
similarity index 100%
rename from graphics/icons/enriched-tin-1.png
rename to bztin2/graphics/icons/enriched-tin-1.png
diff --git a/graphics/icons/enriched-tin-2.png b/bztin2/graphics/icons/enriched-tin-2.png
similarity index 100%
rename from graphics/icons/enriched-tin-2.png
rename to bztin2/graphics/icons/enriched-tin-2.png
diff --git a/graphics/icons/enriched-tin-3.png b/bztin2/graphics/icons/enriched-tin-3.png
similarity index 100%
rename from graphics/icons/enriched-tin-3.png
rename to bztin2/graphics/icons/enriched-tin-3.png
diff --git a/graphics/icons/enriched-tin.png b/bztin2/graphics/icons/enriched-tin.png
similarity index 100%
rename from graphics/icons/enriched-tin.png
rename to bztin2/graphics/icons/enriched-tin.png
diff --git a/graphics/icons/jellyskin.png b/bztin2/graphics/icons/jellyskin.png
similarity index 100%
rename from graphics/icons/jellyskin.png
rename to bztin2/graphics/icons/jellyskin.png
diff --git a/graphics/icons/molten-tin-sa.png b/bztin2/graphics/icons/molten-tin-sa.png
similarity index 100%
rename from graphics/icons/molten-tin-sa.png
rename to bztin2/graphics/icons/molten-tin-sa.png
diff --git a/graphics/icons/molten-tin.png b/bztin2/graphics/icons/molten-tin.png
similarity index 100%
rename from graphics/icons/molten-tin.png
rename to bztin2/graphics/icons/molten-tin.png
diff --git a/graphics/icons/organotins.png b/bztin2/graphics/icons/organotins.png
similarity index 100%
rename from graphics/icons/organotins.png
rename to bztin2/graphics/icons/organotins.png
diff --git a/graphics/icons/solder.png b/bztin2/graphics/icons/solder.png
similarity index 100%
rename from graphics/icons/solder.png
rename to bztin2/graphics/icons/solder.png
diff --git a/graphics/icons/stacked/bronze-plate-stacked.png b/bztin2/graphics/icons/stacked/bronze-plate-stacked.png
similarity index 100%
rename from graphics/icons/stacked/bronze-plate-stacked.png
rename to bztin2/graphics/icons/stacked/bronze-plate-stacked.png
diff --git a/graphics/icons/stacked/enriched-tin-ore-stacked.png b/bztin2/graphics/icons/stacked/enriched-tin-ore-stacked.png
similarity index 100%
rename from graphics/icons/stacked/enriched-tin-ore-stacked.png
rename to bztin2/graphics/icons/stacked/enriched-tin-ore-stacked.png
diff --git a/graphics/icons/stacked/enriched-tin-stacked.png b/bztin2/graphics/icons/stacked/enriched-tin-stacked.png
similarity index 100%
rename from graphics/icons/stacked/enriched-tin-stacked.png
rename to bztin2/graphics/icons/stacked/enriched-tin-stacked.png
diff --git a/graphics/icons/stacked/solder-stacked.png b/bztin2/graphics/icons/stacked/solder-stacked.png
similarity index 100%
rename from graphics/icons/stacked/solder-stacked.png
rename to bztin2/graphics/icons/stacked/solder-stacked.png
diff --git a/graphics/icons/stacked/tin-ore-stacked.png b/bztin2/graphics/icons/stacked/tin-ore-stacked.png
similarity index 100%
rename from graphics/icons/stacked/tin-ore-stacked.png
rename to bztin2/graphics/icons/stacked/tin-ore-stacked.png
diff --git a/graphics/icons/stacked/tin-plate-stacked.png b/bztin2/graphics/icons/stacked/tin-plate-stacked.png
similarity index 100%
rename from graphics/icons/stacked/tin-plate-stacked.png
rename to bztin2/graphics/icons/stacked/tin-plate-stacked.png
diff --git a/graphics/icons/tin-ingot.png b/bztin2/graphics/icons/tin-ingot.png
similarity index 100%
rename from graphics/icons/tin-ingot.png
rename to bztin2/graphics/icons/tin-ingot.png
diff --git a/graphics/icons/tin-ore-1.png b/bztin2/graphics/icons/tin-ore-1.png
similarity index 100%
rename from graphics/icons/tin-ore-1.png
rename to bztin2/graphics/icons/tin-ore-1.png
diff --git a/graphics/icons/tin-ore-2.png b/bztin2/graphics/icons/tin-ore-2.png
similarity index 100%
rename from graphics/icons/tin-ore-2.png
rename to bztin2/graphics/icons/tin-ore-2.png
diff --git a/graphics/icons/tin-ore-3.png b/bztin2/graphics/icons/tin-ore-3.png
similarity index 100%
rename from graphics/icons/tin-ore-3.png
rename to bztin2/graphics/icons/tin-ore-3.png
diff --git a/graphics/icons/tin-ore-powder.png b/bztin2/graphics/icons/tin-ore-powder.png
similarity index 100%
rename from graphics/icons/tin-ore-powder.png
rename to bztin2/graphics/icons/tin-ore-powder.png
diff --git a/graphics/icons/tin-ore.png b/bztin2/graphics/icons/tin-ore.png
similarity index 100%
rename from graphics/icons/tin-ore.png
rename to bztin2/graphics/icons/tin-ore.png
diff --git a/graphics/icons/tin-plate.png b/bztin2/graphics/icons/tin-plate.png
similarity index 100%
rename from graphics/icons/tin-plate.png
rename to bztin2/graphics/icons/tin-plate.png
diff --git a/graphics/icons/tinned-cable.png b/bztin2/graphics/icons/tinned-cable.png
similarity index 100%
rename from graphics/icons/tinned-cable.png
rename to bztin2/graphics/icons/tinned-cable.png
diff --git a/graphics/technology/organotins.jpg b/bztin2/graphics/technology/organotins.jpg
similarity index 100%
rename from graphics/technology/organotins.jpg
rename to bztin2/graphics/technology/organotins.jpg
diff --git a/graphics/technology/organotins.png b/bztin2/graphics/technology/organotins.png
similarity index 100%
rename from graphics/technology/organotins.png
rename to bztin2/graphics/technology/organotins.png
diff --git a/graphics/technology/reinforced-cable.png b/bztin2/graphics/technology/reinforced-cable.png
similarity index 100%
rename from graphics/technology/reinforced-cable.png
rename to bztin2/graphics/technology/reinforced-cable.png
diff --git a/info.json b/bztin2/info.json
similarity index 100%
rename from info.json
rename to bztin2/info.json
diff --git a/locale/cs/tin.cfg b/bztin2/locale/cs/tin.cfg
similarity index 100%
rename from locale/cs/tin.cfg
rename to bztin2/locale/cs/tin.cfg
diff --git a/locale/en/tin.cfg b/bztin2/locale/en/tin.cfg
similarity index 100%
rename from locale/en/tin.cfg
rename to bztin2/locale/en/tin.cfg
diff --git a/locale/ja/tin.cfg b/bztin2/locale/ja/tin.cfg
similarity index 100%
rename from locale/ja/tin.cfg
rename to bztin2/locale/ja/tin.cfg
diff --git a/locale/ru/tin.cfg b/bztin2/locale/ru/tin.cfg
similarity index 100%
rename from locale/ru/tin.cfg
rename to bztin2/locale/ru/tin.cfg
diff --git a/locale/zh-CN/bztin.cfg b/bztin2/locale/zh-CN/bztin.cfg
similarity index 100%
rename from locale/zh-CN/bztin.cfg
rename to bztin2/locale/zh-CN/bztin.cfg
diff --git a/map-gen-preset-updates.lua b/bztin2/map-gen-preset-updates.lua
similarity index 100%
rename from map-gen-preset-updates.lua
rename to bztin2/map-gen-preset-updates.lua
diff --git a/me.lua b/bztin2/me.lua
similarity index 100%
rename from me.lua
rename to bztin2/me.lua
diff --git a/ruins.lua b/bztin2/ruins.lua
similarity index 100%
rename from ruins.lua
rename to bztin2/ruins.lua
diff --git a/settings-util.lua b/bztin2/settings-util.lua
similarity index 100%
rename from settings-util.lua
rename to bztin2/settings-util.lua
diff --git a/settings.lua b/bztin2/settings.lua
similarity index 100%
rename from settings.lua
rename to bztin2/settings.lua
diff --git a/strange-matter.lua b/bztin2/strange-matter.lua
similarity index 100%
rename from strange-matter.lua
rename to bztin2/strange-matter.lua
diff --git a/thumbnail.png b/bztin2/thumbnail.png
similarity index 100%
rename from thumbnail.png
rename to bztin2/thumbnail.png
diff --git a/tin-enriched.lua b/bztin2/tin-enriched.lua
similarity index 100%
rename from tin-enriched.lua
rename to bztin2/tin-enriched.lua
diff --git a/tin-matter.lua b/bztin2/tin-matter.lua
similarity index 100%
rename from tin-matter.lua
rename to bztin2/tin-matter.lua
diff --git a/tin-ore.lua b/bztin2/tin-ore.lua
similarity index 100%
rename from tin-ore.lua
rename to bztin2/tin-ore.lua
diff --git a/tin-recipe-final-rrr.lua b/bztin2/tin-recipe-final-rrr.lua
similarity index 100%
rename from tin-recipe-final-rrr.lua
rename to bztin2/tin-recipe-final-rrr.lua
diff --git a/tin-recipe-final-stacking.lua b/bztin2/tin-recipe-final-stacking.lua
similarity index 100%
rename from tin-recipe-final-stacking.lua
rename to bztin2/tin-recipe-final-stacking.lua
diff --git a/tin-recipe-se.lua b/bztin2/tin-recipe-se.lua
similarity index 100%
rename from tin-recipe-se.lua
rename to bztin2/tin-recipe-se.lua
diff --git a/tin-recipe-updates.lua b/bztin2/tin-recipe-updates.lua
similarity index 100%
rename from tin-recipe-updates.lua
rename to bztin2/tin-recipe-updates.lua
diff --git a/tin-recipe.lua b/bztin2/tin-recipe.lua
similarity index 100%
rename from tin-recipe.lua
rename to bztin2/tin-recipe.lua
diff --git a/graphics/entity/ores/hr-tin-ore.xcf b/sources/graphics/entity/ores/hr-tin-ore.xcf
similarity index 100%
rename from graphics/entity/ores/hr-tin-ore.xcf
rename to sources/graphics/entity/ores/hr-tin-ore.xcf
diff --git a/graphics/icons/bronze-plate.xcf b/sources/graphics/icons/bronze-plate.xcf
similarity index 100%
rename from graphics/icons/bronze-plate.xcf
rename to sources/graphics/icons/bronze-plate.xcf
diff --git a/graphics/icons/enriched-tin-1.xcf b/sources/graphics/icons/enriched-tin-1.xcf
similarity index 100%
rename from graphics/icons/enriched-tin-1.xcf
rename to sources/graphics/icons/enriched-tin-1.xcf
diff --git a/graphics/icons/enriched-tin-2.xcf b/sources/graphics/icons/enriched-tin-2.xcf
similarity index 100%
rename from graphics/icons/enriched-tin-2.xcf
rename to sources/graphics/icons/enriched-tin-2.xcf
diff --git a/graphics/icons/enriched-tin-3.xcf b/sources/graphics/icons/enriched-tin-3.xcf
similarity index 100%
rename from graphics/icons/enriched-tin-3.xcf
rename to sources/graphics/icons/enriched-tin-3.xcf
diff --git a/graphics/icons/enriched-tin.xcf b/sources/graphics/icons/enriched-tin.xcf
similarity index 100%
rename from graphics/icons/enriched-tin.xcf
rename to sources/graphics/icons/enriched-tin.xcf
diff --git a/graphics/icons/jellyskin.xcf b/sources/graphics/icons/jellyskin.xcf
similarity index 100%
rename from graphics/icons/jellyskin.xcf
rename to sources/graphics/icons/jellyskin.xcf
diff --git a/graphics/icons/molten-tin.xcf b/sources/graphics/icons/molten-tin.xcf
similarity index 100%
rename from graphics/icons/molten-tin.xcf
rename to sources/graphics/icons/molten-tin.xcf
diff --git a/graphics/icons/organotins.xcf b/sources/graphics/icons/organotins.xcf
similarity index 100%
rename from graphics/icons/organotins.xcf
rename to sources/graphics/icons/organotins.xcf
diff --git a/graphics/icons/stacked/bronze-plate-stacked.xcf b/sources/graphics/icons/stacked/bronze-plate-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/bronze-plate-stacked.xcf
rename to sources/graphics/icons/stacked/bronze-plate-stacked.xcf
diff --git a/graphics/icons/stacked/enriched-tin-ore-stacked.xcf b/sources/graphics/icons/stacked/enriched-tin-ore-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/enriched-tin-ore-stacked.xcf
rename to sources/graphics/icons/stacked/enriched-tin-ore-stacked.xcf
diff --git a/graphics/icons/stacked/enriched-tin-stacked.xcf b/sources/graphics/icons/stacked/enriched-tin-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/enriched-tin-stacked.xcf
rename to sources/graphics/icons/stacked/enriched-tin-stacked.xcf
diff --git a/graphics/icons/stacked/solder-stacked.xcf b/sources/graphics/icons/stacked/solder-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/solder-stacked.xcf
rename to sources/graphics/icons/stacked/solder-stacked.xcf
diff --git a/graphics/icons/stacked/tin-ore-stacked.xcf b/sources/graphics/icons/stacked/tin-ore-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/tin-ore-stacked.xcf
rename to sources/graphics/icons/stacked/tin-ore-stacked.xcf
diff --git a/graphics/icons/stacked/tin-plate-stacked.xcf b/sources/graphics/icons/stacked/tin-plate-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/tin-plate-stacked.xcf
rename to sources/graphics/icons/stacked/tin-plate-stacked.xcf
diff --git a/graphics/icons/tin-ingot.xcf b/sources/graphics/icons/tin-ingot.xcf
similarity index 100%
rename from graphics/icons/tin-ingot.xcf
rename to sources/graphics/icons/tin-ingot.xcf
diff --git a/graphics/icons/tin-ore-1.xcf b/sources/graphics/icons/tin-ore-1.xcf
similarity index 100%
rename from graphics/icons/tin-ore-1.xcf
rename to sources/graphics/icons/tin-ore-1.xcf
diff --git a/graphics/icons/tin-ore-2.xcf b/sources/graphics/icons/tin-ore-2.xcf
similarity index 100%
rename from graphics/icons/tin-ore-2.xcf
rename to sources/graphics/icons/tin-ore-2.xcf
diff --git a/graphics/icons/tin-ore-3.xcf b/sources/graphics/icons/tin-ore-3.xcf
similarity index 100%
rename from graphics/icons/tin-ore-3.xcf
rename to sources/graphics/icons/tin-ore-3.xcf
diff --git a/graphics/icons/tin-ore-powder.xcf b/sources/graphics/icons/tin-ore-powder.xcf
similarity index 100%
rename from graphics/icons/tin-ore-powder.xcf
rename to sources/graphics/icons/tin-ore-powder.xcf
diff --git a/graphics/icons/tin-ore.xcf b/sources/graphics/icons/tin-ore.xcf
similarity index 100%
rename from graphics/icons/tin-ore.xcf
rename to sources/graphics/icons/tin-ore.xcf
diff --git a/graphics/icons/tin-plate.xcf b/sources/graphics/icons/tin-plate.xcf
similarity index 100%
rename from graphics/icons/tin-plate.xcf
rename to sources/graphics/icons/tin-plate.xcf
diff --git a/graphics/icons/tinned-cable.xcf b/sources/graphics/icons/tinned-cable.xcf
similarity index 100%
rename from graphics/icons/tinned-cable.xcf
rename to sources/graphics/icons/tinned-cable.xcf
diff --git a/graphics/molten-tin-sa.xcf b/sources/graphics/molten-tin-sa.xcf
similarity index 100%
rename from graphics/molten-tin-sa.xcf
rename to sources/graphics/molten-tin-sa.xcf
diff --git a/sources/graphics/technology/organotins.jpg b/sources/graphics/technology/organotins.jpg
new file mode 100644
index 0000000..0e212f0
Binary files /dev/null and b/sources/graphics/technology/organotins.jpg differ
diff --git a/graphics/technology/organotins.xcf b/sources/graphics/technology/organotins.xcf
similarity index 100%
rename from graphics/technology/organotins.xcf
rename to sources/graphics/technology/organotins.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