diff --git a/dev-vm/Dockerfile b/dev/dev-vm/Dockerfile
similarity index 100%
rename from dev-vm/Dockerfile
rename to dev/dev-vm/Dockerfile
diff --git a/dev-vm/setup.sh b/dev/dev-vm/setup.sh
similarity index 100%
rename from dev-vm/setup.sh
rename to dev/dev-vm/setup.sh
diff --git a/gimlet/Dockerfile b/dev/gimlet/Dockerfile
similarity index 100%
rename from gimlet/Dockerfile
rename to dev/gimlet/Dockerfile
diff --git a/gimlet/gimlet b/dev/gimlet/gimlet
similarity index 100%
rename from gimlet/gimlet
rename to dev/gimlet/gimlet
diff --git a/gimlet/prepare.moon b/dev/gimlet/prepare.moon
similarity index 100%
rename from gimlet/prepare.moon
rename to dev/gimlet/prepare.moon
diff --git a/lapis-ultimate/Dockerfile b/dev/lapis-ultimate/Dockerfile
similarity index 100%
rename from lapis-ultimate/Dockerfile
rename to dev/lapis-ultimate/Dockerfile
diff --git a/lapis-ultimate/lapis b/dev/lapis-ultimate/lapis
similarity index 100%
rename from lapis-ultimate/lapis
rename to dev/lapis-ultimate/lapis
diff --git a/lapis-ultimate/test/.dockerignore b/dev/lapis-ultimate/test/.dockerignore
similarity index 100%
rename from lapis-ultimate/test/.dockerignore
rename to dev/lapis-ultimate/test/.dockerignore
diff --git a/lapis-ultimate/test/.gitattributes b/dev/lapis-ultimate/test/.gitattributes
similarity index 100%
rename from lapis-ultimate/test/.gitattributes
rename to dev/lapis-ultimate/test/.gitattributes
diff --git a/lapis-ultimate/test/.gitignore b/dev/lapis-ultimate/test/.gitignore
similarity index 100%
rename from lapis-ultimate/test/.gitignore
rename to dev/lapis-ultimate/test/.gitignore
diff --git a/lapis-ultimate/test/BoxFile b/dev/lapis-ultimate/test/BoxFile
similarity index 100%
rename from lapis-ultimate/test/BoxFile
rename to dev/lapis-ultimate/test/BoxFile
diff --git a/lapis-ultimate/test/Dockerfile b/dev/lapis-ultimate/test/Dockerfile
similarity index 100%
rename from lapis-ultimate/test/Dockerfile
rename to dev/lapis-ultimate/test/Dockerfile
diff --git a/lapis-ultimate/test/app.moon b/dev/lapis-ultimate/test/app.moon
similarity index 100%
rename from lapis-ultimate/test/app.moon
rename to dev/lapis-ultimate/test/app.moon
diff --git a/lapis-ultimate/test/bower.json b/dev/lapis-ultimate/test/bower.json
similarity index 100%
rename from lapis-ultimate/test/bower.json
rename to dev/lapis-ultimate/test/bower.json
diff --git a/lapis-ultimate/test/config.moon b/dev/lapis-ultimate/test/config.moon
similarity index 100%
rename from lapis-ultimate/test/config.moon
rename to dev/lapis-ultimate/test/config.moon
diff --git a/lapis-ultimate/test/layout/bootstrap.moon b/dev/lapis-ultimate/test/layout/bootstrap.moon
similarity index 100%
rename from lapis-ultimate/test/layout/bootstrap.moon
rename to dev/lapis-ultimate/test/layout/bootstrap.moon
diff --git a/lapis-ultimate/test/mime.types b/dev/lapis-ultimate/test/mime.types
similarity index 100%
rename from lapis-ultimate/test/mime.types
rename to dev/lapis-ultimate/test/mime.types
diff --git a/lapis-ultimate/test/nginx.conf b/dev/lapis-ultimate/test/nginx.conf
similarity index 100%
rename from lapis-ultimate/test/nginx.conf
rename to dev/lapis-ultimate/test/nginx.conf
diff --git a/lapis-ultimate/test/static/css/main.css b/dev/lapis-ultimate/test/static/css/main.css
similarity index 100%
rename from lapis-ultimate/test/static/css/main.css
rename to dev/lapis-ultimate/test/static/css/main.css
diff --git a/lapis-ultimate/test/static/favicon.ico b/dev/lapis-ultimate/test/static/favicon.ico
similarity index 100%
rename from lapis-ultimate/test/static/favicon.ico
rename to dev/lapis-ultimate/test/static/favicon.ico
diff --git a/lapis-ultimate/test/static/js/main.coffee b/dev/lapis-ultimate/test/static/js/main.coffee
similarity index 100%
rename from lapis-ultimate/test/static/js/main.coffee
rename to dev/lapis-ultimate/test/static/js/main.coffee
diff --git a/lapis-ultimate/test/views/index.moon b/dev/lapis-ultimate/test/views/index.moon
similarity index 100%
rename from lapis-ultimate/test/views/index.moon
rename to dev/lapis-ultimate/test/views/index.moon
diff --git a/lapis-ultimate/test/views/notfound.moon b/dev/lapis-ultimate/test/views/notfound.moon
similarity index 100%
rename from lapis-ultimate/test/views/notfound.moon
rename to dev/lapis-ultimate/test/views/notfound.moon
diff --git a/moonscript/Dockerfile b/dev/moonscript/Dockerfile
similarity index 100%
rename from moonscript/Dockerfile
rename to dev/moonscript/Dockerfile
diff --git a/minecraft/backup/Dockerfile b/games/minecraft/backup/Dockerfile
similarity index 100%
rename from minecraft/backup/Dockerfile
rename to games/minecraft/backup/Dockerfile
diff --git a/minecraft/backup/start.sh b/games/minecraft/backup/start.sh
similarity index 100%
rename from minecraft/backup/start.sh
rename to games/minecraft/backup/start.sh
diff --git a/minecraft/data-ambassador/Dockerfile b/games/minecraft/data-ambassador/Dockerfile
similarity index 100%
rename from minecraft/data-ambassador/Dockerfile
rename to games/minecraft/data-ambassador/Dockerfile
diff --git a/minecraft/data-ambassador/setup.sh b/games/minecraft/data-ambassador/setup.sh
similarity index 100%
rename from minecraft/data-ambassador/setup.sh
rename to games/minecraft/data-ambassador/setup.sh
diff --git a/minecraft/data/Dockerfile b/games/minecraft/data/Dockerfile
similarity index 100%
rename from minecraft/data/Dockerfile
rename to games/minecraft/data/Dockerfile
diff --git a/minecraft/data/bukkit.yml b/games/minecraft/data/bukkit.yml
similarity index 100%
rename from minecraft/data/bukkit.yml
rename to games/minecraft/data/bukkit.yml
diff --git a/minecraft/data/server.properties b/games/minecraft/data/server.properties
similarity index 100%
rename from minecraft/data/server.properties
rename to games/minecraft/data/server.properties
diff --git a/minecraft/data/start.sh b/games/minecraft/data/start.sh
similarity index 100%
rename from minecraft/data/start.sh
rename to games/minecraft/data/start.sh
diff --git a/minecraft/minecraft.py b/games/minecraft/minecraft.py
similarity index 100%
rename from minecraft/minecraft.py
rename to games/minecraft/minecraft.py
diff --git a/minecraft/scripts/addop.sh b/games/minecraft/scripts/addop.sh
similarity index 100%
rename from minecraft/scripts/addop.sh
rename to games/minecraft/scripts/addop.sh
diff --git a/minecraft/scripts/backup.sh b/games/minecraft/scripts/backup.sh
similarity index 100%
rename from minecraft/scripts/backup.sh
rename to games/minecraft/scripts/backup.sh
diff --git a/minecraft/scripts/kill-server.sh b/games/minecraft/scripts/kill-server.sh
similarity index 100%
rename from minecraft/scripts/kill-server.sh
rename to games/minecraft/scripts/kill-server.sh
diff --git a/minecraft/scripts/megaupload.py b/games/minecraft/scripts/megaupload.py
similarity index 100%
rename from minecraft/scripts/megaupload.py
rename to games/minecraft/scripts/megaupload.py
diff --git a/minecraft/server/Dockerfile b/games/minecraft/server/Dockerfile
similarity index 100%
rename from minecraft/server/Dockerfile
rename to games/minecraft/server/Dockerfile
diff --git a/minecraft/server/start.sh b/games/minecraft/server/start.sh
similarity index 100%
rename from minecraft/server/start.sh
rename to games/minecraft/server/start.sh
diff --git a/gogs/.gitignore b/net/gogs/.gitignore
similarity index 100%
rename from gogs/.gitignore
rename to net/gogs/.gitignore
diff --git a/gogs/Dockerfile b/net/gogs/Dockerfile
similarity index 100%
rename from gogs/Dockerfile
rename to net/gogs/Dockerfile
diff --git a/gogs/Makefile b/net/gogs/Makefile
similarity index 100%
rename from gogs/Makefile
rename to net/gogs/Makefile
diff --git a/gogs/README.markdown b/net/gogs/README.markdown
similarity index 100%
rename from gogs/README.markdown
rename to net/gogs/README.markdown
diff --git a/gogs/gogs/custom/conf/app.ini b/net/gogs/gogs/custom/conf/app.ini
similarity index 100%
rename from gogs/gogs/custom/conf/app.ini
rename to net/gogs/gogs/custom/conf/app.ini
diff --git a/gogs/runit/gogs/run b/net/gogs/runit/gogs/run
similarity index 100%
rename from gogs/runit/gogs/run
rename to net/gogs/runit/gogs/run
diff --git a/gogs/runit/sshd/run b/net/gogs/runit/sshd/run
similarity index 100%
rename from gogs/runit/sshd/run
rename to net/gogs/runit/sshd/run
diff --git a/hosted-znc/Dockerfile b/net/hosted-znc/Dockerfile
similarity index 100%
rename from hosted-znc/Dockerfile
rename to net/hosted-znc/Dockerfile
diff --git a/hosted-znc/athemeauth.py b/net/hosted-znc/athemeauth.py
similarity index 100%
rename from hosted-znc/athemeauth.py
rename to net/hosted-znc/athemeauth.py
diff --git a/hosted-znc/athemesasl.py b/net/hosted-znc/athemesasl.py
similarity index 100%
rename from hosted-znc/athemesasl.py
rename to net/hosted-znc/athemesasl.py
diff --git a/hosted-znc/znc.conf b/net/hosted-znc/znc.conf
similarity index 100%
rename from hosted-znc/znc.conf
rename to net/hosted-znc/znc.conf
diff --git a/influxdb/Dockerfile b/net/influxdb/Dockerfile
similarity index 100%
rename from influxdb/Dockerfile
rename to net/influxdb/Dockerfile
diff --git a/ldap/Dockerfile b/net/ldap/Dockerfile
similarity index 100%
rename from ldap/Dockerfile
rename to net/ldap/Dockerfile
diff --git a/ldap/README.md b/net/ldap/README.md
similarity index 100%
rename from ldap/README.md
rename to net/ldap/README.md
diff --git a/ldap/slapd.sh b/net/ldap/slapd.sh
similarity index 100%
rename from ldap/slapd.sh
rename to net/ldap/slapd.sh
diff --git a/olegdb/Dockerfile b/net/olegdb/Dockerfile
similarity index 100%
rename from olegdb/Dockerfile
rename to net/olegdb/Dockerfile
diff --git a/olegdb/olegdb.conf b/net/olegdb/olegdb.conf
similarity index 100%
rename from olegdb/olegdb.conf
rename to net/olegdb/olegdb.conf
diff --git a/olegdb/runit/olegdb/run b/net/olegdb/runit/olegdb/run
similarity index 100%
rename from olegdb/runit/olegdb/run
rename to net/olegdb/runit/olegdb/run
diff --git a/rabbitmq/Dockerfile b/net/rabbitmq/Dockerfile
similarity index 100%
rename from rabbitmq/Dockerfile
rename to net/rabbitmq/Dockerfile
diff --git a/rabbitmq/rabbitmq b/net/rabbitmq/rabbitmq
similarity index 100%
rename from rabbitmq/rabbitmq
rename to net/rabbitmq/rabbitmq
diff --git a/rqlite/Dockerfile b/net/rqlite/Dockerfile
similarity index 100%
rename from rqlite/Dockerfile
rename to net/rqlite/Dockerfile
diff --git a/rqlite/rqlite b/net/rqlite/rqlite
similarity index 100%
rename from rqlite/rqlite
rename to net/rqlite/rqlite
diff --git a/rtorrent/Dockerfile b/net/rtorrent/Dockerfile
similarity index 100%
rename from rtorrent/Dockerfile
rename to net/rtorrent/Dockerfile
diff --git a/rtorrent/rtorrent.rc b/net/rtorrent/rtorrent.rc
similarity index 100%
rename from rtorrent/rtorrent.rc
rename to net/rtorrent/rtorrent.rc
diff --git a/testnet/Makefile b/net/testnet/Makefile
similarity index 100%
rename from testnet/Makefile
rename to net/testnet/Makefile
diff --git a/testnet/hub/Dockerfile b/net/testnet/hub/Dockerfile
similarity index 100%
rename from testnet/hub/Dockerfile
rename to net/testnet/hub/Dockerfile
diff --git a/testnet/hub/ircd.conf b/net/testnet/hub/ircd.conf
similarity index 100%
rename from testnet/hub/ircd.conf
rename to net/testnet/hub/ircd.conf
diff --git a/testnet/leaf1/Dockerfile b/net/testnet/leaf1/Dockerfile
similarity index 100%
rename from testnet/leaf1/Dockerfile
rename to net/testnet/leaf1/Dockerfile
diff --git a/testnet/leaf1/ircd.conf b/net/testnet/leaf1/ircd.conf
similarity index 100%
rename from testnet/leaf1/ircd.conf
rename to net/testnet/leaf1/ircd.conf
diff --git a/testnet/leaf2/Dockerfile b/net/testnet/leaf2/Dockerfile
similarity index 100%
rename from testnet/leaf2/Dockerfile
rename to net/testnet/leaf2/Dockerfile
diff --git a/testnet/leaf2/ircd.conf b/net/testnet/leaf2/ircd.conf
similarity index 100%
rename from testnet/leaf2/ircd.conf
rename to net/testnet/leaf2/ircd.conf
diff --git a/testnet/services/Dockerfile b/net/testnet/services/Dockerfile
similarity index 100%
rename from testnet/services/Dockerfile
rename to net/testnet/services/Dockerfile
diff --git a/testnet/services/atheme.conf b/net/testnet/services/atheme.conf
similarity index 100%
rename from testnet/services/atheme.conf
rename to net/testnet/services/atheme.conf
diff --git a/testnet/services/run b/net/testnet/services/run
similarity index 100%
rename from testnet/services/run
rename to net/testnet/services/run
diff --git a/weechat/Dockerfile b/net/weechat/Dockerfile
similarity index 100%
rename from weechat/Dockerfile
rename to net/weechat/Dockerfile
diff --git a/weechat/start.sh b/net/weechat/start.sh
similarity index 100%
rename from weechat/start.sh
rename to net/weechat/start.sh
diff --git a/firefox/Dockerfile b/x11-apps/firefox/Dockerfile
similarity index 100%
rename from firefox/Dockerfile
rename to x11-apps/firefox/Dockerfile
diff --git a/firefox/run.sh b/x11-apps/firefox/run.sh
similarity index 100%
rename from firefox/run.sh
rename to x11-apps/firefox/run.sh
diff --git a/hexchat/Dockerfile b/x11-apps/hexchat/Dockerfile
similarity index 100%
rename from hexchat/Dockerfile
rename to x11-apps/hexchat/Dockerfile
diff --git a/hexchat/run.sh b/x11-apps/hexchat/run.sh
similarity index 100%
rename from hexchat/run.sh
rename to x11-apps/hexchat/run.sh