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/bzgold2/LICENSE.md
similarity index 100%
rename from LICENSE.md
rename to bzgold2/LICENSE.md
diff --git a/cables.lua b/bzgold2/cables.lua
similarity index 100%
rename from cables.lua
rename to bzgold2/cables.lua
diff --git a/changelog.txt b/bzgold2/changelog.txt
similarity index 100%
rename from changelog.txt
rename to bzgold2/changelog.txt
diff --git a/compatibility/248k-final.lua b/bzgold2/compatibility/248k-final.lua
similarity index 100%
rename from compatibility/248k-final.lua
rename to bzgold2/compatibility/248k-final.lua
diff --git a/compatibility/248k.lua b/bzgold2/compatibility/248k.lua
similarity index 100%
rename from compatibility/248k.lua
rename to bzgold2/compatibility/248k.lua
diff --git a/compatibility/bobelectronics.lua b/bzgold2/compatibility/bobelectronics.lua
similarity index 100%
rename from compatibility/bobelectronics.lua
rename to bzgold2/compatibility/bobelectronics.lua
diff --git a/compatibility/crafting-efficiency.lua b/bzgold2/compatibility/crafting-efficiency.lua
similarity index 100%
rename from compatibility/crafting-efficiency.lua
rename to bzgold2/compatibility/crafting-efficiency.lua
diff --git a/compatibility/modmashsplintergold.lua b/bzgold2/compatibility/modmashsplintergold.lua
similarity index 100%
rename from compatibility/modmashsplintergold.lua
rename to bzgold2/compatibility/modmashsplintergold.lua
diff --git a/control-util.lua b/bzgold2/control-util.lua
similarity index 100%
rename from control-util.lua
rename to bzgold2/control-util.lua
diff --git a/data-final-fixes.lua b/bzgold2/data-final-fixes.lua
similarity index 100%
rename from data-final-fixes.lua
rename to bzgold2/data-final-fixes.lua
diff --git a/data-updates.lua b/bzgold2/data-updates.lua
similarity index 100%
rename from data-updates.lua
rename to bzgold2/data-updates.lua
diff --git a/data-util.lua b/bzgold2/data-util.lua
similarity index 100%
rename from data-util.lua
rename to bzgold2/data-util.lua
diff --git a/data.lua b/bzgold2/data.lua
similarity index 100%
rename from data.lua
rename to bzgold2/data.lua
diff --git a/description.md b/bzgold2/description.md
similarity index 100%
rename from description.md
rename to bzgold2/description.md
diff --git a/graphics/entity/ores/hr-gold-ore.png b/bzgold2/graphics/entity/ores/hr-gold-ore.png
similarity index 100%
rename from graphics/entity/ores/hr-gold-ore.png
rename to bzgold2/graphics/entity/ores/hr-gold-ore.png
diff --git a/graphics/entity/ores/hr-rich-copper-ore.png b/bzgold2/graphics/entity/ores/hr-rich-copper-ore.png
similarity index 100%
rename from graphics/entity/ores/hr-rich-copper-ore.png
rename to bzgold2/graphics/entity/ores/hr-rich-copper-ore.png
diff --git a/graphics/entity/ores/particle/hr-gold-ore-particle-1.png b/bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-1.png
similarity index 100%
rename from graphics/entity/ores/particle/hr-gold-ore-particle-1.png
rename to bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-1.png
diff --git a/graphics/entity/ores/particle/hr-gold-ore-particle-2.png b/bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-2.png
similarity index 100%
rename from graphics/entity/ores/particle/hr-gold-ore-particle-2.png
rename to bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-2.png
diff --git a/graphics/entity/ores/particle/hr-gold-ore-particle-3.png b/bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-3.png
similarity index 100%
rename from graphics/entity/ores/particle/hr-gold-ore-particle-3.png
rename to bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-3.png
diff --git a/graphics/entity/ores/particle/hr-gold-ore-particle-4.png b/bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-4.png
similarity index 100%
rename from graphics/entity/ores/particle/hr-gold-ore-particle-4.png
rename to bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-4.png
diff --git a/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-1.png b/bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-1.png
similarity index 100%
rename from graphics/entity/ores/particle/hr-gold-ore-particle-shadow-1.png
rename to bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-1.png
diff --git a/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-2.png b/bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-2.png
similarity index 100%
rename from graphics/entity/ores/particle/hr-gold-ore-particle-shadow-2.png
rename to bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-2.png
diff --git a/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-3.png b/bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-3.png
similarity index 100%
rename from graphics/entity/ores/particle/hr-gold-ore-particle-shadow-3.png
rename to bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-3.png
diff --git a/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-4.png b/bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-4.png
similarity index 100%
rename from graphics/entity/ores/particle/hr-gold-ore-particle-shadow-4.png
rename to bzgold2/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-4.png
diff --git a/graphics/icons/enriched-gold.png b/bzgold2/graphics/icons/enriched-gold.png
similarity index 100%
rename from graphics/icons/enriched-gold.png
rename to bzgold2/graphics/icons/enriched-gold.png
diff --git a/graphics/icons/enriched-silver.png b/bzgold2/graphics/icons/enriched-silver.png
similarity index 100%
rename from graphics/icons/enriched-silver.png
rename to bzgold2/graphics/icons/enriched-silver.png
diff --git a/graphics/icons/gold-ingot.png b/bzgold2/graphics/icons/gold-ingot.png
similarity index 100%
rename from graphics/icons/gold-ingot.png
rename to bzgold2/graphics/icons/gold-ingot.png
diff --git a/graphics/icons/gold-ore-1.png b/bzgold2/graphics/icons/gold-ore-1.png
similarity index 100%
rename from graphics/icons/gold-ore-1.png
rename to bzgold2/graphics/icons/gold-ore-1.png
diff --git a/graphics/icons/gold-ore-2.png b/bzgold2/graphics/icons/gold-ore-2.png
similarity index 100%
rename from graphics/icons/gold-ore-2.png
rename to bzgold2/graphics/icons/gold-ore-2.png
diff --git a/graphics/icons/gold-ore-3.png b/bzgold2/graphics/icons/gold-ore-3.png
similarity index 100%
rename from graphics/icons/gold-ore-3.png
rename to bzgold2/graphics/icons/gold-ore-3.png
diff --git a/graphics/icons/gold-ore-4.png b/bzgold2/graphics/icons/gold-ore-4.png
similarity index 100%
rename from graphics/icons/gold-ore-4.png
rename to bzgold2/graphics/icons/gold-ore-4.png
diff --git a/graphics/icons/gold-ore.png b/bzgold2/graphics/icons/gold-ore.png
similarity index 100%
rename from graphics/icons/gold-ore.png
rename to bzgold2/graphics/icons/gold-ore.png
diff --git a/graphics/icons/mainboard.png b/bzgold2/graphics/icons/mainboard.png
similarity index 100%
rename from graphics/icons/mainboard.png
rename to bzgold2/graphics/icons/mainboard.png
diff --git a/graphics/icons/mlcc-1.png b/bzgold2/graphics/icons/mlcc-1.png
similarity index 100%
rename from graphics/icons/mlcc-1.png
rename to bzgold2/graphics/icons/mlcc-1.png
diff --git a/graphics/icons/mlcc-2.png b/bzgold2/graphics/icons/mlcc-2.png
similarity index 100%
rename from graphics/icons/mlcc-2.png
rename to bzgold2/graphics/icons/mlcc-2.png
diff --git a/graphics/icons/mlcc-3.png b/bzgold2/graphics/icons/mlcc-3.png
similarity index 100%
rename from graphics/icons/mlcc-3.png
rename to bzgold2/graphics/icons/mlcc-3.png
diff --git a/graphics/icons/mlcc-4.png b/bzgold2/graphics/icons/mlcc-4.png
similarity index 100%
rename from graphics/icons/mlcc-4.png
rename to bzgold2/graphics/icons/mlcc-4.png
diff --git a/graphics/icons/mlcc.png b/bzgold2/graphics/icons/mlcc.png
similarity index 100%
rename from graphics/icons/mlcc.png
rename to bzgold2/graphics/icons/mlcc.png
diff --git a/graphics/icons/molten-gold.png b/bzgold2/graphics/icons/molten-gold.png
similarity index 100%
rename from graphics/icons/molten-gold.png
rename to bzgold2/graphics/icons/molten-gold.png
diff --git a/graphics/icons/molten-silver.png b/bzgold2/graphics/icons/molten-silver.png
similarity index 100%
rename from graphics/icons/molten-silver.png
rename to bzgold2/graphics/icons/molten-silver.png
diff --git a/graphics/icons/palladium-ingot.png b/bzgold2/graphics/icons/palladium-ingot.png
similarity index 100%
rename from graphics/icons/palladium-ingot.png
rename to bzgold2/graphics/icons/palladium-ingot.png
diff --git a/graphics/icons/palladium-powder.png b/bzgold2/graphics/icons/palladium-powder.png
similarity index 100%
rename from graphics/icons/palladium-powder.png
rename to bzgold2/graphics/icons/palladium-powder.png
diff --git a/graphics/icons/platinum-ingot.png b/bzgold2/graphics/icons/platinum-ingot.png
similarity index 100%
rename from graphics/icons/platinum-ingot.png
rename to bzgold2/graphics/icons/platinum-ingot.png
diff --git a/graphics/icons/platinum-powder.png b/bzgold2/graphics/icons/platinum-powder.png
similarity index 100%
rename from graphics/icons/platinum-powder.png
rename to bzgold2/graphics/icons/platinum-powder.png
diff --git a/graphics/icons/ptpd-catalyst-1.png b/bzgold2/graphics/icons/ptpd-catalyst-1.png
similarity index 100%
rename from graphics/icons/ptpd-catalyst-1.png
rename to bzgold2/graphics/icons/ptpd-catalyst-1.png
diff --git a/graphics/icons/ptpd-catalyst-2.png b/bzgold2/graphics/icons/ptpd-catalyst-2.png
similarity index 100%
rename from graphics/icons/ptpd-catalyst-2.png
rename to bzgold2/graphics/icons/ptpd-catalyst-2.png
diff --git a/graphics/icons/ptpd-catalyst-3.png b/bzgold2/graphics/icons/ptpd-catalyst-3.png
similarity index 100%
rename from graphics/icons/ptpd-catalyst-3.png
rename to bzgold2/graphics/icons/ptpd-catalyst-3.png
diff --git a/graphics/icons/ptpd-catalyst.png b/bzgold2/graphics/icons/ptpd-catalyst.png
similarity index 100%
rename from graphics/icons/ptpd-catalyst.png
rename to bzgold2/graphics/icons/ptpd-catalyst.png
diff --git a/graphics/icons/rich-copper-ore-1.png b/bzgold2/graphics/icons/rich-copper-ore-1.png
similarity index 100%
rename from graphics/icons/rich-copper-ore-1.png
rename to bzgold2/graphics/icons/rich-copper-ore-1.png
diff --git a/graphics/icons/rich-copper-ore-2.png b/bzgold2/graphics/icons/rich-copper-ore-2.png
similarity index 100%
rename from graphics/icons/rich-copper-ore-2.png
rename to bzgold2/graphics/icons/rich-copper-ore-2.png
diff --git a/graphics/icons/rich-copper-ore-3.png b/bzgold2/graphics/icons/rich-copper-ore-3.png
similarity index 100%
rename from graphics/icons/rich-copper-ore-3.png
rename to bzgold2/graphics/icons/rich-copper-ore-3.png
diff --git a/graphics/icons/rich-copper-ore.png b/bzgold2/graphics/icons/rich-copper-ore.png
similarity index 100%
rename from graphics/icons/rich-copper-ore.png
rename to bzgold2/graphics/icons/rich-copper-ore.png
diff --git a/graphics/icons/silver-brazing-alloy.png b/bzgold2/graphics/icons/silver-brazing-alloy.png
similarity index 100%
rename from graphics/icons/silver-brazing-alloy.png
rename to bzgold2/graphics/icons/silver-brazing-alloy.png
diff --git a/graphics/icons/silver-ingot.png b/bzgold2/graphics/icons/silver-ingot.png
similarity index 100%
rename from graphics/icons/silver-ingot.png
rename to bzgold2/graphics/icons/silver-ingot.png
diff --git a/graphics/icons/silver-ore-1.png b/bzgold2/graphics/icons/silver-ore-1.png
similarity index 100%
rename from graphics/icons/silver-ore-1.png
rename to bzgold2/graphics/icons/silver-ore-1.png
diff --git a/graphics/icons/silver-ore-2.png b/bzgold2/graphics/icons/silver-ore-2.png
similarity index 100%
rename from graphics/icons/silver-ore-2.png
rename to bzgold2/graphics/icons/silver-ore-2.png
diff --git a/graphics/icons/silver-ore-3.png b/bzgold2/graphics/icons/silver-ore-3.png
similarity index 100%
rename from graphics/icons/silver-ore-3.png
rename to bzgold2/graphics/icons/silver-ore-3.png
diff --git a/graphics/icons/silver-ore-4.png b/bzgold2/graphics/icons/silver-ore-4.png
similarity index 100%
rename from graphics/icons/silver-ore-4.png
rename to bzgold2/graphics/icons/silver-ore-4.png
diff --git a/graphics/icons/silver-ore.png b/bzgold2/graphics/icons/silver-ore.png
similarity index 100%
rename from graphics/icons/silver-ore.png
rename to bzgold2/graphics/icons/silver-ore.png
diff --git a/graphics/icons/silver-plate.png b/bzgold2/graphics/icons/silver-plate.png
similarity index 100%
rename from graphics/icons/silver-plate.png
rename to bzgold2/graphics/icons/silver-plate.png
diff --git a/graphics/icons/silver-wire.png b/bzgold2/graphics/icons/silver-wire.png
similarity index 100%
rename from graphics/icons/silver-wire.png
rename to bzgold2/graphics/icons/silver-wire.png
diff --git a/graphics/icons/temperature-sensor.png b/bzgold2/graphics/icons/temperature-sensor.png
similarity index 100%
rename from graphics/icons/temperature-sensor.png
rename to bzgold2/graphics/icons/temperature-sensor.png
diff --git a/graphics/icons/titanium-palladium-alloy.png b/bzgold2/graphics/icons/titanium-palladium-alloy.png
similarity index 100%
rename from graphics/icons/titanium-palladium-alloy.png
rename to bzgold2/graphics/icons/titanium-palladium-alloy.png
diff --git a/graphics/technology/gold-processing.png b/bzgold2/graphics/technology/gold-processing.png
similarity index 100%
rename from graphics/technology/gold-processing.png
rename to bzgold2/graphics/technology/gold-processing.png
diff --git a/graphics/technology/mlcc.png b/bzgold2/graphics/technology/mlcc.png
similarity index 100%
rename from graphics/technology/mlcc.png
rename to bzgold2/graphics/technology/mlcc.png
diff --git a/graphics/technology/palladium-processing.png b/bzgold2/graphics/technology/palladium-processing.png
similarity index 100%
rename from graphics/technology/palladium-processing.png
rename to bzgold2/graphics/technology/palladium-processing.png
diff --git a/graphics/technology/platinum-processing.png b/bzgold2/graphics/technology/platinum-processing.png
similarity index 100%
rename from graphics/technology/platinum-processing.png
rename to bzgold2/graphics/technology/platinum-processing.png
diff --git a/graphics/technology/silver-processing.png b/bzgold2/graphics/technology/silver-processing.png
similarity index 100%
rename from graphics/technology/silver-processing.png
rename to bzgold2/graphics/technology/silver-processing.png
diff --git a/graphics/technology/temperature-sensor.png b/bzgold2/graphics/technology/temperature-sensor.png
similarity index 100%
rename from graphics/technology/temperature-sensor.png
rename to bzgold2/graphics/technology/temperature-sensor.png
diff --git a/info.json b/bzgold2/info.json
similarity index 100%
rename from info.json
rename to bzgold2/info.json
diff --git a/locale/en/noble.cfg b/bzgold2/locale/en/noble.cfg
similarity index 100%
rename from locale/en/noble.cfg
rename to bzgold2/locale/en/noble.cfg
diff --git a/locale/ja/noble.cfg b/bzgold2/locale/ja/noble.cfg
similarity index 100%
rename from locale/ja/noble.cfg
rename to bzgold2/locale/ja/noble.cfg
diff --git a/locale/zh-CN/noble.cfg b/bzgold2/locale/zh-CN/noble.cfg
similarity index 100%
rename from locale/zh-CN/noble.cfg
rename to bzgold2/locale/zh-CN/noble.cfg
diff --git a/map-gen-preset-updates.lua b/bzgold2/map-gen-preset-updates.lua
similarity index 100%
rename from map-gen-preset-updates.lua
rename to bzgold2/map-gen-preset-updates.lua
diff --git a/matter.lua b/bzgold2/matter.lua
similarity index 100%
rename from matter.lua
rename to bzgold2/matter.lua
diff --git a/me.lua b/bzgold2/me.lua
similarity index 100%
rename from me.lua
rename to bzgold2/me.lua
diff --git a/migrations/bzgold.0.0.15.json b/bzgold2/migrations/bzgold.0.0.15.json
similarity index 100%
rename from migrations/bzgold.0.0.15.json
rename to bzgold2/migrations/bzgold.0.0.15.json
diff --git a/migrations/bzgold.0.0.6.json b/bzgold2/migrations/bzgold.0.0.6.json
similarity index 100%
rename from migrations/bzgold.0.0.6.json
rename to bzgold2/migrations/bzgold.0.0.6.json
diff --git a/modules.lua b/bzgold2/modules.lua
similarity index 100%
rename from modules.lua
rename to bzgold2/modules.lua
diff --git a/prototypes/alchemy.lua b/bzgold2/prototypes/alchemy.lua
similarity index 100%
rename from prototypes/alchemy.lua
rename to bzgold2/prototypes/alchemy.lua
diff --git a/prototypes/catalyst.lua b/bzgold2/prototypes/catalyst.lua
similarity index 100%
rename from prototypes/catalyst.lua
rename to bzgold2/prototypes/catalyst.lua
diff --git a/prototypes/cpu.lua b/bzgold2/prototypes/cpu.lua
similarity index 100%
rename from prototypes/cpu.lua
rename to bzgold2/prototypes/cpu.lua
diff --git a/prototypes/electronic-circuit-final.lua b/bzgold2/prototypes/electronic-circuit-final.lua
similarity index 100%
rename from prototypes/electronic-circuit-final.lua
rename to bzgold2/prototypes/electronic-circuit-final.lua
diff --git a/prototypes/enriched-gold.lua b/bzgold2/prototypes/enriched-gold.lua
similarity index 100%
rename from prototypes/enriched-gold.lua
rename to bzgold2/prototypes/enriched-gold.lua
diff --git a/prototypes/enriched-silver.lua b/bzgold2/prototypes/enriched-silver.lua
similarity index 100%
rename from prototypes/enriched-silver.lua
rename to bzgold2/prototypes/enriched-silver.lua
diff --git a/prototypes/gold-ore.lua b/bzgold2/prototypes/gold-ore.lua
similarity index 100%
rename from prototypes/gold-ore.lua
rename to bzgold2/prototypes/gold-ore.lua
diff --git a/prototypes/gold.lua b/bzgold2/prototypes/gold.lua
similarity index 100%
rename from prototypes/gold.lua
rename to bzgold2/prototypes/gold.lua
diff --git a/prototypes/mainboard.lua b/bzgold2/prototypes/mainboard.lua
similarity index 100%
rename from prototypes/mainboard.lua
rename to bzgold2/prototypes/mainboard.lua
diff --git a/prototypes/mlcc.lua b/bzgold2/prototypes/mlcc.lua
similarity index 100%
rename from prototypes/mlcc.lua
rename to bzgold2/prototypes/mlcc.lua
diff --git a/prototypes/oil-updates.lua b/bzgold2/prototypes/oil-updates.lua
similarity index 100%
rename from prototypes/oil-updates.lua
rename to bzgold2/prototypes/oil-updates.lua
diff --git a/prototypes/palladium.lua b/bzgold2/prototypes/palladium.lua
similarity index 100%
rename from prototypes/palladium.lua
rename to bzgold2/prototypes/palladium.lua
diff --git a/prototypes/platinum.lua b/bzgold2/prototypes/platinum.lua
similarity index 100%
rename from prototypes/platinum.lua
rename to bzgold2/prototypes/platinum.lua
diff --git a/prototypes/processing-unit-updates.lua b/bzgold2/prototypes/processing-unit-updates.lua
similarity index 100%
rename from prototypes/processing-unit-updates.lua
rename to bzgold2/prototypes/processing-unit-updates.lua
diff --git a/prototypes/pyroflux-gold.lua b/bzgold2/prototypes/pyroflux-gold.lua
similarity index 100%
rename from prototypes/pyroflux-gold.lua
rename to bzgold2/prototypes/pyroflux-gold.lua
diff --git a/prototypes/pyroflux-silver.lua b/bzgold2/prototypes/pyroflux-silver.lua
similarity index 100%
rename from prototypes/pyroflux-silver.lua
rename to bzgold2/prototypes/pyroflux-silver.lua
diff --git a/prototypes/recipe-updates-se.lua b/bzgold2/prototypes/recipe-updates-se.lua
similarity index 100%
rename from prototypes/recipe-updates-se.lua
rename to bzgold2/prototypes/recipe-updates-se.lua
diff --git a/prototypes/recipe-updates.lua b/bzgold2/prototypes/recipe-updates.lua
similarity index 100%
rename from prototypes/recipe-updates.lua
rename to bzgold2/prototypes/recipe-updates.lua
diff --git a/prototypes/recipes-se.lua b/bzgold2/prototypes/recipes-se.lua
similarity index 100%
rename from prototypes/recipes-se.lua
rename to bzgold2/prototypes/recipes-se.lua
diff --git a/prototypes/rich-copper.lua b/bzgold2/prototypes/rich-copper.lua
similarity index 100%
rename from prototypes/rich-copper.lua
rename to bzgold2/prototypes/rich-copper.lua
diff --git a/prototypes/silver.lua b/bzgold2/prototypes/silver.lua
similarity index 100%
rename from prototypes/silver.lua
rename to bzgold2/prototypes/silver.lua
diff --git a/prototypes/tech-updates.lua b/bzgold2/prototypes/tech-updates.lua
similarity index 100%
rename from prototypes/tech-updates.lua
rename to bzgold2/prototypes/tech-updates.lua
diff --git a/prototypes/temperature-sensor.lua b/bzgold2/prototypes/temperature-sensor.lua
similarity index 100%
rename from prototypes/temperature-sensor.lua
rename to bzgold2/prototypes/temperature-sensor.lua
diff --git a/settings-util.lua b/bzgold2/settings-util.lua
similarity index 100%
rename from settings-util.lua
rename to bzgold2/settings-util.lua
diff --git a/settings.lua b/bzgold2/settings.lua
similarity index 100%
rename from settings.lua
rename to bzgold2/settings.lua
diff --git a/stacking.lua b/bzgold2/stacking.lua
similarity index 100%
rename from stacking.lua
rename to bzgold2/stacking.lua
diff --git a/thumbnail.png b/bzgold2/thumbnail.png
similarity index 100%
rename from thumbnail.png
rename to bzgold2/thumbnail.png
diff --git a/graphics/entity/ores/gold-ore.png b/graphics/entity/ores/gold-ore.png
deleted file mode 100644
index cf28f0e..0000000
Binary files a/graphics/entity/ores/gold-ore.png and /dev/null differ
diff --git a/graphics/entity/ores/particle/gold-ore-particle-1.png b/graphics/entity/ores/particle/gold-ore-particle-1.png
deleted file mode 100644
index c6817dc..0000000
Binary files a/graphics/entity/ores/particle/gold-ore-particle-1.png and /dev/null differ
diff --git a/graphics/entity/ores/particle/gold-ore-particle-2.png b/graphics/entity/ores/particle/gold-ore-particle-2.png
deleted file mode 100644
index 403a5d8..0000000
Binary files a/graphics/entity/ores/particle/gold-ore-particle-2.png and /dev/null differ
diff --git a/graphics/entity/ores/particle/gold-ore-particle-3.png b/graphics/entity/ores/particle/gold-ore-particle-3.png
deleted file mode 100644
index b2bc37b..0000000
Binary files a/graphics/entity/ores/particle/gold-ore-particle-3.png and /dev/null differ
diff --git a/graphics/entity/ores/particle/gold-ore-particle-4.png b/graphics/entity/ores/particle/gold-ore-particle-4.png
deleted file mode 100644
index 9e312f6..0000000
Binary files a/graphics/entity/ores/particle/gold-ore-particle-4.png and /dev/null differ
diff --git a/graphics/entity/ores/particle/gold-ore-particle-shadow-1.png b/graphics/entity/ores/particle/gold-ore-particle-shadow-1.png
deleted file mode 100644
index 1a5bdea..0000000
Binary files a/graphics/entity/ores/particle/gold-ore-particle-shadow-1.png and /dev/null differ
diff --git a/graphics/entity/ores/particle/gold-ore-particle-shadow-2.png b/graphics/entity/ores/particle/gold-ore-particle-shadow-2.png
deleted file mode 100644
index 963104d..0000000
Binary files a/graphics/entity/ores/particle/gold-ore-particle-shadow-2.png and /dev/null differ
diff --git a/graphics/entity/ores/particle/gold-ore-particle-shadow-3.png b/graphics/entity/ores/particle/gold-ore-particle-shadow-3.png
deleted file mode 100644
index e44c241..0000000
Binary files a/graphics/entity/ores/particle/gold-ore-particle-shadow-3.png and /dev/null differ
diff --git a/graphics/entity/ores/particle/gold-ore-particle-shadow-4.png b/graphics/entity/ores/particle/gold-ore-particle-shadow-4.png
deleted file mode 100644
index a5f8e6e..0000000
Binary files a/graphics/entity/ores/particle/gold-ore-particle-shadow-4.png and /dev/null differ
diff --git a/graphics/entity/ores/rich-copper-ore.png b/graphics/entity/ores/rich-copper-ore.png
deleted file mode 100644
index ef1887f..0000000
Binary files a/graphics/entity/ores/rich-copper-ore.png and /dev/null differ
diff --git a/gold.png b/sources/gold.png
similarity index 100%
rename from gold.png
rename to sources/gold.png
diff --git a/gold.xcf b/sources/gold.xcf
similarity index 100%
rename from gold.xcf
rename to sources/gold.xcf
diff --git a/graphics/entity/ores/hr-gold-ore.xcf b/sources/graphics/entity/ores/hr-gold-ore.xcf
similarity index 100%
rename from graphics/entity/ores/hr-gold-ore.xcf
rename to sources/graphics/entity/ores/hr-gold-ore.xcf
diff --git a/graphics/entity/ores/hr-rich-copper-ore.xcf b/sources/graphics/entity/ores/hr-rich-copper-ore.xcf
similarity index 100%
rename from graphics/entity/ores/hr-rich-copper-ore.xcf
rename to sources/graphics/entity/ores/hr-rich-copper-ore.xcf
diff --git a/graphics/icons/enriched-gold.xcf b/sources/graphics/icons/enriched-gold.xcf
similarity index 100%
rename from graphics/icons/enriched-gold.xcf
rename to sources/graphics/icons/enriched-gold.xcf
diff --git a/graphics/icons/enriched-silver.xcf b/sources/graphics/icons/enriched-silver.xcf
similarity index 100%
rename from graphics/icons/enriched-silver.xcf
rename to sources/graphics/icons/enriched-silver.xcf
diff --git a/graphics/icons/gold-ore-1.xcf b/sources/graphics/icons/gold-ore-1.xcf
similarity index 100%
rename from graphics/icons/gold-ore-1.xcf
rename to sources/graphics/icons/gold-ore-1.xcf
diff --git a/graphics/icons/gold-ore-2.xcf b/sources/graphics/icons/gold-ore-2.xcf
similarity index 100%
rename from graphics/icons/gold-ore-2.xcf
rename to sources/graphics/icons/gold-ore-2.xcf
diff --git a/graphics/icons/gold-ore-3.xcf b/sources/graphics/icons/gold-ore-3.xcf
similarity index 100%
rename from graphics/icons/gold-ore-3.xcf
rename to sources/graphics/icons/gold-ore-3.xcf
diff --git a/graphics/icons/gold-ore-4.xcf b/sources/graphics/icons/gold-ore-4.xcf
similarity index 100%
rename from graphics/icons/gold-ore-4.xcf
rename to sources/graphics/icons/gold-ore-4.xcf
diff --git a/graphics/icons/gold-ore.xcf b/sources/graphics/icons/gold-ore.xcf
similarity index 100%
rename from graphics/icons/gold-ore.xcf
rename to sources/graphics/icons/gold-ore.xcf
diff --git a/graphics/icons/molten-gold.xcf b/sources/graphics/icons/molten-gold.xcf
similarity index 100%
rename from graphics/icons/molten-gold.xcf
rename to sources/graphics/icons/molten-gold.xcf
diff --git a/graphics/icons/molten-silver.xcf b/sources/graphics/icons/molten-silver.xcf
similarity index 100%
rename from graphics/icons/molten-silver.xcf
rename to sources/graphics/icons/molten-silver.xcf
diff --git a/graphics/icons/palladium-ingot.xcf b/sources/graphics/icons/palladium-ingot.xcf
similarity index 100%
rename from graphics/icons/palladium-ingot.xcf
rename to sources/graphics/icons/palladium-ingot.xcf
diff --git a/graphics/icons/palladium-powder.xcf b/sources/graphics/icons/palladium-powder.xcf
similarity index 100%
rename from graphics/icons/palladium-powder.xcf
rename to sources/graphics/icons/palladium-powder.xcf
diff --git a/graphics/icons/platinum-ingot.xcf b/sources/graphics/icons/platinum-ingot.xcf
similarity index 100%
rename from graphics/icons/platinum-ingot.xcf
rename to sources/graphics/icons/platinum-ingot.xcf
diff --git a/graphics/icons/platinum-powder.xcf b/sources/graphics/icons/platinum-powder.xcf
similarity index 100%
rename from graphics/icons/platinum-powder.xcf
rename to sources/graphics/icons/platinum-powder.xcf
diff --git a/graphics/icons/rich-copper-ore-1.xcf b/sources/graphics/icons/rich-copper-ore-1.xcf
similarity index 100%
rename from graphics/icons/rich-copper-ore-1.xcf
rename to sources/graphics/icons/rich-copper-ore-1.xcf
diff --git a/graphics/icons/rich-copper-ore-2.xcf b/sources/graphics/icons/rich-copper-ore-2.xcf
similarity index 100%
rename from graphics/icons/rich-copper-ore-2.xcf
rename to sources/graphics/icons/rich-copper-ore-2.xcf
diff --git a/graphics/icons/rich-copper-ore-3.xcf b/sources/graphics/icons/rich-copper-ore-3.xcf
similarity index 100%
rename from graphics/icons/rich-copper-ore-3.xcf
rename to sources/graphics/icons/rich-copper-ore-3.xcf
diff --git a/graphics/icons/rich-copper-ore.xcf b/sources/graphics/icons/rich-copper-ore.xcf
similarity index 100%
rename from graphics/icons/rich-copper-ore.xcf
rename to sources/graphics/icons/rich-copper-ore.xcf
diff --git a/graphics/icons/silver-ingot.xcf b/sources/graphics/icons/silver-ingot.xcf
similarity index 100%
rename from graphics/icons/silver-ingot.xcf
rename to sources/graphics/icons/silver-ingot.xcf
diff --git a/graphics/icons/silver-ore-1.xcf b/sources/graphics/icons/silver-ore-1.xcf
similarity index 100%
rename from graphics/icons/silver-ore-1.xcf
rename to sources/graphics/icons/silver-ore-1.xcf
diff --git a/graphics/icons/silver-ore-2.xcf b/sources/graphics/icons/silver-ore-2.xcf
similarity index 100%
rename from graphics/icons/silver-ore-2.xcf
rename to sources/graphics/icons/silver-ore-2.xcf
diff --git a/graphics/icons/silver-ore-3.xcf b/sources/graphics/icons/silver-ore-3.xcf
similarity index 100%
rename from graphics/icons/silver-ore-3.xcf
rename to sources/graphics/icons/silver-ore-3.xcf
diff --git a/graphics/icons/silver-ore-4.xcf b/sources/graphics/icons/silver-ore-4.xcf
similarity index 100%
rename from graphics/icons/silver-ore-4.xcf
rename to sources/graphics/icons/silver-ore-4.xcf
diff --git a/graphics/icons/silver-ore.xcf b/sources/graphics/icons/silver-ore.xcf
similarity index 100%
rename from graphics/icons/silver-ore.xcf
rename to sources/graphics/icons/silver-ore.xcf
diff --git a/graphics/icons/silver-wire.xcf b/sources/graphics/icons/silver-wire.xcf
similarity index 100%
rename from graphics/icons/silver-wire.xcf
rename to sources/graphics/icons/silver-wire.xcf
diff --git a/palladium.png b/sources/palladium.png
similarity index 100%
rename from palladium.png
rename to sources/palladium.png
diff --git a/palladium.xcf b/sources/palladium.xcf
similarity index 100%
rename from palladium.xcf
rename to sources/palladium.xcf
diff --git a/platinum.png b/sources/platinum.png
similarity index 100%
rename from platinum.png
rename to sources/platinum.png
diff --git a/platinum.xcf b/sources/platinum.xcf
similarity index 100%
rename from platinum.xcf
rename to sources/platinum.xcf
diff --git a/silver.png b/sources/silver.png
similarity index 100%
rename from silver.png
rename to sources/silver.png
diff --git a/silver.xcf b/sources/silver.xcf
similarity index 100%
rename from silver.xcf
rename to sources/silver.xcf
diff --git a/thumbnail.xcf b/sources/thumbnail.xcf
similarity index 100%
rename from thumbnail.xcf
rename to sources/thumbnail.xcf