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/Makefile b/Makefile
deleted file mode 100644
index 18690d6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,41 +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/
-	# Next 3 lines are dev only (uncomment zip lines and comment these)
-	#rm -rf ../../mods/$(v)
-	#mkdir ../../mods/$(v)
-	#cp -r * ../../mods/$(v)
-
-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/bzcarbon2/LICENSE.md
similarity index 100%
rename from LICENSE.md
rename to bzcarbon2/LICENSE.md
diff --git a/carbon-fiber-recipe-updates.lua b/bzcarbon2/carbon-fiber-recipe-updates.lua
similarity index 100%
rename from carbon-fiber-recipe-updates.lua
rename to bzcarbon2/carbon-fiber-recipe-updates.lua
diff --git a/carbon-matter.lua b/bzcarbon2/carbon-matter.lua
similarity index 100%
rename from carbon-matter.lua
rename to bzcarbon2/carbon-matter.lua
diff --git a/carbon-recipe-final-k2.lua b/bzcarbon2/carbon-recipe-final-k2.lua
similarity index 100%
rename from carbon-recipe-final-k2.lua
rename to bzcarbon2/carbon-recipe-final-k2.lua
diff --git a/carbon-recipe-final-rrr.lua b/bzcarbon2/carbon-recipe-final-rrr.lua
similarity index 100%
rename from carbon-recipe-final-rrr.lua
rename to bzcarbon2/carbon-recipe-final-rrr.lua
diff --git a/carbon-recipe-final-se.lua b/bzcarbon2/carbon-recipe-final-se.lua
similarity index 100%
rename from carbon-recipe-final-se.lua
rename to bzcarbon2/carbon-recipe-final-se.lua
diff --git a/carbon-recipe-final-stacking.lua b/bzcarbon2/carbon-recipe-final-stacking.lua
similarity index 100%
rename from carbon-recipe-final-stacking.lua
rename to bzcarbon2/carbon-recipe-final-stacking.lua
diff --git a/carbon-recipe-k2.lua b/bzcarbon2/carbon-recipe-k2.lua
similarity index 100%
rename from carbon-recipe-k2.lua
rename to bzcarbon2/carbon-recipe-k2.lua
diff --git a/carbon-recipe-se.lua b/bzcarbon2/carbon-recipe-se.lua
similarity index 100%
rename from carbon-recipe-se.lua
rename to bzcarbon2/carbon-recipe-se.lua
diff --git a/carbon-recipe-updates.lua b/bzcarbon2/carbon-recipe-updates.lua
similarity index 100%
rename from carbon-recipe-updates.lua
rename to bzcarbon2/carbon-recipe-updates.lua
diff --git a/carbon-recipe.lua b/bzcarbon2/carbon-recipe.lua
similarity index 100%
rename from carbon-recipe.lua
rename to bzcarbon2/carbon-recipe.lua
diff --git a/carbon-util.lua b/bzcarbon2/carbon-util.lua
similarity index 100%
rename from carbon-util.lua
rename to bzcarbon2/carbon-util.lua
diff --git a/changelog.txt b/bzcarbon2/changelog.txt
similarity index 100%
rename from changelog.txt
rename to bzcarbon2/changelog.txt
diff --git a/compatibility/248k.lua b/bzcarbon2/compatibility/248k.lua
similarity index 100%
rename from compatibility/248k.lua
rename to bzcarbon2/compatibility/248k.lua
diff --git a/compatibility/any-planet-start.lua b/bzcarbon2/compatibility/any-planet-start.lua
similarity index 100%
rename from compatibility/any-planet-start.lua
rename to bzcarbon2/compatibility/any-planet-start.lua
diff --git a/compatibility/orewashing.lua b/bzcarbon2/compatibility/orewashing.lua
similarity index 100%
rename from compatibility/orewashing.lua
rename to bzcarbon2/compatibility/orewashing.lua
diff --git a/compatibility/vtkdeepcoremining.lua b/bzcarbon2/compatibility/vtkdeepcoremining.lua
similarity index 100%
rename from compatibility/vtkdeepcoremining.lua
rename to bzcarbon2/compatibility/vtkdeepcoremining.lua
diff --git a/control-util.lua b/bzcarbon2/control-util.lua
similarity index 100%
rename from control-util.lua
rename to bzcarbon2/control-util.lua
diff --git a/control.lua b/bzcarbon2/control.lua
similarity index 100%
rename from control.lua
rename to bzcarbon2/control.lua
diff --git a/data-final-fixes.lua b/bzcarbon2/data-final-fixes.lua
similarity index 100%
rename from data-final-fixes.lua
rename to bzcarbon2/data-final-fixes.lua
diff --git a/data-updates.lua b/bzcarbon2/data-updates.lua
similarity index 100%
rename from data-updates.lua
rename to bzcarbon2/data-updates.lua
diff --git a/data-util.lua b/bzcarbon2/data-util.lua
similarity index 100%
rename from data-util.lua
rename to bzcarbon2/data-util.lua
diff --git a/data.lua b/bzcarbon2/data.lua
similarity index 100%
rename from data.lua
rename to bzcarbon2/data.lua
diff --git a/graphics/entity/ores/hr-diamond.png b/bzcarbon2/graphics/entity/ores/hr-diamond.png
similarity index 100%
rename from graphics/entity/ores/hr-diamond.png
rename to bzcarbon2/graphics/entity/ores/hr-diamond.png
diff --git a/graphics/entity/ores/hr-graphite.png b/bzcarbon2/graphics/entity/ores/hr-graphite.png
similarity index 100%
rename from graphics/entity/ores/hr-graphite.png
rename to bzcarbon2/graphics/entity/ores/hr-graphite.png
diff --git a/graphics/entity/particle/hr-graphite-particle-1.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-1.png
similarity index 100%
rename from graphics/entity/particle/hr-graphite-particle-1.png
rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-1.png
diff --git a/graphics/entity/particle/hr-graphite-particle-2.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-2.png
similarity index 100%
rename from graphics/entity/particle/hr-graphite-particle-2.png
rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-2.png
diff --git a/graphics/entity/particle/hr-graphite-particle-3.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-3.png
similarity index 100%
rename from graphics/entity/particle/hr-graphite-particle-3.png
rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-3.png
diff --git a/graphics/entity/particle/hr-graphite-particle-4.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-4.png
similarity index 100%
rename from graphics/entity/particle/hr-graphite-particle-4.png
rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-4.png
diff --git a/graphics/entity/particle/hr-graphite-particle-shadow-1.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-1.png
similarity index 100%
rename from graphics/entity/particle/hr-graphite-particle-shadow-1.png
rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-1.png
diff --git a/graphics/entity/particle/hr-graphite-particle-shadow-2.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-2.png
similarity index 100%
rename from graphics/entity/particle/hr-graphite-particle-shadow-2.png
rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-2.png
diff --git a/graphics/entity/particle/hr-graphite-particle-shadow-3.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-3.png
similarity index 100%
rename from graphics/entity/particle/hr-graphite-particle-shadow-3.png
rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-3.png
diff --git a/graphics/entity/particle/hr-graphite-particle-shadow-4.png b/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-4.png
similarity index 100%
rename from graphics/entity/particle/hr-graphite-particle-shadow-4.png
rename to bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-4.png
diff --git a/graphics/icons/Fullerene.png b/bzcarbon2/graphics/icons/Fullerene.png
similarity index 100%
rename from graphics/icons/Fullerene.png
rename to bzcarbon2/graphics/icons/Fullerene.png
diff --git a/graphics/icons/activated-carbon.png b/bzcarbon2/graphics/icons/activated-carbon.png
similarity index 100%
rename from graphics/icons/activated-carbon.png
rename to bzcarbon2/graphics/icons/activated-carbon.png
diff --git a/graphics/icons/carbon-black.png b/bzcarbon2/graphics/icons/carbon-black.png
similarity index 100%
rename from graphics/icons/carbon-black.png
rename to bzcarbon2/graphics/icons/carbon-black.png
diff --git a/graphics/icons/carbon-fiber.png b/bzcarbon2/graphics/icons/carbon-fiber.png
similarity index 100%
rename from graphics/icons/carbon-fiber.png
rename to bzcarbon2/graphics/icons/carbon-fiber.png
diff --git a/graphics/icons/crucible.png b/bzcarbon2/graphics/icons/crucible.png
similarity index 100%
rename from graphics/icons/crucible.png
rename to bzcarbon2/graphics/icons/crucible.png
diff --git a/graphics/icons/diamond.png b/bzcarbon2/graphics/icons/diamond.png
similarity index 100%
rename from graphics/icons/diamond.png
rename to bzcarbon2/graphics/icons/diamond.png
diff --git a/graphics/icons/flake-graphite-1.png b/bzcarbon2/graphics/icons/flake-graphite-1.png
similarity index 100%
rename from graphics/icons/flake-graphite-1.png
rename to bzcarbon2/graphics/icons/flake-graphite-1.png
diff --git a/graphics/icons/flake-graphite-2.png b/bzcarbon2/graphics/icons/flake-graphite-2.png
similarity index 100%
rename from graphics/icons/flake-graphite-2.png
rename to bzcarbon2/graphics/icons/flake-graphite-2.png
diff --git a/graphics/icons/flake-graphite-3.png b/bzcarbon2/graphics/icons/flake-graphite-3.png
similarity index 100%
rename from graphics/icons/flake-graphite-3.png
rename to bzcarbon2/graphics/icons/flake-graphite-3.png
diff --git a/graphics/icons/flake-graphite-4.png b/bzcarbon2/graphics/icons/flake-graphite-4.png
similarity index 100%
rename from graphics/icons/flake-graphite-4.png
rename to bzcarbon2/graphics/icons/flake-graphite-4.png
diff --git a/graphics/icons/flake-graphite.png b/bzcarbon2/graphics/icons/flake-graphite.png
similarity index 100%
rename from graphics/icons/flake-graphite.png
rename to bzcarbon2/graphics/icons/flake-graphite.png
diff --git a/graphics/icons/graphene.png b/bzcarbon2/graphics/icons/graphene.png
similarity index 100%
rename from graphics/icons/graphene.png
rename to bzcarbon2/graphics/icons/graphene.png
diff --git a/graphics/icons/graphite-1.png b/bzcarbon2/graphics/icons/graphite-1.png
similarity index 100%
rename from graphics/icons/graphite-1.png
rename to bzcarbon2/graphics/icons/graphite-1.png
diff --git a/graphics/icons/graphite-2.png b/bzcarbon2/graphics/icons/graphite-2.png
similarity index 100%
rename from graphics/icons/graphite-2.png
rename to bzcarbon2/graphics/icons/graphite-2.png
diff --git a/graphics/icons/graphite.png b/bzcarbon2/graphics/icons/graphite.png
similarity index 100%
rename from graphics/icons/graphite.png
rename to bzcarbon2/graphics/icons/graphite.png
diff --git a/graphics/icons/nanotube.png b/bzcarbon2/graphics/icons/nanotube.png
similarity index 100%
rename from graphics/icons/nanotube.png
rename to bzcarbon2/graphics/icons/nanotube.png
diff --git a/graphics/icons/pan.png b/bzcarbon2/graphics/icons/pan.png
similarity index 100%
rename from graphics/icons/pan.png
rename to bzcarbon2/graphics/icons/pan.png
diff --git a/graphics/icons/rough-diamond-1.png b/bzcarbon2/graphics/icons/rough-diamond-1.png
similarity index 100%
rename from graphics/icons/rough-diamond-1.png
rename to bzcarbon2/graphics/icons/rough-diamond-1.png
diff --git a/graphics/icons/rough-diamond-2.png b/bzcarbon2/graphics/icons/rough-diamond-2.png
similarity index 100%
rename from graphics/icons/rough-diamond-2.png
rename to bzcarbon2/graphics/icons/rough-diamond-2.png
diff --git a/graphics/icons/rough-diamond-3.png b/bzcarbon2/graphics/icons/rough-diamond-3.png
similarity index 100%
rename from graphics/icons/rough-diamond-3.png
rename to bzcarbon2/graphics/icons/rough-diamond-3.png
diff --git a/graphics/icons/rough-diamond-4.png b/bzcarbon2/graphics/icons/rough-diamond-4.png
similarity index 100%
rename from graphics/icons/rough-diamond-4.png
rename to bzcarbon2/graphics/icons/rough-diamond-4.png
diff --git a/graphics/icons/rough-diamond.png b/bzcarbon2/graphics/icons/rough-diamond.png
similarity index 100%
rename from graphics/icons/rough-diamond.png
rename to bzcarbon2/graphics/icons/rough-diamond.png
diff --git a/graphics/icons/stacked/carbon-black-stacked.png b/bzcarbon2/graphics/icons/stacked/carbon-black-stacked.png
similarity index 100%
rename from graphics/icons/stacked/carbon-black-stacked.png
rename to bzcarbon2/graphics/icons/stacked/carbon-black-stacked.png
diff --git a/graphics/icons/stacked/crucible-stacked.png b/bzcarbon2/graphics/icons/stacked/crucible-stacked.png
similarity index 100%
rename from graphics/icons/stacked/crucible-stacked.png
rename to bzcarbon2/graphics/icons/stacked/crucible-stacked.png
diff --git a/graphics/icons/stacked/diamond-stacked.png b/bzcarbon2/graphics/icons/stacked/diamond-stacked.png
similarity index 100%
rename from graphics/icons/stacked/diamond-stacked.png
rename to bzcarbon2/graphics/icons/stacked/diamond-stacked.png
diff --git a/graphics/icons/stacked/flake-graphite-stacked.png b/bzcarbon2/graphics/icons/stacked/flake-graphite-stacked.png
similarity index 100%
rename from graphics/icons/stacked/flake-graphite-stacked.png
rename to bzcarbon2/graphics/icons/stacked/flake-graphite-stacked.png
diff --git a/graphics/icons/stacked/fullerene-stacked.png b/bzcarbon2/graphics/icons/stacked/fullerene-stacked.png
similarity index 100%
rename from graphics/icons/stacked/fullerene-stacked.png
rename to bzcarbon2/graphics/icons/stacked/fullerene-stacked.png
diff --git a/graphics/icons/stacked/graphene-stacked.png b/bzcarbon2/graphics/icons/stacked/graphene-stacked.png
similarity index 100%
rename from graphics/icons/stacked/graphene-stacked.png
rename to bzcarbon2/graphics/icons/stacked/graphene-stacked.png
diff --git a/graphics/icons/stacked/graphite-stacked.png b/bzcarbon2/graphics/icons/stacked/graphite-stacked.png
similarity index 100%
rename from graphics/icons/stacked/graphite-stacked.png
rename to bzcarbon2/graphics/icons/stacked/graphite-stacked.png
diff --git a/graphics/icons/stacked/nanotube-stacked.png b/bzcarbon2/graphics/icons/stacked/nanotube-stacked.png
similarity index 100%
rename from graphics/icons/stacked/nanotube-stacked.png
rename to bzcarbon2/graphics/icons/stacked/nanotube-stacked.png
diff --git a/graphics/icons/stacked/rough-diamond-stacked.png b/bzcarbon2/graphics/icons/stacked/rough-diamond-stacked.png
similarity index 100%
rename from graphics/icons/stacked/rough-diamond-stacked.png
rename to bzcarbon2/graphics/icons/stacked/rough-diamond-stacked.png
diff --git a/graphics/technology/carbon-fiber.png b/bzcarbon2/graphics/technology/carbon-fiber.png
similarity index 100%
rename from graphics/technology/carbon-fiber.png
rename to bzcarbon2/graphics/technology/carbon-fiber.png
diff --git a/graphics/technology/diamond-processing.png b/bzcarbon2/graphics/technology/diamond-processing.png
similarity index 100%
rename from graphics/technology/diamond-processing.png
rename to bzcarbon2/graphics/technology/diamond-processing.png
diff --git a/graphics/technology/fluid-mining.png b/bzcarbon2/graphics/technology/fluid-mining.png
similarity index 100%
rename from graphics/technology/fluid-mining.png
rename to bzcarbon2/graphics/technology/fluid-mining.png
diff --git a/graphics/technology/graphite-processing.png b/bzcarbon2/graphics/technology/graphite-processing.png
similarity index 100%
rename from graphics/technology/graphite-processing.png
rename to bzcarbon2/graphics/technology/graphite-processing.png
diff --git a/info.json b/bzcarbon2/info.json
similarity index 100%
rename from info.json
rename to bzcarbon2/info.json
diff --git a/locale/de/carbon.cfg b/bzcarbon2/locale/de/carbon.cfg
similarity index 100%
rename from locale/de/carbon.cfg
rename to bzcarbon2/locale/de/carbon.cfg
diff --git a/locale/en/carbon.cfg b/bzcarbon2/locale/en/carbon.cfg
similarity index 100%
rename from locale/en/carbon.cfg
rename to bzcarbon2/locale/en/carbon.cfg
diff --git a/locale/ja/carbon.cfg b/bzcarbon2/locale/ja/carbon.cfg
similarity index 100%
rename from locale/ja/carbon.cfg
rename to bzcarbon2/locale/ja/carbon.cfg
diff --git a/locale/ko/carbon.cfg b/bzcarbon2/locale/ko/carbon.cfg
similarity index 100%
rename from locale/ko/carbon.cfg
rename to bzcarbon2/locale/ko/carbon.cfg
diff --git a/locale/pl/carbon.cfg b/bzcarbon2/locale/pl/carbon.cfg
similarity index 100%
rename from locale/pl/carbon.cfg
rename to bzcarbon2/locale/pl/carbon.cfg
diff --git a/locale/ru/carbon.cfg b/bzcarbon2/locale/ru/carbon.cfg
similarity index 100%
rename from locale/ru/carbon.cfg
rename to bzcarbon2/locale/ru/carbon.cfg
diff --git a/locale/zh-CN/bzcarbon.cfg b/bzcarbon2/locale/zh-CN/bzcarbon.cfg
similarity index 100%
rename from locale/zh-CN/bzcarbon.cfg
rename to bzcarbon2/locale/zh-CN/bzcarbon.cfg
diff --git a/map-gen-preset-updates.lua b/bzcarbon2/map-gen-preset-updates.lua
similarity index 100%
rename from map-gen-preset-updates.lua
rename to bzcarbon2/map-gen-preset-updates.lua
diff --git a/me.lua b/bzcarbon2/me.lua
similarity index 100%
rename from me.lua
rename to bzcarbon2/me.lua
diff --git a/migrations/bzcarbon.0.4.7.json b/bzcarbon2/migrations/bzcarbon.0.4.7.json
similarity index 100%
rename from migrations/bzcarbon.0.4.7.json
rename to bzcarbon2/migrations/bzcarbon.0.4.7.json
diff --git a/nanotubes-final.lua b/bzcarbon2/nanotubes-final.lua
similarity index 100%
rename from nanotubes-final.lua
rename to bzcarbon2/nanotubes-final.lua
diff --git a/prototypes/activated-carbon.lua b/bzcarbon2/prototypes/activated-carbon.lua
similarity index 100%
rename from prototypes/activated-carbon.lua
rename to bzcarbon2/prototypes/activated-carbon.lua
diff --git a/prototypes/basic-crusher.lua b/bzcarbon2/prototypes/basic-crusher.lua
similarity index 100%
rename from prototypes/basic-crusher.lua
rename to bzcarbon2/prototypes/basic-crusher.lua
diff --git a/prototypes/carbon-asteroid-updates.lua b/bzcarbon2/prototypes/carbon-asteroid-updates.lua
similarity index 100%
rename from prototypes/carbon-asteroid-updates.lua
rename to bzcarbon2/prototypes/carbon-asteroid-updates.lua
diff --git a/prototypes/carbon-fiber.lua b/bzcarbon2/prototypes/carbon-fiber.lua
similarity index 100%
rename from prototypes/carbon-fiber.lua
rename to bzcarbon2/prototypes/carbon-fiber.lua
diff --git a/prototypes/diamond-particle.lua b/bzcarbon2/prototypes/diamond-particle.lua
similarity index 100%
rename from prototypes/diamond-particle.lua
rename to bzcarbon2/prototypes/diamond-particle.lua
diff --git a/prototypes/diamond.lua b/bzcarbon2/prototypes/diamond.lua
similarity index 100%
rename from prototypes/diamond.lua
rename to bzcarbon2/prototypes/diamond.lua
diff --git a/prototypes/graphite-particle.lua b/bzcarbon2/prototypes/graphite-particle.lua
similarity index 100%
rename from prototypes/graphite-particle.lua
rename to bzcarbon2/prototypes/graphite-particle.lua
diff --git a/prototypes/graphite.lua b/bzcarbon2/prototypes/graphite.lua
similarity index 100%
rename from prototypes/graphite.lua
rename to bzcarbon2/prototypes/graphite.lua
diff --git a/settings-util.lua b/bzcarbon2/settings-util.lua
similarity index 100%
rename from settings-util.lua
rename to bzcarbon2/settings-util.lua
diff --git a/settings.lua b/bzcarbon2/settings.lua
similarity index 100%
rename from settings.lua
rename to bzcarbon2/settings.lua
diff --git a/strange-matter.lua b/bzcarbon2/strange-matter.lua
similarity index 100%
rename from strange-matter.lua
rename to bzcarbon2/strange-matter.lua
diff --git a/tech-triggers.lua b/bzcarbon2/tech-triggers.lua
similarity index 100%
rename from tech-triggers.lua
rename to bzcarbon2/tech-triggers.lua
diff --git a/thumbnail.png b/bzcarbon2/thumbnail.png
similarity index 100%
rename from thumbnail.png
rename to bzcarbon2/thumbnail.png
diff --git a/graphics/entity/particle/graphite-particle-1.png b/graphics/entity/particle/graphite-particle-1.png
deleted file mode 100644
index 1b76c18..0000000
Binary files a/graphics/entity/particle/graphite-particle-1.png and /dev/null differ
diff --git a/graphics/entity/particle/graphite-particle-2.png b/graphics/entity/particle/graphite-particle-2.png
deleted file mode 100644
index 0bf7c6b..0000000
Binary files a/graphics/entity/particle/graphite-particle-2.png and /dev/null differ
diff --git a/graphics/entity/particle/graphite-particle-3.png b/graphics/entity/particle/graphite-particle-3.png
deleted file mode 100644
index 35c156a..0000000
Binary files a/graphics/entity/particle/graphite-particle-3.png and /dev/null differ
diff --git a/graphics/entity/particle/graphite-particle-4.png b/graphics/entity/particle/graphite-particle-4.png
deleted file mode 100644
index 9f5115c..0000000
Binary files a/graphics/entity/particle/graphite-particle-4.png and /dev/null differ
diff --git a/graphics/entity/particle/graphite-particle-shadow-1.png b/graphics/entity/particle/graphite-particle-shadow-1.png
deleted file mode 100644
index 89bfee9..0000000
Binary files a/graphics/entity/particle/graphite-particle-shadow-1.png and /dev/null differ
diff --git a/graphics/entity/particle/graphite-particle-shadow-2.png b/graphics/entity/particle/graphite-particle-shadow-2.png
deleted file mode 100644
index 7834934..0000000
Binary files a/graphics/entity/particle/graphite-particle-shadow-2.png and /dev/null differ
diff --git a/graphics/entity/particle/graphite-particle-shadow-3.png b/graphics/entity/particle/graphite-particle-shadow-3.png
deleted file mode 100644
index 6ef2544..0000000
Binary files a/graphics/entity/particle/graphite-particle-shadow-3.png and /dev/null differ
diff --git a/graphics/entity/particle/graphite-particle-shadow-4.png b/graphics/entity/particle/graphite-particle-shadow-4.png
deleted file mode 100644
index a8aa006..0000000
Binary files a/graphics/entity/particle/graphite-particle-shadow-4.png and /dev/null differ
diff --git a/graphics/entity/ores/hr-diamond.xcf b/sources/graphics/entity/ores/hr-diamond.xcf
similarity index 100%
rename from graphics/entity/ores/hr-diamond.xcf
rename to sources/graphics/entity/ores/hr-diamond.xcf
diff --git a/graphics/entity/ores/hr-graphite.xcf b/sources/graphics/entity/ores/hr-graphite.xcf
similarity index 100%
rename from graphics/entity/ores/hr-graphite.xcf
rename to sources/graphics/entity/ores/hr-graphite.xcf
diff --git a/graphics/icons/Fullerene.xcf b/sources/graphics/icons/Fullerene.xcf
similarity index 100%
rename from graphics/icons/Fullerene.xcf
rename to sources/graphics/icons/Fullerene.xcf
diff --git a/graphics/icons/carbon-black.xcf b/sources/graphics/icons/carbon-black.xcf
similarity index 100%
rename from graphics/icons/carbon-black.xcf
rename to sources/graphics/icons/carbon-black.xcf
diff --git a/graphics/icons/carbon-fiber.xcf b/sources/graphics/icons/carbon-fiber.xcf
similarity index 100%
rename from graphics/icons/carbon-fiber.xcf
rename to sources/graphics/icons/carbon-fiber.xcf
diff --git a/graphics/icons/crucible.xcf b/sources/graphics/icons/crucible.xcf
similarity index 100%
rename from graphics/icons/crucible.xcf
rename to sources/graphics/icons/crucible.xcf
diff --git a/graphics/icons/diamond.xcf b/sources/graphics/icons/diamond.xcf
similarity index 100%
rename from graphics/icons/diamond.xcf
rename to sources/graphics/icons/diamond.xcf
diff --git a/graphics/icons/graphene.xcf b/sources/graphics/icons/graphene.xcf
similarity index 100%
rename from graphics/icons/graphene.xcf
rename to sources/graphics/icons/graphene.xcf
diff --git a/graphics/icons/graphite-1.xcf b/sources/graphics/icons/graphite-1.xcf
similarity index 100%
rename from graphics/icons/graphite-1.xcf
rename to sources/graphics/icons/graphite-1.xcf
diff --git a/graphics/icons/graphite-2.xcf b/sources/graphics/icons/graphite-2.xcf
similarity index 100%
rename from graphics/icons/graphite-2.xcf
rename to sources/graphics/icons/graphite-2.xcf
diff --git a/graphics/icons/graphite.xcf b/sources/graphics/icons/graphite.xcf
similarity index 100%
rename from graphics/icons/graphite.xcf
rename to sources/graphics/icons/graphite.xcf
diff --git a/graphics/icons/nanotube.xcf b/sources/graphics/icons/nanotube.xcf
similarity index 100%
rename from graphics/icons/nanotube.xcf
rename to sources/graphics/icons/nanotube.xcf
diff --git a/graphics/icons/stacked/carbon-black-stacked.xcf b/sources/graphics/icons/stacked/carbon-black-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/carbon-black-stacked.xcf
rename to sources/graphics/icons/stacked/carbon-black-stacked.xcf
diff --git a/graphics/icons/stacked/crucible-stacked.xcf b/sources/graphics/icons/stacked/crucible-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/crucible-stacked.xcf
rename to sources/graphics/icons/stacked/crucible-stacked.xcf
diff --git a/graphics/icons/stacked/diamond-stacked.xcf b/sources/graphics/icons/stacked/diamond-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/diamond-stacked.xcf
rename to sources/graphics/icons/stacked/diamond-stacked.xcf
diff --git a/graphics/icons/stacked/flake-graphite-stacked.xcf b/sources/graphics/icons/stacked/flake-graphite-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/flake-graphite-stacked.xcf
rename to sources/graphics/icons/stacked/flake-graphite-stacked.xcf
diff --git a/graphics/icons/stacked/fullerene-stacked.xcf b/sources/graphics/icons/stacked/fullerene-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/fullerene-stacked.xcf
rename to sources/graphics/icons/stacked/fullerene-stacked.xcf
diff --git a/graphics/icons/stacked/graphene-stacked.xcf b/sources/graphics/icons/stacked/graphene-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/graphene-stacked.xcf
rename to sources/graphics/icons/stacked/graphene-stacked.xcf
diff --git a/graphics/icons/stacked/graphite-stacked.xcf b/sources/graphics/icons/stacked/graphite-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/graphite-stacked.xcf
rename to sources/graphics/icons/stacked/graphite-stacked.xcf
diff --git a/graphics/icons/stacked/nanotube-stacked.xcf b/sources/graphics/icons/stacked/nanotube-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/nanotube-stacked.xcf
rename to sources/graphics/icons/stacked/nanotube-stacked.xcf
diff --git a/graphics/icons/stacked/rough-diamond-stacked.xcf b/sources/graphics/icons/stacked/rough-diamond-stacked.xcf
similarity index 100%
rename from graphics/icons/stacked/rough-diamond-stacked.xcf
rename to sources/graphics/icons/stacked/rough-diamond-stacked.xcf
diff --git a/thumbnail.xcf b/sources/thumbnail.xcf
similarity index 100%
rename from thumbnail.xcf
rename to sources/thumbnail.xcf