diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..bbf3e21
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,3 @@
+[*]
+indent_style = space
+indent_size = 2
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index e04c9b6..0000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* brevven
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/bzzirconium2/LICENSE.md
similarity index 100%
rename from LICENSE.md
rename to bzzirconium2/LICENSE.md
diff --git a/basic-foundry.lua b/bzzirconium2/basic-foundry.lua
similarity index 100%
rename from basic-foundry.lua
rename to bzzirconium2/basic-foundry.lua
diff --git a/changelog.txt b/bzzirconium2/changelog.txt
similarity index 100%
rename from changelog.txt
rename to bzzirconium2/changelog.txt
diff --git a/compatibility/hot-metals.lua b/bzzirconium2/compatibility/hot-metals.lua
similarity index 100%
rename from compatibility/hot-metals.lua
rename to bzzirconium2/compatibility/hot-metals.lua
diff --git a/control-util.lua b/bzzirconium2/control-util.lua
similarity index 100%
rename from control-util.lua
rename to bzzirconium2/control-util.lua
diff --git a/control.lua b/bzzirconium2/control.lua
similarity index 100%
rename from control.lua
rename to bzzirconium2/control.lua
diff --git a/data-final-fixes.lua b/bzzirconium2/data-final-fixes.lua
similarity index 100%
rename from data-final-fixes.lua
rename to bzzirconium2/data-final-fixes.lua
diff --git a/data-updates.lua b/bzzirconium2/data-updates.lua
similarity index 100%
rename from data-updates.lua
rename to bzzirconium2/data-updates.lua
diff --git a/data-util.lua b/bzzirconium2/data-util.lua
similarity index 100%
rename from data-util.lua
rename to bzzirconium2/data-util.lua
diff --git a/data.lua b/bzzirconium2/data.lua
similarity index 100%
rename from data.lua
rename to bzzirconium2/data.lua
diff --git a/graphics/entity/ores/hr-zircon.png b/bzzirconium2/graphics/entity/ores/hr-zircon.png
similarity index 100%
rename from graphics/entity/ores/hr-zircon.png
rename to bzzirconium2/graphics/entity/ores/hr-zircon.png
diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-1.png b/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-1.png
similarity index 100%
rename from graphics/entity/zircon-particle/hr-zircon-particle-1.png
rename to bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-1.png
diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-2.png b/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-2.png
similarity index 100%
rename from graphics/entity/zircon-particle/hr-zircon-particle-2.png
rename to bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-2.png
diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-3.png b/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-3.png
similarity index 100%
rename from graphics/entity/zircon-particle/hr-zircon-particle-3.png
rename to bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-3.png
diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-4.png b/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-4.png
similarity index 100%
rename from graphics/entity/zircon-particle/hr-zircon-particle-4.png
rename to bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-4.png
diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png b/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png
similarity index 100%
rename from graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png
rename to bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png
diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png b/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png
similarity index 100%
rename from graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png
rename to bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png
diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png b/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png
similarity index 100%
rename from graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png
rename to bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png
diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png b/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png
similarity index 100%
rename from graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png
rename to bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png
diff --git a/graphics/icons/am-magazine.png b/bzzirconium2/graphics/icons/am-magazine.png
similarity index 100%
rename from graphics/icons/am-magazine.png
rename to bzzirconium2/graphics/icons/am-magazine.png
diff --git a/graphics/icons/cermet-1.png b/bzzirconium2/graphics/icons/cermet-1.png
similarity index 100%
rename from graphics/icons/cermet-1.png
rename to bzzirconium2/graphics/icons/cermet-1.png
diff --git a/graphics/icons/cermet-2.png b/bzzirconium2/graphics/icons/cermet-2.png
similarity index 100%
rename from graphics/icons/cermet-2.png
rename to bzzirconium2/graphics/icons/cermet-2.png
diff --git a/graphics/icons/cermet-3.png b/bzzirconium2/graphics/icons/cermet-3.png
similarity index 100%
rename from graphics/icons/cermet-3.png
rename to bzzirconium2/graphics/icons/cermet-3.png
diff --git a/graphics/icons/cermet-4.png b/bzzirconium2/graphics/icons/cermet-4.png
similarity index 100%
rename from graphics/icons/cermet-4.png
rename to bzzirconium2/graphics/icons/cermet-4.png
diff --git a/graphics/icons/cermet.png b/bzzirconium2/graphics/icons/cermet.png
similarity index 100%
rename from graphics/icons/cermet.png
rename to bzzirconium2/graphics/icons/cermet.png
diff --git a/graphics/icons/enriched-zircon-2.png b/bzzirconium2/graphics/icons/enriched-zircon-2.png
similarity index 100%
rename from graphics/icons/enriched-zircon-2.png
rename to bzzirconium2/graphics/icons/enriched-zircon-2.png
diff --git a/graphics/icons/enriched-zircon-3.png b/bzzirconium2/graphics/icons/enriched-zircon-3.png
similarity index 100%
rename from graphics/icons/enriched-zircon-3.png
rename to bzzirconium2/graphics/icons/enriched-zircon-3.png
diff --git a/graphics/icons/enriched-zircon-4.png b/bzzirconium2/graphics/icons/enriched-zircon-4.png
similarity index 100%
rename from graphics/icons/enriched-zircon-4.png
rename to bzzirconium2/graphics/icons/enriched-zircon-4.png
diff --git a/graphics/icons/enriched-zircon.png b/bzzirconium2/graphics/icons/enriched-zircon.png
similarity index 100%
rename from graphics/icons/enriched-zircon.png
rename to bzzirconium2/graphics/icons/enriched-zircon.png
diff --git a/graphics/icons/magazine.png b/bzzirconium2/graphics/icons/magazine.png
similarity index 100%
rename from graphics/icons/magazine.png
rename to bzzirconium2/graphics/icons/magazine.png
diff --git a/graphics/icons/molten-zirconium.png b/bzzirconium2/graphics/icons/molten-zirconium.png
similarity index 100%
rename from graphics/icons/molten-zirconium.png
rename to bzzirconium2/graphics/icons/molten-zirconium.png
diff --git a/graphics/icons/r-magazine.png b/bzzirconium2/graphics/icons/r-magazine.png
similarity index 100%
rename from graphics/icons/r-magazine.png
rename to bzzirconium2/graphics/icons/r-magazine.png
diff --git a/graphics/icons/stacked/cermet-stacked.png b/bzzirconium2/graphics/icons/stacked/cermet-stacked.png
similarity index 100%
rename from graphics/icons/stacked/cermet-stacked.png
rename to bzzirconium2/graphics/icons/stacked/cermet-stacked.png
diff --git a/graphics/icons/stacked/enriched-zircon-stacked.png b/bzzirconium2/graphics/icons/stacked/enriched-zircon-stacked.png
similarity index 100%
rename from graphics/icons/stacked/enriched-zircon-stacked.png
rename to bzzirconium2/graphics/icons/stacked/enriched-zircon-stacked.png
diff --git a/graphics/icons/stacked/zircaloy-4-stacked.png b/bzzirconium2/graphics/icons/stacked/zircaloy-4-stacked.png
similarity index 100%
rename from graphics/icons/stacked/zircaloy-4-stacked.png
rename to bzzirconium2/graphics/icons/stacked/zircaloy-4-stacked.png
diff --git a/graphics/icons/stacked/zircon-stacked.png b/bzzirconium2/graphics/icons/stacked/zircon-stacked.png
similarity index 100%
rename from graphics/icons/stacked/zircon-stacked.png
rename to bzzirconium2/graphics/icons/stacked/zircon-stacked.png
diff --git a/graphics/icons/stacked/zirconia-stacked.png b/bzzirconium2/graphics/icons/stacked/zirconia-stacked.png
similarity index 100%
rename from graphics/icons/stacked/zirconia-stacked.png
rename to bzzirconium2/graphics/icons/stacked/zirconia-stacked.png
diff --git a/graphics/icons/stacked/zirconium-plate-stacked.png b/bzzirconium2/graphics/icons/stacked/zirconium-plate-stacked.png
similarity index 100%
rename from graphics/icons/stacked/zirconium-plate-stacked.png
rename to bzzirconium2/graphics/icons/stacked/zirconium-plate-stacked.png
diff --git a/graphics/icons/zircaloy-4.png b/bzzirconium2/graphics/icons/zircaloy-4.png
similarity index 100%
rename from graphics/icons/zircaloy-4.png
rename to bzzirconium2/graphics/icons/zircaloy-4.png
diff --git a/graphics/icons/zircon-1.png b/bzzirconium2/graphics/icons/zircon-1.png
similarity index 100%
rename from graphics/icons/zircon-1.png
rename to bzzirconium2/graphics/icons/zircon-1.png
diff --git a/graphics/icons/zircon-2.png b/bzzirconium2/graphics/icons/zircon-2.png
similarity index 100%
rename from graphics/icons/zircon-2.png
rename to bzzirconium2/graphics/icons/zircon-2.png
diff --git a/graphics/icons/zircon-3.png b/bzzirconium2/graphics/icons/zircon-3.png
similarity index 100%
rename from graphics/icons/zircon-3.png
rename to bzzirconium2/graphics/icons/zircon-3.png
diff --git a/graphics/icons/zircon-4.png b/bzzirconium2/graphics/icons/zircon-4.png
similarity index 100%
rename from graphics/icons/zircon-4.png
rename to bzzirconium2/graphics/icons/zircon-4.png
diff --git a/graphics/icons/zircon-powder.png b/bzzirconium2/graphics/icons/zircon-powder.png
similarity index 100%
rename from graphics/icons/zircon-powder.png
rename to bzzirconium2/graphics/icons/zircon-powder.png
diff --git a/graphics/icons/zircon.png b/bzzirconium2/graphics/icons/zircon.png
similarity index 100%
rename from graphics/icons/zircon.png
rename to bzzirconium2/graphics/icons/zircon.png
diff --git a/graphics/icons/zirconia.png b/bzzirconium2/graphics/icons/zirconia.png
similarity index 100%
rename from graphics/icons/zirconia.png
rename to bzzirconium2/graphics/icons/zirconia.png
diff --git a/graphics/icons/zirconium-ingot.png b/bzzirconium2/graphics/icons/zirconium-ingot.png
similarity index 100%
rename from graphics/icons/zirconium-ingot.png
rename to bzzirconium2/graphics/icons/zirconium-ingot.png
diff --git a/graphics/icons/zirconium-plate-old.png b/bzzirconium2/graphics/icons/zirconium-plate-old.png
similarity index 100%
rename from graphics/icons/zirconium-plate-old.png
rename to bzzirconium2/graphics/icons/zirconium-plate-old.png
diff --git a/graphics/icons/zirconium-plate.png b/bzzirconium2/graphics/icons/zirconium-plate.png
similarity index 100%
rename from graphics/icons/zirconium-plate.png
rename to bzzirconium2/graphics/icons/zirconium-plate.png
diff --git a/graphics/icons/zirconium-sponge-1.png b/bzzirconium2/graphics/icons/zirconium-sponge-1.png
similarity index 100%
rename from graphics/icons/zirconium-sponge-1.png
rename to bzzirconium2/graphics/icons/zirconium-sponge-1.png
diff --git a/graphics/icons/zirconium-sponge-2.png b/bzzirconium2/graphics/icons/zirconium-sponge-2.png
similarity index 100%
rename from graphics/icons/zirconium-sponge-2.png
rename to bzzirconium2/graphics/icons/zirconium-sponge-2.png
diff --git a/graphics/icons/zirconium-sponge.png b/bzzirconium2/graphics/icons/zirconium-sponge.png
similarity index 100%
rename from graphics/icons/zirconium-sponge.png
rename to bzzirconium2/graphics/icons/zirconium-sponge.png
diff --git a/graphics/technology/cermet.png b/bzzirconium2/graphics/technology/cermet.png
similarity index 100%
rename from graphics/technology/cermet.png
rename to bzzirconium2/graphics/technology/cermet.png
diff --git a/graphics/technology/zirconia-processing.png b/bzzirconium2/graphics/technology/zirconia-processing.png
similarity index 100%
rename from graphics/technology/zirconia-processing.png
rename to bzzirconium2/graphics/technology/zirconia-processing.png
diff --git a/graphics/technology/zirconium-processing.png b/bzzirconium2/graphics/technology/zirconium-processing.png
similarity index 100%
rename from graphics/technology/zirconium-processing.png
rename to bzzirconium2/graphics/technology/zirconium-processing.png
diff --git a/info.json b/bzzirconium2/info.json
similarity index 100%
rename from info.json
rename to bzzirconium2/info.json
diff --git a/locale/de/zirconium.cfg b/bzzirconium2/locale/de/zirconium.cfg
similarity index 100%
rename from locale/de/zirconium.cfg
rename to bzzirconium2/locale/de/zirconium.cfg
diff --git a/locale/en/zirconium.cfg b/bzzirconium2/locale/en/zirconium.cfg
similarity index 100%
rename from locale/en/zirconium.cfg
rename to bzzirconium2/locale/en/zirconium.cfg
diff --git a/locale/ja/zirconium.cfg b/bzzirconium2/locale/ja/zirconium.cfg
similarity index 100%
rename from locale/ja/zirconium.cfg
rename to bzzirconium2/locale/ja/zirconium.cfg
diff --git a/locale/ko/zirconium.cfg b/bzzirconium2/locale/ko/zirconium.cfg
similarity index 100%
rename from locale/ko/zirconium.cfg
rename to bzzirconium2/locale/ko/zirconium.cfg
diff --git a/locale/pl/zirconium.cfg b/bzzirconium2/locale/pl/zirconium.cfg
similarity index 100%
rename from locale/pl/zirconium.cfg
rename to bzzirconium2/locale/pl/zirconium.cfg
diff --git a/locale/ru/zirconium.cfg b/bzzirconium2/locale/ru/zirconium.cfg
similarity index 100%
rename from locale/ru/zirconium.cfg
rename to bzzirconium2/locale/ru/zirconium.cfg
diff --git a/locale/zh-CN/zirconium.cfg b/bzzirconium2/locale/zh-CN/zirconium.cfg
similarity index 100%
rename from locale/zh-CN/zirconium.cfg
rename to bzzirconium2/locale/zh-CN/zirconium.cfg
diff --git a/magazine.lua b/bzzirconium2/magazine.lua
similarity index 100%
rename from magazine.lua
rename to bzzirconium2/magazine.lua
diff --git a/map-gen-preset-updates.lua b/bzzirconium2/map-gen-preset-updates.lua
similarity index 100%
rename from map-gen-preset-updates.lua
rename to bzzirconium2/map-gen-preset-updates.lua
diff --git a/me.lua b/bzzirconium2/me.lua
similarity index 100%
rename from me.lua
rename to bzzirconium2/me.lua
diff --git a/omni.lua b/bzzirconium2/omni.lua
similarity index 100%
rename from omni.lua
rename to bzzirconium2/omni.lua
diff --git a/settings-util.lua b/bzzirconium2/settings-util.lua
similarity index 100%
rename from settings-util.lua
rename to bzzirconium2/settings-util.lua
diff --git a/settings.lua b/bzzirconium2/settings.lua
similarity index 100%
rename from settings.lua
rename to bzzirconium2/settings.lua
diff --git a/strange-matter.lua b/bzzirconium2/strange-matter.lua
similarity index 100%
rename from strange-matter.lua
rename to bzzirconium2/strange-matter.lua
diff --git a/tech-updates.lua b/bzzirconium2/tech-updates.lua
similarity index 100%
rename from tech-updates.lua
rename to bzzirconium2/tech-updates.lua
diff --git a/thumbnail.png b/bzzirconium2/thumbnail.png
similarity index 100%
rename from thumbnail.png
rename to bzzirconium2/thumbnail.png
diff --git a/vulcanus.lua b/bzzirconium2/vulcanus.lua
similarity index 100%
rename from vulcanus.lua
rename to bzzirconium2/vulcanus.lua
diff --git a/zircon-compressed.lua b/bzzirconium2/zircon-compressed.lua
similarity index 100%
rename from zircon-compressed.lua
rename to bzzirconium2/zircon-compressed.lua
diff --git a/zircon-matter.lua b/bzzirconium2/zircon-matter.lua
similarity index 100%
rename from zircon-matter.lua
rename to bzzirconium2/zircon-matter.lua
diff --git a/zircon-particle.lua b/bzzirconium2/zircon-particle.lua
similarity index 100%
rename from zircon-particle.lua
rename to bzzirconium2/zircon-particle.lua
diff --git a/zircon-rocks.lua b/bzzirconium2/zircon-rocks.lua
similarity index 100%
rename from zircon-rocks.lua
rename to bzzirconium2/zircon-rocks.lua
diff --git a/zircon.lua b/bzzirconium2/zircon.lua
similarity index 100%
rename from zircon.lua
rename to bzzirconium2/zircon.lua
diff --git a/zirconium-asteroid-updates.lua b/bzzirconium2/zirconium-asteroid-updates.lua
similarity index 100%
rename from zirconium-asteroid-updates.lua
rename to bzzirconium2/zirconium-asteroid-updates.lua
diff --git a/zirconium-enriched.lua b/bzzirconium2/zirconium-enriched.lua
similarity index 100%
rename from zirconium-enriched.lua
rename to bzzirconium2/zirconium-enriched.lua
diff --git a/zirconium-recipe-final-rrr.lua b/bzzirconium2/zirconium-recipe-final-rrr.lua
similarity index 100%
rename from zirconium-recipe-final-rrr.lua
rename to bzzirconium2/zirconium-recipe-final-rrr.lua
diff --git a/zirconium-recipe-final-stacking.lua b/bzzirconium2/zirconium-recipe-final-stacking.lua
similarity index 100%
rename from zirconium-recipe-final-stacking.lua
rename to bzzirconium2/zirconium-recipe-final-stacking.lua
diff --git a/zirconium-recipe-se.lua b/bzzirconium2/zirconium-recipe-se.lua
similarity index 100%
rename from zirconium-recipe-se.lua
rename to bzzirconium2/zirconium-recipe-se.lua
diff --git a/zirconium-recipe-updates-lds.lua b/bzzirconium2/zirconium-recipe-updates-lds.lua
similarity index 100%
rename from zirconium-recipe-updates-lds.lua
rename to bzzirconium2/zirconium-recipe-updates-lds.lua
diff --git a/zirconium-recipe-updates.lua b/bzzirconium2/zirconium-recipe-updates.lua
similarity index 100%
rename from zirconium-recipe-updates.lua
rename to bzzirconium2/zirconium-recipe-updates.lua
diff --git a/zirconium-recipe.lua b/bzzirconium2/zirconium-recipe.lua
similarity index 100%
rename from zirconium-recipe.lua
rename to bzzirconium2/zirconium-recipe.lua
diff --git a/graphics/entity/ores/hr-zircon.xcf b/sources/graphics/entity/ores/hr-zircon.xcf
similarity index 100%
rename from graphics/entity/ores/hr-zircon.xcf
rename to sources/graphics/entity/ores/hr-zircon.xcf
diff --git a/graphics/icons/am-magazine.xcf b/sources/graphics/icons/am-magazine.xcf
similarity index 100%
rename from graphics/icons/am-magazine.xcf
rename to sources/graphics/icons/am-magazine.xcf
diff --git a/graphics/icons/cermet-1.xcf b/sources/graphics/icons/cermet-1.xcf
similarity index 100%
rename from graphics/icons/cermet-1.xcf
rename to sources/graphics/icons/cermet-1.xcf
diff --git a/graphics/icons/cermet-2.xcf b/sources/graphics/icons/cermet-2.xcf
similarity index 100%
rename from graphics/icons/cermet-2.xcf
rename to sources/graphics/icons/cermet-2.xcf
diff --git a/graphics/icons/cermet-3.xcf b/sources/graphics/icons/cermet-3.xcf
similarity index 100%
rename from graphics/icons/cermet-3.xcf
rename to sources/graphics/icons/cermet-3.xcf
diff --git a/graphics/icons/cermet-4.xcf b/sources/graphics/icons/cermet-4.xcf
similarity index 100%
rename from graphics/icons/cermet-4.xcf
rename to sources/graphics/icons/cermet-4.xcf
diff --git a/graphics/icons/cermet.xcf b/sources/graphics/icons/cermet.xcf
similarity index 100%
rename from graphics/icons/cermet.xcf
rename to sources/graphics/icons/cermet.xcf
diff --git a/graphics/icons/enriched-zircon-2.xcf b/sources/graphics/icons/enriched-zircon-2.xcf
similarity index 100%
rename from graphics/icons/enriched-zircon-2.xcf
rename to sources/graphics/icons/enriched-zircon-2.xcf
diff --git a/graphics/icons/enriched-zircon-3.xcf b/sources/graphics/icons/enriched-zircon-3.xcf
similarity index 100%
rename from graphics/icons/enriched-zircon-3.xcf
rename to sources/graphics/icons/enriched-zircon-3.xcf
diff --git a/graphics/icons/enriched-zircon-4.xcf b/sources/graphics/icons/enriched-zircon-4.xcf
similarity index 100%
rename from graphics/icons/enriched-zircon-4.xcf
rename to sources/graphics/icons/enriched-zircon-4.xcf
diff --git a/graphics/icons/enriched-zircon.xcf b/sources/graphics/icons/enriched-zircon.xcf
similarity index 100%
rename from graphics/icons/enriched-zircon.xcf
rename to sources/graphics/icons/enriched-zircon.xcf
diff --git a/graphics/icons/magazine.xcf b/sources/graphics/icons/magazine.xcf
similarity index 100%
rename from graphics/icons/magazine.xcf
rename to sources/graphics/icons/magazine.xcf
diff --git a/graphics/icons/molten-zirconium.xcf b/sources/graphics/icons/molten-zirconium.xcf
similarity index 100%
rename from graphics/icons/molten-zirconium.xcf
rename to sources/graphics/icons/molten-zirconium.xcf
diff --git a/graphics/icons/r-magazine.xcf b/sources/graphics/icons/r-magazine.xcf
similarity index 100%
rename from graphics/icons/r-magazine.xcf
rename to sources/graphics/icons/r-magazine.xcf
diff --git a/graphics/icons/stacked/cermet-stacked.xcf b/sources/graphics/icons/stacked/cermet-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/cermet-stacked.xcf
rename to sources/graphics/icons/stacked/cermet-stacked.xcf
diff --git a/graphics/icons/stacked/enriched-zircon-stacked.xcf b/sources/graphics/icons/stacked/enriched-zircon-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/enriched-zircon-stacked.xcf
rename to sources/graphics/icons/stacked/enriched-zircon-stacked.xcf
diff --git a/graphics/icons/stacked/zircaloy-4-stacked.xcf b/sources/graphics/icons/stacked/zircaloy-4-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/zircaloy-4-stacked.xcf
rename to sources/graphics/icons/stacked/zircaloy-4-stacked.xcf
diff --git a/graphics/icons/stacked/zircon-stacked.xcf b/sources/graphics/icons/stacked/zircon-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/zircon-stacked.xcf
rename to sources/graphics/icons/stacked/zircon-stacked.xcf
diff --git a/graphics/icons/stacked/zirconia-stacked.xcf b/sources/graphics/icons/stacked/zirconia-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/zirconia-stacked.xcf
rename to sources/graphics/icons/stacked/zirconia-stacked.xcf
diff --git a/graphics/icons/stacked/zirconium-plate-stacked.xcf b/sources/graphics/icons/stacked/zirconium-plate-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/zirconium-plate-stacked.xcf
rename to sources/graphics/icons/stacked/zirconium-plate-stacked.xcf
diff --git a/graphics/icons/zircaloy-4.xcf b/sources/graphics/icons/zircaloy-4.xcf
similarity index 100%
rename from graphics/icons/zircaloy-4.xcf
rename to sources/graphics/icons/zircaloy-4.xcf
diff --git a/graphics/icons/zircon-powder.xcf b/sources/graphics/icons/zircon-powder.xcf
similarity index 100%
rename from graphics/icons/zircon-powder.xcf
rename to sources/graphics/icons/zircon-powder.xcf
diff --git a/graphics/icons/zircon-stacked-new.xcf b/sources/graphics/icons/zircon-stacked-new.xcf
similarity index 100%
rename from graphics/icons/zircon-stacked-new.xcf
rename to sources/graphics/icons/zircon-stacked-new.xcf
diff --git a/graphics/icons/zirconia.xcf b/sources/graphics/icons/zirconia.xcf
similarity index 100%
rename from graphics/icons/zirconia.xcf
rename to sources/graphics/icons/zirconia.xcf
diff --git a/graphics/icons/zirconium-ingot.xcf b/sources/graphics/icons/zirconium-ingot.xcf
similarity index 100%
rename from graphics/icons/zirconium-ingot.xcf
rename to sources/graphics/icons/zirconium-ingot.xcf
diff --git a/graphics/icons/zirconium-plate-2.xcf b/sources/graphics/icons/zirconium-plate-2.xcf
similarity index 100%
rename from graphics/icons/zirconium-plate-2.xcf
rename to sources/graphics/icons/zirconium-plate-2.xcf
diff --git a/graphics/icons/zirconium-plate-new.xcf b/sources/graphics/icons/zirconium-plate-new.xcf
similarity index 100%
rename from graphics/icons/zirconium-plate-new.xcf
rename to sources/graphics/icons/zirconium-plate-new.xcf
diff --git a/graphics/icons/zirconium-plate-old.xcf b/sources/graphics/icons/zirconium-plate-old.xcf
similarity index 100%
rename from graphics/icons/zirconium-plate-old.xcf
rename to sources/graphics/icons/zirconium-plate-old.xcf
diff --git a/graphics/icons/zirconium-plate.xcf b/sources/graphics/icons/zirconium-plate.xcf
similarity index 100%
rename from graphics/icons/zirconium-plate.xcf
rename to sources/graphics/icons/zirconium-plate.xcf
diff --git a/graphics/icons/zirconium-sponge-1.xcf b/sources/graphics/icons/zirconium-sponge-1.xcf
similarity index 100%
rename from graphics/icons/zirconium-sponge-1.xcf
rename to sources/graphics/icons/zirconium-sponge-1.xcf
diff --git a/graphics/icons/zirconium-sponge-2.xcf b/sources/graphics/icons/zirconium-sponge-2.xcf
similarity index 100%
rename from graphics/icons/zirconium-sponge-2.xcf
rename to sources/graphics/icons/zirconium-sponge-2.xcf
diff --git a/graphics/icons/zirconium-sponge.xcf b/sources/graphics/icons/zirconium-sponge.xcf
similarity index 100%
rename from graphics/icons/zirconium-sponge.xcf
rename to sources/graphics/icons/zirconium-sponge.xcf
diff --git a/graphics/technology/cermet.xcf b/sources/graphics/technology/cermet.xcf
similarity index 100%
rename from graphics/technology/cermet.xcf
rename to sources/graphics/technology/cermet.xcf
diff --git a/graphics/technology/zirconium-processing.xcf b/sources/graphics/technology/zirconium-processing.xcf
similarity index 100%
rename from graphics/technology/zirconium-processing.xcf
rename to sources/graphics/technology/zirconium-processing.xcf
diff --git a/thumbnail.xcf b/sources/thumbnail.xcf
similarity index 100%
rename from thumbnail.xcf
rename to sources/thumbnail.xcf