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 b/bzgas2/LICENSE
similarity index 100%
rename from LICENSE
rename to bzgas2/LICENSE
diff --git a/changelog.txt b/bzgas2/changelog.txt
similarity index 100%
rename from changelog.txt
rename to bzgas2/changelog.txt
diff --git a/compatibility/248k.lua b/bzgas2/compatibility/248k.lua
similarity index 100%
rename from compatibility/248k.lua
rename to bzgas2/compatibility/248k.lua
diff --git a/compatibility/5dims.lua b/bzgas2/compatibility/5dims.lua
similarity index 100%
rename from compatibility/5dims.lua
rename to bzgas2/compatibility/5dims.lua
diff --git a/compatibility/bobe-ff.lua b/bzgas2/compatibility/bobe-ff.lua
similarity index 100%
rename from compatibility/bobe-ff.lua
rename to bzgas2/compatibility/bobe-ff.lua
diff --git a/compatibility/bobe.lua b/bzgas2/compatibility/bobe.lua
similarity index 100%
rename from compatibility/bobe.lua
rename to bzgas2/compatibility/bobe.lua
diff --git a/compatibility/crafting-efficiency.lua b/bzgas2/compatibility/crafting-efficiency.lua
similarity index 100%
rename from compatibility/crafting-efficiency.lua
rename to bzgas2/compatibility/crafting-efficiency.lua
diff --git a/compatibility/electronic-circuit.lua b/bzgas2/compatibility/electronic-circuit.lua
similarity index 100%
rename from compatibility/electronic-circuit.lua
rename to bzgas2/compatibility/electronic-circuit.lua
diff --git a/compatibility/ir2.lua b/bzgas2/compatibility/ir2.lua
similarity index 100%
rename from compatibility/ir2.lua
rename to bzgas2/compatibility/ir2.lua
diff --git a/compatibility/sciencecosttweakerm.lua b/bzgas2/compatibility/sciencecosttweakerm.lua
similarity index 100%
rename from compatibility/sciencecosttweakerm.lua
rename to bzgas2/compatibility/sciencecosttweakerm.lua
diff --git a/control-util.lua b/bzgas2/control-util.lua
similarity index 100%
rename from control-util.lua
rename to bzgas2/control-util.lua
diff --git a/control.lua b/bzgas2/control.lua
similarity index 100%
rename from control.lua
rename to bzgas2/control.lua
diff --git a/data-final-fixes.lua b/bzgas2/data-final-fixes.lua
similarity index 100%
rename from data-final-fixes.lua
rename to bzgas2/data-final-fixes.lua
diff --git a/data-updates.lua b/bzgas2/data-updates.lua
similarity index 100%
rename from data-updates.lua
rename to bzgas2/data-updates.lua
diff --git a/data-util.lua b/bzgas2/data-util.lua
similarity index 100%
rename from data-util.lua
rename to bzgas2/data-util.lua
diff --git a/data.lua b/bzgas2/data.lua
similarity index 100%
rename from data.lua
rename to bzgas2/data.lua
diff --git a/gas-boiler/changelog.txt b/bzgas2/gas-boiler/changelog.txt
similarity index 100%
rename from gas-boiler/changelog.txt
rename to bzgas2/gas-boiler/changelog.txt
diff --git a/gas-boiler/data-updates.lua b/bzgas2/gas-boiler/data-updates.lua
similarity index 100%
rename from gas-boiler/data-updates.lua
rename to bzgas2/gas-boiler/data-updates.lua
diff --git a/gas-boiler/data.lua b/bzgas2/gas-boiler/data.lua
similarity index 100%
rename from gas-boiler/data.lua
rename to bzgas2/gas-boiler/data.lua
diff --git a/gas-boiler/factsheet.lua b/bzgas2/gas-boiler/factsheet.lua
similarity index 100%
rename from gas-boiler/factsheet.lua
rename to bzgas2/gas-boiler/factsheet.lua
diff --git a/gas-boiler/graphics/entity/assembling-machine-1-pipe-E.png b/bzgas2/gas-boiler/graphics/entity/assembling-machine-1-pipe-E.png
similarity index 100%
rename from gas-boiler/graphics/entity/assembling-machine-1-pipe-E.png
rename to bzgas2/gas-boiler/graphics/entity/assembling-machine-1-pipe-E.png
diff --git a/gas-boiler/graphics/entity/assembling-machine-1-pipe-N.png b/bzgas2/gas-boiler/graphics/entity/assembling-machine-1-pipe-N.png
similarity index 100%
rename from gas-boiler/graphics/entity/assembling-machine-1-pipe-N.png
rename to bzgas2/gas-boiler/graphics/entity/assembling-machine-1-pipe-N.png
diff --git a/gas-boiler/graphics/entity/assembling-machine-1-pipe-S.png b/bzgas2/gas-boiler/graphics/entity/assembling-machine-1-pipe-S.png
similarity index 100%
rename from gas-boiler/graphics/entity/assembling-machine-1-pipe-S.png
rename to bzgas2/gas-boiler/graphics/entity/assembling-machine-1-pipe-S.png
diff --git a/gas-boiler/graphics/entity/assembling-machine-1-pipe-W.png b/bzgas2/gas-boiler/graphics/entity/assembling-machine-1-pipe-W.png
similarity index 100%
rename from gas-boiler/graphics/entity/assembling-machine-1-pipe-W.png
rename to bzgas2/gas-boiler/graphics/entity/assembling-machine-1-pipe-W.png
diff --git a/gas-boiler/graphics/entity/gas-boiler-E-light.png b/bzgas2/gas-boiler/graphics/entity/gas-boiler-E-light.png
similarity index 100%
rename from gas-boiler/graphics/entity/gas-boiler-E-light.png
rename to bzgas2/gas-boiler/graphics/entity/gas-boiler-E-light.png
diff --git a/gas-boiler/graphics/entity/gas-boiler-N-light.png b/bzgas2/gas-boiler/graphics/entity/gas-boiler-N-light.png
similarity index 100%
rename from gas-boiler/graphics/entity/gas-boiler-N-light.png
rename to bzgas2/gas-boiler/graphics/entity/gas-boiler-N-light.png
diff --git a/gas-boiler/graphics/entity/gas-boiler-S-light.png b/bzgas2/gas-boiler/graphics/entity/gas-boiler-S-light.png
similarity index 100%
rename from gas-boiler/graphics/entity/gas-boiler-S-light.png
rename to bzgas2/gas-boiler/graphics/entity/gas-boiler-S-light.png
diff --git a/gas-boiler/graphics/entity/gas-boiler-W-light.png b/bzgas2/gas-boiler/graphics/entity/gas-boiler-W-light.png
similarity index 100%
rename from gas-boiler/graphics/entity/gas-boiler-W-light.png
rename to bzgas2/gas-boiler/graphics/entity/gas-boiler-W-light.png
diff --git a/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-E.png b/bzgas2/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-E.png
similarity index 100%
rename from gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-E.png
rename to bzgas2/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-E.png
diff --git a/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-N.png b/bzgas2/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-N.png
similarity index 100%
rename from gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-N.png
rename to bzgas2/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-N.png
diff --git a/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-S.png b/bzgas2/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-S.png
similarity index 100%
rename from gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-S.png
rename to bzgas2/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-S.png
diff --git a/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-W.png b/bzgas2/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-W.png
similarity index 100%
rename from gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-W.png
rename to bzgas2/gas-boiler/graphics/entity/hr-assembling-machine-1-pipe-W.png
diff --git a/gas-boiler/graphics/entity/hr-gas-boiler-E-light.png b/bzgas2/gas-boiler/graphics/entity/hr-gas-boiler-E-light.png
similarity index 100%
rename from gas-boiler/graphics/entity/hr-gas-boiler-E-light.png
rename to bzgas2/gas-boiler/graphics/entity/hr-gas-boiler-E-light.png
diff --git a/gas-boiler/graphics/entity/hr-gas-boiler-N-light.png b/bzgas2/gas-boiler/graphics/entity/hr-gas-boiler-N-light.png
similarity index 100%
rename from gas-boiler/graphics/entity/hr-gas-boiler-N-light.png
rename to bzgas2/gas-boiler/graphics/entity/hr-gas-boiler-N-light.png
diff --git a/gas-boiler/graphics/entity/hr-gas-boiler-S-light.png b/bzgas2/gas-boiler/graphics/entity/hr-gas-boiler-S-light.png
similarity index 100%
rename from gas-boiler/graphics/entity/hr-gas-boiler-S-light.png
rename to bzgas2/gas-boiler/graphics/entity/hr-gas-boiler-S-light.png
diff --git a/gas-boiler/graphics/entity/hr-gas-boiler-W-light.png b/bzgas2/gas-boiler/graphics/entity/hr-gas-boiler-W-light.png
similarity index 100%
rename from gas-boiler/graphics/entity/hr-gas-boiler-W-light.png
rename to bzgas2/gas-boiler/graphics/entity/hr-gas-boiler-W-light.png
diff --git a/gas-boiler/graphics/icons/gas-boiler.png b/bzgas2/gas-boiler/graphics/icons/gas-boiler.png
similarity index 100%
rename from gas-boiler/graphics/icons/gas-boiler.png
rename to bzgas2/gas-boiler/graphics/icons/gas-boiler.png
diff --git a/gas-boiler/info.json b/bzgas2/gas-boiler/info.json
similarity index 100%
rename from gas-boiler/info.json
rename to bzgas2/gas-boiler/info.json
diff --git a/gas-boiler/locale/en/base.cfg b/bzgas2/gas-boiler/locale/en/base.cfg
similarity index 100%
rename from gas-boiler/locale/en/base.cfg
rename to bzgas2/gas-boiler/locale/en/base.cfg
diff --git a/gas-boiler/locale/ru/base.cfg b/bzgas2/gas-boiler/locale/ru/base.cfg
similarity index 100%
rename from gas-boiler/locale/ru/base.cfg
rename to bzgas2/gas-boiler/locale/ru/base.cfg
diff --git a/gas-boiler/migrations/absorb_boilers.json b/bzgas2/gas-boiler/migrations/absorb_boilers.json
similarity index 100%
rename from gas-boiler/migrations/absorb_boilers.json
rename to bzgas2/gas-boiler/migrations/absorb_boilers.json
diff --git a/gas-boiler/settings.lua b/bzgas2/gas-boiler/settings.lua
similarity index 100%
rename from gas-boiler/settings.lua
rename to bzgas2/gas-boiler/settings.lua
diff --git a/gas-sim.lua b/bzgas2/gas-sim.lua
similarity index 100%
rename from gas-sim.lua
rename to bzgas2/gas-sim.lua
diff --git a/graphics/entity/gas-extractor-animated.png b/bzgas2/graphics/entity/gas-extractor-animated.png
similarity index 100%
rename from graphics/entity/gas-extractor-animated.png
rename to bzgas2/graphics/entity/gas-extractor-animated.png
diff --git a/graphics/entity/gas-extractor-base-e.png b/bzgas2/graphics/entity/gas-extractor-base-e.png
similarity index 100%
rename from graphics/entity/gas-extractor-base-e.png
rename to bzgas2/graphics/entity/gas-extractor-base-e.png
diff --git a/graphics/entity/gas-extractor-base-n.png b/bzgas2/graphics/entity/gas-extractor-base-n.png
similarity index 100%
rename from graphics/entity/gas-extractor-base-n.png
rename to bzgas2/graphics/entity/gas-extractor-base-n.png
diff --git a/graphics/entity/gas-extractor-base-s.png b/bzgas2/graphics/entity/gas-extractor-base-s.png
similarity index 100%
rename from graphics/entity/gas-extractor-base-s.png
rename to bzgas2/graphics/entity/gas-extractor-base-s.png
diff --git a/graphics/entity/gas-extractor-base-w.png b/bzgas2/graphics/entity/gas-extractor-base-w.png
similarity index 100%
rename from graphics/entity/gas-extractor-base-w.png
rename to bzgas2/graphics/entity/gas-extractor-base-w.png
diff --git a/graphics/entity/gas-extractor-shadow.png b/bzgas2/graphics/entity/gas-extractor-shadow.png
similarity index 100%
rename from graphics/entity/gas-extractor-shadow.png
rename to bzgas2/graphics/entity/gas-extractor-shadow.png
diff --git a/graphics/entity/gas-extractor.png b/bzgas2/graphics/entity/gas-extractor.png
similarity index 100%
rename from graphics/entity/gas-extractor.png
rename to bzgas2/graphics/entity/gas-extractor.png
diff --git a/graphics/entity/hr-chemical-plant.png b/bzgas2/graphics/entity/hr-chemical-plant.png
similarity index 100%
rename from graphics/entity/hr-chemical-plant.png
rename to bzgas2/graphics/entity/hr-chemical-plant.png
diff --git a/graphics/entity/ores/hr-gas-effect.png b/bzgas2/graphics/entity/ores/hr-gas-effect.png
similarity index 100%
rename from graphics/entity/ores/hr-gas-effect.png
rename to bzgas2/graphics/entity/ores/hr-gas-effect.png
diff --git a/graphics/entity/ores/hr-gas.png b/bzgas2/graphics/entity/ores/hr-gas.png
similarity index 100%
rename from graphics/entity/ores/hr-gas.png
rename to bzgas2/graphics/entity/ores/hr-gas.png
diff --git a/graphics/icons/bakelite.png b/bzgas2/graphics/icons/bakelite.png
similarity index 100%
rename from graphics/icons/bakelite.png
rename to bzgas2/graphics/icons/bakelite.png
diff --git a/graphics/icons/chemical-plant-overlay.png b/bzgas2/graphics/icons/chemical-plant-overlay.png
similarity index 100%
rename from graphics/icons/chemical-plant-overlay.png
rename to bzgas2/graphics/icons/chemical-plant-overlay.png
diff --git a/graphics/icons/formaldehyde.png b/bzgas2/graphics/icons/formaldehyde.png
similarity index 100%
rename from graphics/icons/formaldehyde.png
rename to bzgas2/graphics/icons/formaldehyde.png
diff --git a/graphics/icons/gas-extractor.png b/bzgas2/graphics/icons/gas-extractor.png
similarity index 100%
rename from graphics/icons/gas-extractor.png
rename to bzgas2/graphics/icons/gas-extractor.png
diff --git a/graphics/icons/gas.png b/bzgas2/graphics/icons/gas.png
similarity index 100%
rename from graphics/icons/gas.png
rename to bzgas2/graphics/icons/gas.png
diff --git a/graphics/icons/phenol-2.png b/bzgas2/graphics/icons/phenol-2.png
similarity index 100%
rename from graphics/icons/phenol-2.png
rename to bzgas2/graphics/icons/phenol-2.png
diff --git a/graphics/icons/phenol-3.png b/bzgas2/graphics/icons/phenol-3.png
similarity index 100%
rename from graphics/icons/phenol-3.png
rename to bzgas2/graphics/icons/phenol-3.png
diff --git a/graphics/icons/phenol-4.png b/bzgas2/graphics/icons/phenol-4.png
similarity index 100%
rename from graphics/icons/phenol-4.png
rename to bzgas2/graphics/icons/phenol-4.png
diff --git a/graphics/icons/phenol.png b/bzgas2/graphics/icons/phenol.png
similarity index 100%
rename from graphics/icons/phenol.png
rename to bzgas2/graphics/icons/phenol.png
diff --git a/graphics/icons/stacked/bakelite.png b/bzgas2/graphics/icons/stacked/bakelite.png
similarity index 100%
rename from graphics/icons/stacked/bakelite.png
rename to bzgas2/graphics/icons/stacked/bakelite.png
diff --git a/graphics/icons/stacked/phenol.png b/bzgas2/graphics/icons/stacked/phenol.png
similarity index 100%
rename from graphics/icons/stacked/phenol.png
rename to bzgas2/graphics/icons/stacked/phenol.png
diff --git a/graphics/technology/bakelite.png b/bzgas2/graphics/technology/bakelite.png
similarity index 100%
rename from graphics/technology/bakelite.png
rename to bzgas2/graphics/technology/bakelite.png
diff --git a/graphics/technology/formaldehyde.png b/bzgas2/graphics/technology/formaldehyde.png
similarity index 100%
rename from graphics/technology/formaldehyde.png
rename to bzgas2/graphics/technology/formaldehyde.png
diff --git a/graphics/technology/gas-processing.png b/bzgas2/graphics/technology/gas-processing.png
similarity index 100%
rename from graphics/technology/gas-processing.png
rename to bzgas2/graphics/technology/gas-processing.png
diff --git a/info.json b/bzgas2/info.json
similarity index 100%
rename from info.json
rename to bzgas2/info.json
diff --git a/locale/cs/boiler.cfg b/bzgas2/locale/cs/boiler.cfg
similarity index 100%
rename from locale/cs/boiler.cfg
rename to bzgas2/locale/cs/boiler.cfg
diff --git a/locale/cs/gas.cfg b/bzgas2/locale/cs/gas.cfg
similarity index 100%
rename from locale/cs/gas.cfg
rename to bzgas2/locale/cs/gas.cfg
diff --git a/locale/en/boiler.cfg b/bzgas2/locale/en/boiler.cfg
similarity index 100%
rename from locale/en/boiler.cfg
rename to bzgas2/locale/en/boiler.cfg
diff --git a/locale/en/gas.cfg b/bzgas2/locale/en/gas.cfg
similarity index 100%
rename from locale/en/gas.cfg
rename to bzgas2/locale/en/gas.cfg
diff --git a/locale/ja/boiler.cfg b/bzgas2/locale/ja/boiler.cfg
similarity index 100%
rename from locale/ja/boiler.cfg
rename to bzgas2/locale/ja/boiler.cfg
diff --git a/locale/ja/gas.cfg b/bzgas2/locale/ja/gas.cfg
similarity index 100%
rename from locale/ja/gas.cfg
rename to bzgas2/locale/ja/gas.cfg
diff --git a/locale/pl/boiler.cfg b/bzgas2/locale/pl/boiler.cfg
similarity index 100%
rename from locale/pl/boiler.cfg
rename to bzgas2/locale/pl/boiler.cfg
diff --git a/locale/pl/gas.cfg b/bzgas2/locale/pl/gas.cfg
similarity index 100%
rename from locale/pl/gas.cfg
rename to bzgas2/locale/pl/gas.cfg
diff --git a/locale/ru/boiler.cfg b/bzgas2/locale/ru/boiler.cfg
similarity index 100%
rename from locale/ru/boiler.cfg
rename to bzgas2/locale/ru/boiler.cfg
diff --git a/locale/ru/gas.cfg b/bzgas2/locale/ru/gas.cfg
similarity index 100%
rename from locale/ru/gas.cfg
rename to bzgas2/locale/ru/gas.cfg
diff --git a/locale/zh-CN/bzgas.cfg b/bzgas2/locale/zh-CN/bzgas.cfg
similarity index 100%
rename from locale/zh-CN/bzgas.cfg
rename to bzgas2/locale/zh-CN/bzgas.cfg
diff --git a/map-gen-preset-updates.lua b/bzgas2/map-gen-preset-updates.lua
similarity index 100%
rename from map-gen-preset-updates.lua
rename to bzgas2/map-gen-preset-updates.lua
diff --git a/matter.lua b/bzgas2/matter.lua
similarity index 100%
rename from matter.lua
rename to bzgas2/matter.lua
diff --git a/me.lua b/bzgas2/me.lua
similarity index 100%
rename from me.lua
rename to bzgas2/me.lua
diff --git a/menu-simulations/gas-rig-sim.zip b/bzgas2/menu-simulations/gas-rig-sim.zip
similarity index 100%
rename from menu-simulations/gas-rig-sim.zip
rename to bzgas2/menu-simulations/gas-rig-sim.zip
diff --git a/modules.lua b/bzgas2/modules.lua
similarity index 100%
rename from modules.lua
rename to bzgas2/modules.lua
diff --git a/prototypes/bakelite.lua b/bzgas2/prototypes/bakelite.lua
similarity index 100%
rename from prototypes/bakelite.lua
rename to bzgas2/prototypes/bakelite.lua
diff --git a/prototypes/basic-chemical-plant.lua b/bzgas2/prototypes/basic-chemical-plant.lua
similarity index 100%
rename from prototypes/basic-chemical-plant.lua
rename to bzgas2/prototypes/basic-chemical-plant.lua
diff --git a/prototypes/formaldehyde.lua b/bzgas2/prototypes/formaldehyde.lua
similarity index 100%
rename from prototypes/formaldehyde.lua
rename to bzgas2/prototypes/formaldehyde.lua
diff --git a/prototypes/gas-extractor.lua b/bzgas2/prototypes/gas-extractor.lua
similarity index 100%
rename from prototypes/gas-extractor.lua
rename to bzgas2/prototypes/gas-extractor.lua
diff --git a/prototypes/gas.lua b/bzgas2/prototypes/gas.lua
similarity index 100%
rename from prototypes/gas.lua
rename to bzgas2/prototypes/gas.lua
diff --git a/prototypes/k2-recipe.lua b/bzgas2/prototypes/k2-recipe.lua
similarity index 100%
rename from prototypes/k2-recipe.lua
rename to bzgas2/prototypes/k2-recipe.lua
diff --git a/prototypes/phenol.lua b/bzgas2/prototypes/phenol.lua
similarity index 100%
rename from prototypes/phenol.lua
rename to bzgas2/prototypes/phenol.lua
diff --git a/prototypes/se-recipe.lua b/bzgas2/prototypes/se-recipe.lua
similarity index 100%
rename from prototypes/se-recipe.lua
rename to bzgas2/prototypes/se-recipe.lua
diff --git a/recipe-updates.lua b/bzgas2/recipe-updates.lua
similarity index 100%
rename from recipe-updates.lua
rename to bzgas2/recipe-updates.lua
diff --git a/settings-util.lua b/bzgas2/settings-util.lua
similarity index 100%
rename from settings-util.lua
rename to bzgas2/settings-util.lua
diff --git a/settings.lua b/bzgas2/settings.lua
similarity index 100%
rename from settings.lua
rename to bzgas2/settings.lua
diff --git a/stacking.lua b/bzgas2/stacking.lua
similarity index 100%
rename from stacking.lua
rename to bzgas2/stacking.lua
diff --git a/strange-matter.lua b/bzgas2/strange-matter.lua
similarity index 100%
rename from strange-matter.lua
rename to bzgas2/strange-matter.lua
diff --git a/thumbnail.png b/bzgas2/thumbnail.png
similarity index 100%
rename from thumbnail.png
rename to bzgas2/thumbnail.png
diff --git a/graphics/entity/chemical-plant.png b/graphics/entity/chemical-plant.png
deleted file mode 100644
index cf5783a..0000000
Binary files a/graphics/entity/chemical-plant.png and /dev/null differ
diff --git a/graphics/entity/ores/gas-effect.png b/graphics/entity/ores/gas-effect.png
deleted file mode 100644
index 8eaeb43..0000000
Binary files a/graphics/entity/ores/gas-effect.png and /dev/null differ
diff --git a/graphics/entity/ores/gas.png b/graphics/entity/ores/gas.png
deleted file mode 100644
index 11444e4..0000000
Binary files a/graphics/entity/ores/gas.png and /dev/null differ
diff --git a/graphics/entity/chemical-plant.xcf b/sources/graphics/entity/chemical-plant.xcf
similarity index 100%
rename from graphics/entity/chemical-plant.xcf
rename to sources/graphics/entity/chemical-plant.xcf
diff --git a/graphics/entity/gas-extractor-base-e.xcf b/sources/graphics/entity/gas-extractor-base-e.xcf
similarity index 100%
rename from graphics/entity/gas-extractor-base-e.xcf
rename to sources/graphics/entity/gas-extractor-base-e.xcf
diff --git a/graphics/entity/gas-extractor-base-n.xcf b/sources/graphics/entity/gas-extractor-base-n.xcf
similarity index 100%
rename from graphics/entity/gas-extractor-base-n.xcf
rename to sources/graphics/entity/gas-extractor-base-n.xcf
diff --git a/graphics/entity/gas-extractor-base-s.xcf b/sources/graphics/entity/gas-extractor-base-s.xcf
similarity index 100%
rename from graphics/entity/gas-extractor-base-s.xcf
rename to sources/graphics/entity/gas-extractor-base-s.xcf
diff --git a/graphics/entity/gas-extractor-base-w.xcf b/sources/graphics/entity/gas-extractor-base-w.xcf
similarity index 100%
rename from graphics/entity/gas-extractor-base-w.xcf
rename to sources/graphics/entity/gas-extractor-base-w.xcf
diff --git a/graphics/entity/gas-extractor-shadow.xcf b/sources/graphics/entity/gas-extractor-shadow.xcf
similarity index 100%
rename from graphics/entity/gas-extractor-shadow.xcf
rename to sources/graphics/entity/gas-extractor-shadow.xcf
diff --git a/graphics/entity/gas-extractor.xcf b/sources/graphics/entity/gas-extractor.xcf
similarity index 100%
rename from graphics/entity/gas-extractor.xcf
rename to sources/graphics/entity/gas-extractor.xcf
diff --git a/graphics/entity/hr-chemical-plant.xcf b/sources/graphics/entity/hr-chemical-plant.xcf
similarity index 100%
rename from graphics/entity/hr-chemical-plant.xcf
rename to sources/graphics/entity/hr-chemical-plant.xcf
diff --git a/graphics/entity/ores/gas-effect.xcf b/sources/graphics/entity/ores/gas-effect.xcf
similarity index 100%
rename from graphics/entity/ores/gas-effect.xcf
rename to sources/graphics/entity/ores/gas-effect.xcf
diff --git a/graphics/entity/ores/gas.xcf b/sources/graphics/entity/ores/gas.xcf
similarity index 100%
rename from graphics/entity/ores/gas.xcf
rename to sources/graphics/entity/ores/gas.xcf
diff --git a/graphics/icons/chemical-plant-overlay.xcf b/sources/graphics/icons/chemical-plant-overlay.xcf
similarity index 100%
rename from graphics/icons/chemical-plant-overlay.xcf
rename to sources/graphics/icons/chemical-plant-overlay.xcf
diff --git a/graphics/icons/formaldehyde.xcf b/sources/graphics/icons/formaldehyde.xcf
similarity index 100%
rename from graphics/icons/formaldehyde.xcf
rename to sources/graphics/icons/formaldehyde.xcf
diff --git a/graphics/icons/gas-extractor.xcf b/sources/graphics/icons/gas-extractor.xcf
similarity index 100%
rename from graphics/icons/gas-extractor.xcf
rename to sources/graphics/icons/gas-extractor.xcf
diff --git a/graphics/icons/gas.xcf b/sources/graphics/icons/gas.xcf
similarity index 100%
rename from graphics/icons/gas.xcf
rename to sources/graphics/icons/gas.xcf
diff --git a/graphics/icons/stacked/bakelite.xcf b/sources/graphics/icons/stacked/bakelite.xcf
similarity index 100%
rename from graphics/icons/stacked/bakelite.xcf
rename to sources/graphics/icons/stacked/bakelite.xcf
diff --git a/graphics/icons/stacked/phenol.xcf b/sources/graphics/icons/stacked/phenol.xcf
similarity index 100%
rename from graphics/icons/stacked/phenol.xcf
rename to sources/graphics/icons/stacked/phenol.xcf
diff --git a/graphics/technology/formaldehyde.xcf b/sources/graphics/technology/formaldehyde.xcf
similarity index 100%
rename from graphics/technology/formaldehyde.xcf
rename to sources/graphics/technology/formaldehyde.xcf
diff --git a/graphics/technology/gas-processing.xcf b/sources/graphics/technology/gas-processing.xcf
similarity index 100%
rename from graphics/technology/gas-processing.xcf
rename to sources/graphics/technology/gas-processing.xcf
diff --git a/thumbnail.xcf b/sources/thumbnail.xcf
similarity index 100%
rename from thumbnail.xcf
rename to sources/thumbnail.xcf