diff --git a/.gitignore b/.gitignore
index 85e49ae..723ef36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-.idea
-*.zip
\ No newline at end of file
+.idea
\ No newline at end of file
diff --git a/bzchlorine2/LICENSE.md b/LICENSE.md
similarity index 100%
rename from bzchlorine2/LICENSE.md
rename to LICENSE.md
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..11be59f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,37 @@
+# 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/bzchlorine2/changelog.txt b/changelog.txt
similarity index 100%
rename from bzchlorine2/changelog.txt
rename to changelog.txt
diff --git a/bzchlorine2/compatibility/bob.lua b/compatibility/bob.lua
similarity index 100%
rename from bzchlorine2/compatibility/bob.lua
rename to compatibility/bob.lua
diff --git a/bzchlorine2/compatibility/crafting-efficiency.lua b/compatibility/crafting-efficiency.lua
similarity index 100%
rename from bzchlorine2/compatibility/crafting-efficiency.lua
rename to compatibility/crafting-efficiency.lua
diff --git a/bzchlorine2/control-util.lua b/control-util.lua
similarity index 100%
rename from bzchlorine2/control-util.lua
rename to control-util.lua
diff --git a/bzchlorine2/control.lua b/control.lua
similarity index 100%
rename from bzchlorine2/control.lua
rename to control.lua
diff --git a/bzchlorine2/data-final-fixes.lua b/data-final-fixes.lua
similarity index 100%
rename from bzchlorine2/data-final-fixes.lua
rename to data-final-fixes.lua
diff --git a/bzchlorine2/data-updates.lua b/data-updates.lua
similarity index 100%
rename from bzchlorine2/data-updates.lua
rename to data-updates.lua
diff --git a/bzchlorine2/data-util.lua b/data-util.lua
similarity index 100%
rename from bzchlorine2/data-util.lua
rename to data-util.lua
diff --git a/bzchlorine2/data.lua b/data.lua
similarity index 100%
rename from bzchlorine2/data.lua
rename to data.lua
diff --git a/description.md b/description.md
new file mode 100644
index 0000000..750f81f
--- /dev/null
+++ b/description.md
@@ -0,0 +1,33 @@
+"Saying nothing... sometimes says the most" - *Emily Dickinson*
+
+----
+
+Adds salt, chlorine, and other compounds to the game. Changes advanced circuit production and several other things.
+
+This mod adds more complexity to a vanailla factorio game. It pairs well with any other BZ mods, including [the electronics modpack](https://mods.factorio.com/mod/bzbelectronics). With Graphite & Diamonds, carbon fiber is enabled as well. As always, the more BZ mods you add the more complex the game will become. 
+
+Supported compatible mods:
+
+- Space Exploration & AAI
+- Krastorio 2
+- Bob's electronics
+- Deadlock stacking, crating
+
+Coming soon: RSO
+Coming soon: 248k
+Coming soon: FE+, 5Dim's, ModMash, etc.
+
+Many other mods are compatible but not yet fully supported. Suggestions always appreciated!
+
+
+---- 
+Special thanks to 
+
+- The community, for all the suggestions, feedback, and bug reports!
+- [snouz](https://mods.factorio.com/user/snouz) (thumbnail style)
+
+Thanks for testing
+
+- Berkelear
+- [Sakuro](https://mods.factorio.com/user/sakuro)
+- [Xynariz](https://mods.factorio.com/user/Xynariz)
diff --git a/bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-E.png b/graphics/entity/assembler/assembling-machine-2-pipe-E.png
similarity index 100%
rename from bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-E.png
rename to graphics/entity/assembler/assembling-machine-2-pipe-E.png
diff --git a/sources/graphics/entity/assembler/assembling-machine-2-pipe-E.xcf b/graphics/entity/assembler/assembling-machine-2-pipe-E.xcf
similarity index 100%
rename from sources/graphics/entity/assembler/assembling-machine-2-pipe-E.xcf
rename to graphics/entity/assembler/assembling-machine-2-pipe-E.xcf
diff --git a/bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-N.png b/graphics/entity/assembler/assembling-machine-2-pipe-N.png
similarity index 100%
rename from bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-N.png
rename to graphics/entity/assembler/assembling-machine-2-pipe-N.png
diff --git a/sources/graphics/entity/assembler/assembling-machine-2-pipe-N.xcf b/graphics/entity/assembler/assembling-machine-2-pipe-N.xcf
similarity index 100%
rename from sources/graphics/entity/assembler/assembling-machine-2-pipe-N.xcf
rename to graphics/entity/assembler/assembling-machine-2-pipe-N.xcf
diff --git a/bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-S.png b/graphics/entity/assembler/assembling-machine-2-pipe-S.png
similarity index 100%
rename from bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-S.png
rename to graphics/entity/assembler/assembling-machine-2-pipe-S.png
diff --git a/sources/graphics/entity/assembler/assembling-machine-2-pipe-S.xcf b/graphics/entity/assembler/assembling-machine-2-pipe-S.xcf
similarity index 100%
rename from sources/graphics/entity/assembler/assembling-machine-2-pipe-S.xcf
rename to graphics/entity/assembler/assembling-machine-2-pipe-S.xcf
diff --git a/bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-W.png b/graphics/entity/assembler/assembling-machine-2-pipe-W.png
similarity index 100%
rename from bzchlorine2/graphics/entity/assembler/assembling-machine-2-pipe-W.png
rename to graphics/entity/assembler/assembling-machine-2-pipe-W.png
diff --git a/sources/graphics/entity/assembler/assembling-machine-2-pipe-W.xcf b/graphics/entity/assembler/assembling-machine-2-pipe-W.xcf
similarity index 100%
rename from sources/graphics/entity/assembler/assembling-machine-2-pipe-W.xcf
rename to graphics/entity/assembler/assembling-machine-2-pipe-W.xcf
diff --git a/bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png b/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png
similarity index 100%
rename from bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png
rename to graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png
diff --git a/sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.xcf b/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.xcf
similarity index 100%
rename from sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.xcf
rename to graphics/entity/assembler/hr-assembling-machine-2-pipe-E.xcf
diff --git a/bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png b/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png
similarity index 100%
rename from bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png
rename to graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png
diff --git a/sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.xcf b/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.xcf
similarity index 100%
rename from sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.xcf
rename to graphics/entity/assembler/hr-assembling-machine-2-pipe-N.xcf
diff --git a/bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png b/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png
similarity index 100%
rename from bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png
rename to graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png
diff --git a/sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.xcf b/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.xcf
similarity index 100%
rename from sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.xcf
rename to graphics/entity/assembler/hr-assembling-machine-2-pipe-S.xcf
diff --git a/bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png b/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png
similarity index 100%
rename from bzchlorine2/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png
rename to graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png
diff --git a/sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.xcf b/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.xcf
similarity index 100%
rename from sources/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.xcf
rename to graphics/entity/assembler/hr-assembling-machine-2-pipe-W.xcf
diff --git a/bzchlorine2/graphics/entity/ores/hr-salt.png b/graphics/entity/ores/hr-salt.png
similarity index 100%
rename from bzchlorine2/graphics/entity/ores/hr-salt.png
rename to graphics/entity/ores/hr-salt.png
diff --git a/sources/graphics/entity/ores/hr-salt.xcf b/graphics/entity/ores/hr-salt.xcf
similarity index 100%
rename from sources/graphics/entity/ores/hr-salt.xcf
rename to graphics/entity/ores/hr-salt.xcf
diff --git a/graphics/entity/ores/salt.png b/graphics/entity/ores/salt.png
new file mode 100644
index 0000000..c8c25b9
Binary files /dev/null and b/graphics/entity/ores/salt.png differ
diff --git a/bzchlorine2/graphics/icons/chlorine.png b/graphics/icons/chlorine.png
similarity index 100%
rename from bzchlorine2/graphics/icons/chlorine.png
rename to graphics/icons/chlorine.png
diff --git a/sources/graphics/icons/chlorine.xcf b/graphics/icons/chlorine.xcf
similarity index 100%
rename from sources/graphics/icons/chlorine.xcf
rename to graphics/icons/chlorine.xcf
diff --git a/bzchlorine2/graphics/icons/epoxy.png b/graphics/icons/epoxy.png
similarity index 100%
rename from bzchlorine2/graphics/icons/epoxy.png
rename to graphics/icons/epoxy.png
diff --git a/bzchlorine2/graphics/icons/ferric-chloride.png b/graphics/icons/ferric-chloride.png
similarity index 100%
rename from bzchlorine2/graphics/icons/ferric-chloride.png
rename to graphics/icons/ferric-chloride.png
diff --git a/sources/graphics/icons/ferric-chloride.xcf b/graphics/icons/ferric-chloride.xcf
similarity index 100%
rename from sources/graphics/icons/ferric-chloride.xcf
rename to graphics/icons/ferric-chloride.xcf
diff --git a/bzchlorine2/graphics/icons/hcl.png b/graphics/icons/hcl.png
similarity index 100%
rename from bzchlorine2/graphics/icons/hcl.png
rename to graphics/icons/hcl.png
diff --git a/sources/graphics/icons/hcl.xcf b/graphics/icons/hcl.xcf
similarity index 100%
rename from sources/graphics/icons/hcl.xcf
rename to graphics/icons/hcl.xcf
diff --git a/bzchlorine2/graphics/icons/pcb-substrate.png b/graphics/icons/pcb-substrate.png
similarity index 100%
rename from bzchlorine2/graphics/icons/pcb-substrate.png
rename to graphics/icons/pcb-substrate.png
diff --git a/bzchlorine2/graphics/icons/pcb.png b/graphics/icons/pcb.png
similarity index 100%
rename from bzchlorine2/graphics/icons/pcb.png
rename to graphics/icons/pcb.png
diff --git a/bzchlorine2/graphics/icons/salt-1.png b/graphics/icons/salt-1.png
similarity index 100%
rename from bzchlorine2/graphics/icons/salt-1.png
rename to graphics/icons/salt-1.png
diff --git a/bzchlorine2/graphics/icons/salt-2.png b/graphics/icons/salt-2.png
similarity index 100%
rename from bzchlorine2/graphics/icons/salt-2.png
rename to graphics/icons/salt-2.png
diff --git a/bzchlorine2/graphics/icons/salt-3.png b/graphics/icons/salt-3.png
similarity index 100%
rename from bzchlorine2/graphics/icons/salt-3.png
rename to graphics/icons/salt-3.png
diff --git a/bzchlorine2/graphics/icons/salt-4.png b/graphics/icons/salt-4.png
similarity index 100%
rename from bzchlorine2/graphics/icons/salt-4.png
rename to graphics/icons/salt-4.png
diff --git a/bzchlorine2/graphics/icons/salt.png b/graphics/icons/salt.png
similarity index 100%
rename from bzchlorine2/graphics/icons/salt.png
rename to graphics/icons/salt.png
diff --git a/bzchlorine2/graphics/icons/vinyl-chloride.png b/graphics/icons/vinyl-chloride.png
similarity index 100%
rename from bzchlorine2/graphics/icons/vinyl-chloride.png
rename to graphics/icons/vinyl-chloride.png
diff --git a/sources/graphics/icons/vinyl-chloride.xcf b/graphics/icons/vinyl-chloride.xcf
similarity index 100%
rename from sources/graphics/icons/vinyl-chloride.xcf
rename to graphics/icons/vinyl-chloride.xcf
diff --git a/bzchlorine2/graphics/technology/salt-tech.png b/graphics/technology/salt-tech.png
similarity index 100%
rename from bzchlorine2/graphics/technology/salt-tech.png
rename to graphics/technology/salt-tech.png
diff --git a/bzchlorine2/info.json b/info.json
similarity index 100%
rename from bzchlorine2/info.json
rename to info.json
diff --git a/bzchlorine2/locale/en/salt.cfg b/locale/en/salt.cfg
similarity index 100%
rename from bzchlorine2/locale/en/salt.cfg
rename to locale/en/salt.cfg
diff --git a/bzchlorine2/locale/ja/salt.cfg b/locale/ja/salt.cfg
similarity index 100%
rename from bzchlorine2/locale/ja/salt.cfg
rename to locale/ja/salt.cfg
diff --git a/bzchlorine2/locale/ru/salt.cfg b/locale/ru/salt.cfg
similarity index 100%
rename from bzchlorine2/locale/ru/salt.cfg
rename to locale/ru/salt.cfg
diff --git a/bzchlorine2/locale/zh-CN/salt.cfg b/locale/zh-CN/salt.cfg
similarity index 100%
rename from bzchlorine2/locale/zh-CN/salt.cfg
rename to locale/zh-CN/salt.cfg
diff --git a/bzchlorine2/map-gen-preset-updates.lua b/map-gen-preset-updates.lua
similarity index 100%
rename from bzchlorine2/map-gen-preset-updates.lua
rename to map-gen-preset-updates.lua
diff --git a/bzchlorine2/matter.lua b/matter.lua
similarity index 100%
rename from bzchlorine2/matter.lua
rename to matter.lua
diff --git a/bzchlorine2/me.lua b/me.lua
similarity index 100%
rename from bzchlorine2/me.lua
rename to me.lua
diff --git a/bzchlorine2/modules.lua b/modules.lua
similarity index 100%
rename from bzchlorine2/modules.lua
rename to modules.lua
diff --git a/bzchlorine2/prototypes/assembler-updates.lua b/prototypes/assembler-updates.lua
similarity index 100%
rename from bzchlorine2/prototypes/assembler-updates.lua
rename to prototypes/assembler-updates.lua
diff --git a/bzchlorine2/prototypes/chlorine.lua b/prototypes/chlorine.lua
similarity index 100%
rename from bzchlorine2/prototypes/chlorine.lua
rename to prototypes/chlorine.lua
diff --git a/bzchlorine2/prototypes/epoxy.lua b/prototypes/epoxy.lua
similarity index 100%
rename from bzchlorine2/prototypes/epoxy.lua
rename to prototypes/epoxy.lua
diff --git a/bzchlorine2/prototypes/pcb.lua b/prototypes/pcb.lua
similarity index 100%
rename from bzchlorine2/prototypes/pcb.lua
rename to prototypes/pcb.lua
diff --git a/bzchlorine2/prototypes/salt.lua b/prototypes/salt.lua
similarity index 100%
rename from bzchlorine2/prototypes/salt.lua
rename to prototypes/salt.lua
diff --git a/bzchlorine2/recipe-updates.lua b/recipe-updates.lua
similarity index 100%
rename from bzchlorine2/recipe-updates.lua
rename to recipe-updates.lua
diff --git a/bzchlorine2/settings-util.lua b/settings-util.lua
similarity index 100%
rename from bzchlorine2/settings-util.lua
rename to settings-util.lua
diff --git a/bzchlorine2/settings.lua b/settings.lua
similarity index 100%
rename from bzchlorine2/settings.lua
rename to settings.lua
diff --git a/bzchlorine2/stacking.lua b/stacking.lua
similarity index 100%
rename from bzchlorine2/stacking.lua
rename to stacking.lua
diff --git a/bzchlorine2/thumbnail.png b/thumbnail.png
similarity index 100%
rename from bzchlorine2/thumbnail.png
rename to thumbnail.png
diff --git a/sources/thumbnail.xcf b/thumbnail.xcf
similarity index 100%
rename from sources/thumbnail.xcf
rename to thumbnail.xcf