diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index bad1d00ee..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.graveyard
-/hosts
-/secrets
-/tmp
diff --git a/Makefile b/old/Makefile
similarity index 100%
rename from Makefile
rename to old/Makefile
diff --git a/README.md b/old/README.md
similarity index 100%
rename from README.md
rename to old/README.md
diff --git a/bin/copy-secrets b/old/bin/copy-secrets
similarity index 100%
rename from bin/copy-secrets
rename to old/bin/copy-secrets
diff --git a/bin/genid b/old/bin/genid
similarity index 100%
rename from bin/genid
rename to old/bin/genid
diff --git a/bin/netmask-to-prefix b/old/bin/netmask-to-prefix
similarity index 100%
rename from bin/netmask-to-prefix
rename to old/bin/netmask-to-prefix
diff --git a/bin/nixos-query b/old/bin/nixos-query
similarity index 100%
rename from bin/nixos-query
rename to old/bin/nixos-query
diff --git a/bin/urlencode b/old/bin/urlencode
similarity index 100%
rename from bin/urlencode
rename to old/bin/urlencode
diff --git a/cac b/old/cac
similarity index 100%
rename from cac
rename to old/cac
diff --git a/certs/zalora-ca.crt b/old/certs/zalora-ca.crt
similarity index 100%
rename from certs/zalora-ca.crt
rename to old/certs/zalora-ca.crt
diff --git a/default.nix b/old/default.nix
similarity index 100%
rename from default.nix
rename to old/default.nix
diff --git a/deploy b/old/deploy
similarity index 100%
rename from deploy
rename to old/deploy
diff --git a/infest-cac-CentOS-7-64bit.sh b/old/infest-cac-CentOS-7-64bit.sh
similarity index 100%
rename from infest-cac-CentOS-7-64bit.sh
rename to old/infest-cac-CentOS-7-64bit.sh
diff --git a/infest.d/cac-CentOS-7-64bit/finalize.sh b/old/infest.d/cac-CentOS-7-64bit/finalize.sh
similarity index 100%
rename from infest.d/cac-CentOS-7-64bit/finalize.sh
rename to old/infest.d/cac-CentOS-7-64bit/finalize.sh
diff --git a/infest.d/cac-CentOS-7-64bit/prepare.sh b/old/infest.d/cac-CentOS-7-64bit/prepare.sh
similarity index 100%
rename from infest.d/cac-CentOS-7-64bit/prepare.sh
rename to old/infest.d/cac-CentOS-7-64bit/prepare.sh
diff --git a/infest.d/nixos-install.sh b/old/infest.d/nixos-install.sh
similarity index 100%
rename from infest.d/nixos-install.sh
rename to old/infest.d/nixos-install.sh
diff --git a/lib/default.nix b/old/lib/default.nix
similarity index 100%
rename from lib/default.nix
rename to old/lib/default.nix
diff --git a/lib/git.nix b/old/lib/git.nix
similarity index 100%
rename from lib/git.nix
rename to old/lib/git.nix
diff --git a/lib/modules.nix b/old/lib/modules.nix
similarity index 100%
rename from lib/modules.nix
rename to old/lib/modules.nix
diff --git a/modules/cd/default.nix b/old/modules/cd/default.nix
similarity index 100%
rename from modules/cd/default.nix
rename to old/modules/cd/default.nix
diff --git a/modules/cd/networking.nix b/old/modules/cd/networking.nix
similarity index 100%
rename from modules/cd/networking.nix
rename to old/modules/cd/networking.nix
diff --git a/modules/cd/paths.nix b/old/modules/cd/paths.nix
similarity index 100%
rename from modules/cd/paths.nix
rename to old/modules/cd/paths.nix
diff --git a/modules/cd/users.nix b/old/modules/cd/users.nix
similarity index 100%
rename from modules/cd/users.nix
rename to old/modules/cd/users.nix
diff --git a/modules/cloudkrebs/default.nix b/old/modules/cloudkrebs/default.nix
similarity index 100%
rename from modules/cloudkrebs/default.nix
rename to old/modules/cloudkrebs/default.nix
diff --git a/modules/cloudkrebs/networking.nix b/old/modules/cloudkrebs/networking.nix
similarity index 100%
rename from modules/cloudkrebs/networking.nix
rename to old/modules/cloudkrebs/networking.nix
diff --git a/modules/common/krebs-keys.nix b/old/modules/common/krebs-keys.nix
similarity index 100%
rename from modules/common/krebs-keys.nix
rename to old/modules/common/krebs-keys.nix
diff --git a/modules/common/krebs-repos.nix b/old/modules/common/krebs-repos.nix
similarity index 100%
rename from modules/common/krebs-repos.nix
rename to old/modules/common/krebs-repos.nix
diff --git a/modules/common/nixpkgs.nix b/old/modules/common/nixpkgs.nix
similarity index 100%
rename from modules/common/nixpkgs.nix
rename to old/modules/common/nixpkgs.nix
diff --git a/modules/common/sshkeys.nix b/old/modules/common/sshkeys.nix
similarity index 100%
rename from modules/common/sshkeys.nix
rename to old/modules/common/sshkeys.nix
diff --git a/modules/lass/base.nix b/old/modules/lass/base.nix
similarity index 100%
rename from modules/lass/base.nix
rename to old/modules/lass/base.nix
diff --git a/modules/lass/binary-caches.nix b/old/modules/lass/binary-caches.nix
similarity index 100%
rename from modules/lass/binary-caches.nix
rename to old/modules/lass/binary-caches.nix
diff --git a/modules/lass/bird.nix b/old/modules/lass/bird.nix
similarity index 100%
rename from modules/lass/bird.nix
rename to old/modules/lass/bird.nix
diff --git a/modules/lass/bitcoin.nix b/old/modules/lass/bitcoin.nix
similarity index 100%
rename from modules/lass/bitcoin.nix
rename to old/modules/lass/bitcoin.nix
diff --git a/modules/lass/browsers.nix b/old/modules/lass/browsers.nix
similarity index 100%
rename from modules/lass/browsers.nix
rename to old/modules/lass/browsers.nix
diff --git a/modules/lass/chromium-patched.nix b/old/modules/lass/chromium-patched.nix
similarity index 100%
rename from modules/lass/chromium-patched.nix
rename to old/modules/lass/chromium-patched.nix
diff --git a/modules/lass/desktop-base.nix b/old/modules/lass/desktop-base.nix
similarity index 100%
rename from modules/lass/desktop-base.nix
rename to old/modules/lass/desktop-base.nix
diff --git a/modules/lass/elster.nix b/old/modules/lass/elster.nix
similarity index 100%
rename from modules/lass/elster.nix
rename to old/modules/lass/elster.nix
diff --git a/modules/lass/games.nix b/old/modules/lass/games.nix
similarity index 100%
rename from modules/lass/games.nix
rename to old/modules/lass/games.nix
diff --git a/modules/lass/gitolite-base.nix b/old/modules/lass/gitolite-base.nix
similarity index 100%
rename from modules/lass/gitolite-base.nix
rename to old/modules/lass/gitolite-base.nix
diff --git a/modules/lass/ircd.nix b/old/modules/lass/ircd.nix
similarity index 100%
rename from modules/lass/ircd.nix
rename to old/modules/lass/ircd.nix
diff --git a/modules/lass/pass.nix b/old/modules/lass/pass.nix
similarity index 100%
rename from modules/lass/pass.nix
rename to old/modules/lass/pass.nix
diff --git a/modules/lass/programs.nix b/old/modules/lass/programs.nix
similarity index 100%
rename from modules/lass/programs.nix
rename to old/modules/lass/programs.nix
diff --git a/modules/lass/retiolum-cloudkrebs.nix b/old/modules/lass/retiolum-cloudkrebs.nix
similarity index 100%
rename from modules/lass/retiolum-cloudkrebs.nix
rename to old/modules/lass/retiolum-cloudkrebs.nix
diff --git a/modules/lass/retiolum-mors.nix b/old/modules/lass/retiolum-mors.nix
similarity index 100%
rename from modules/lass/retiolum-mors.nix
rename to old/modules/lass/retiolum-mors.nix
diff --git a/modules/lass/retiolum-uriel.nix b/old/modules/lass/retiolum-uriel.nix
similarity index 100%
rename from modules/lass/retiolum-uriel.nix
rename to old/modules/lass/retiolum-uriel.nix
diff --git a/modules/lass/sshkeys.nix b/old/modules/lass/sshkeys.nix
similarity index 100%
rename from modules/lass/sshkeys.nix
rename to old/modules/lass/sshkeys.nix
diff --git a/modules/lass/steam.nix b/old/modules/lass/steam.nix
similarity index 100%
rename from modules/lass/steam.nix
rename to old/modules/lass/steam.nix
diff --git a/modules/lass/texlive.nix b/old/modules/lass/texlive.nix
similarity index 100%
rename from modules/lass/texlive.nix
rename to old/modules/lass/texlive.nix
diff --git a/modules/lass/urxvt.nix b/old/modules/lass/urxvt.nix
similarity index 100%
rename from modules/lass/urxvt.nix
rename to old/modules/lass/urxvt.nix
diff --git a/modules/lass/urxvtd.nix b/old/modules/lass/urxvtd.nix
similarity index 100%
rename from modules/lass/urxvtd.nix
rename to old/modules/lass/urxvtd.nix
diff --git a/modules/lass/vim.nix b/old/modules/lass/vim.nix
similarity index 100%
rename from modules/lass/vim.nix
rename to old/modules/lass/vim.nix
diff --git a/modules/lass/virtualbox.nix b/old/modules/lass/virtualbox.nix
similarity index 100%
rename from modules/lass/virtualbox.nix
rename to old/modules/lass/virtualbox.nix
diff --git a/modules/lass/wine.nix b/old/modules/lass/wine.nix
similarity index 100%
rename from modules/lass/wine.nix
rename to old/modules/lass/wine.nix
diff --git a/modules/lass/xresources.nix b/old/modules/lass/xresources.nix
similarity index 100%
rename from modules/lass/xresources.nix
rename to old/modules/lass/xresources.nix
diff --git a/modules/lass/xserver-lass.nix b/old/modules/lass/xserver-lass.nix
similarity index 100%
rename from modules/lass/xserver-lass.nix
rename to old/modules/lass/xserver-lass.nix
diff --git a/modules/mkdir/default.nix b/old/modules/mkdir/default.nix
similarity index 100%
rename from modules/mkdir/default.nix
rename to old/modules/mkdir/default.nix
diff --git a/modules/mkdir/networking.nix b/old/modules/mkdir/networking.nix
similarity index 100%
rename from modules/mkdir/networking.nix
rename to old/modules/mkdir/networking.nix
diff --git a/modules/mkdir/paths.nix b/old/modules/mkdir/paths.nix
similarity index 100%
rename from modules/mkdir/paths.nix
rename to old/modules/mkdir/paths.nix
diff --git a/modules/mkdir/users.nix b/old/modules/mkdir/users.nix
similarity index 100%
rename from modules/mkdir/users.nix
rename to old/modules/mkdir/users.nix
diff --git a/modules/mors/default.nix b/old/modules/mors/default.nix
similarity index 100%
rename from modules/mors/default.nix
rename to old/modules/mors/default.nix
diff --git a/modules/mors/git.nix b/old/modules/mors/git.nix
similarity index 100%
rename from modules/mors/git.nix
rename to old/modules/mors/git.nix
diff --git a/modules/mors/repos.nix b/old/modules/mors/repos.nix
similarity index 100%
rename from modules/mors/repos.nix
rename to old/modules/mors/repos.nix
diff --git a/modules/mu/default.nix b/old/modules/mu/default.nix
similarity index 100%
rename from modules/mu/default.nix
rename to old/modules/mu/default.nix
diff --git a/modules/mu/paths.nix b/old/modules/mu/paths.nix
similarity index 100%
rename from modules/mu/paths.nix
rename to old/modules/mu/paths.nix
diff --git a/modules/nomic/default.nix b/old/modules/nomic/default.nix
similarity index 100%
rename from modules/nomic/default.nix
rename to old/modules/nomic/default.nix
diff --git a/modules/nomic/hardware-configuration.nix b/old/modules/nomic/hardware-configuration.nix
similarity index 100%
rename from modules/nomic/hardware-configuration.nix
rename to old/modules/nomic/hardware-configuration.nix
diff --git a/modules/nomic/paths.nix b/old/modules/nomic/paths.nix
similarity index 100%
rename from modules/nomic/paths.nix
rename to old/modules/nomic/paths.nix
diff --git a/modules/nomic/users.nix b/old/modules/nomic/users.nix
similarity index 100%
rename from modules/nomic/users.nix
rename to old/modules/nomic/users.nix
diff --git a/modules/rmdir/default.nix b/old/modules/rmdir/default.nix
similarity index 100%
rename from modules/rmdir/default.nix
rename to old/modules/rmdir/default.nix
diff --git a/modules/rmdir/networking.nix b/old/modules/rmdir/networking.nix
similarity index 100%
rename from modules/rmdir/networking.nix
rename to old/modules/rmdir/networking.nix
diff --git a/modules/rmdir/paths.nix b/old/modules/rmdir/paths.nix
similarity index 100%
rename from modules/rmdir/paths.nix
rename to old/modules/rmdir/paths.nix
diff --git a/modules/rmdir/users.nix b/old/modules/rmdir/users.nix
similarity index 100%
rename from modules/rmdir/users.nix
rename to old/modules/rmdir/users.nix
diff --git a/modules/tv/base-cac-CentOS-7-64bit.nix b/old/modules/tv/base-cac-CentOS-7-64bit.nix
similarity index 100%
rename from modules/tv/base-cac-CentOS-7-64bit.nix
rename to old/modules/tv/base-cac-CentOS-7-64bit.nix
diff --git a/modules/tv/base.nix b/old/modules/tv/base.nix
similarity index 100%
rename from modules/tv/base.nix
rename to old/modules/tv/base.nix
diff --git a/modules/tv/config/consul-client.nix b/old/modules/tv/config/consul-client.nix
similarity index 100%
rename from modules/tv/config/consul-client.nix
rename to old/modules/tv/config/consul-client.nix
diff --git a/modules/tv/config/consul-server.nix b/old/modules/tv/config/consul-server.nix
similarity index 100%
rename from modules/tv/config/consul-server.nix
rename to old/modules/tv/config/consul-server.nix
diff --git a/modules/tv/consul/default.nix b/old/modules/tv/consul/default.nix
similarity index 100%
rename from modules/tv/consul/default.nix
rename to old/modules/tv/consul/default.nix
diff --git a/modules/tv/ejabberd.nix b/old/modules/tv/ejabberd.nix
similarity index 100%
rename from modules/tv/ejabberd.nix
rename to old/modules/tv/ejabberd.nix
diff --git a/modules/tv/environment.nix b/old/modules/tv/environment.nix
similarity index 100%
rename from modules/tv/environment.nix
rename to old/modules/tv/environment.nix
diff --git a/modules/tv/exim-retiolum.nix b/old/modules/tv/exim-retiolum.nix
similarity index 100%
rename from modules/tv/exim-retiolum.nix
rename to old/modules/tv/exim-retiolum.nix
diff --git a/modules/tv/exim-smarthost.nix b/old/modules/tv/exim-smarthost.nix
similarity index 100%
rename from modules/tv/exim-smarthost.nix
rename to old/modules/tv/exim-smarthost.nix
diff --git a/modules/tv/git/cgit.nix b/old/modules/tv/git/cgit.nix
similarity index 100%
rename from modules/tv/git/cgit.nix
rename to old/modules/tv/git/cgit.nix
diff --git a/modules/tv/git/config.nix b/old/modules/tv/git/config.nix
similarity index 100%
rename from modules/tv/git/config.nix
rename to old/modules/tv/git/config.nix
diff --git a/modules/tv/git/default.nix b/old/modules/tv/git/default.nix
similarity index 100%
rename from modules/tv/git/default.nix
rename to old/modules/tv/git/default.nix
diff --git a/modules/tv/git/options.nix b/old/modules/tv/git/options.nix
similarity index 100%
rename from modules/tv/git/options.nix
rename to old/modules/tv/git/options.nix
diff --git a/modules/tv/git/public.nix b/old/modules/tv/git/public.nix
similarity index 100%
rename from modules/tv/git/public.nix
rename to old/modules/tv/git/public.nix
diff --git a/modules/tv/identity/default.nix b/old/modules/tv/identity/default.nix
similarity index 100%
rename from modules/tv/identity/default.nix
rename to old/modules/tv/identity/default.nix
diff --git a/modules/tv/iptables/config.nix b/old/modules/tv/iptables/config.nix
similarity index 100%
rename from modules/tv/iptables/config.nix
rename to old/modules/tv/iptables/config.nix
diff --git a/modules/tv/iptables/default.nix b/old/modules/tv/iptables/default.nix
similarity index 100%
rename from modules/tv/iptables/default.nix
rename to old/modules/tv/iptables/default.nix
diff --git a/modules/tv/iptables/options.nix b/old/modules/tv/iptables/options.nix
similarity index 100%
rename from modules/tv/iptables/options.nix
rename to old/modules/tv/iptables/options.nix
diff --git a/modules/tv/nginx/config.nix b/old/modules/tv/nginx/config.nix
similarity index 100%
rename from modules/tv/nginx/config.nix
rename to old/modules/tv/nginx/config.nix
diff --git a/modules/tv/nginx/default.nix b/old/modules/tv/nginx/default.nix
similarity index 100%
rename from modules/tv/nginx/default.nix
rename to old/modules/tv/nginx/default.nix
diff --git a/modules/tv/nginx/options.nix b/old/modules/tv/nginx/options.nix
similarity index 100%
rename from modules/tv/nginx/options.nix
rename to old/modules/tv/nginx/options.nix
diff --git a/modules/tv/retiolum/config.nix b/old/modules/tv/retiolum/config.nix
similarity index 100%
rename from modules/tv/retiolum/config.nix
rename to old/modules/tv/retiolum/config.nix
diff --git a/modules/tv/retiolum/default.nix b/old/modules/tv/retiolum/default.nix
similarity index 100%
rename from modules/tv/retiolum/default.nix
rename to old/modules/tv/retiolum/default.nix
diff --git a/modules/tv/retiolum/options.nix b/old/modules/tv/retiolum/options.nix
similarity index 100%
rename from modules/tv/retiolum/options.nix
rename to old/modules/tv/retiolum/options.nix
diff --git a/modules/tv/sanitize.nix b/old/modules/tv/sanitize.nix
similarity index 100%
rename from modules/tv/sanitize.nix
rename to old/modules/tv/sanitize.nix
diff --git a/modules/tv/smartd.nix b/old/modules/tv/smartd.nix
similarity index 100%
rename from modules/tv/smartd.nix
rename to old/modules/tv/smartd.nix
diff --git a/modules/tv/synaptics.nix b/old/modules/tv/synaptics.nix
similarity index 100%
rename from modules/tv/synaptics.nix
rename to old/modules/tv/synaptics.nix
diff --git a/modules/tv/urlwatch/default.nix b/old/modules/tv/urlwatch/default.nix
similarity index 100%
rename from modules/tv/urlwatch/default.nix
rename to old/modules/tv/urlwatch/default.nix
diff --git a/modules/tv/urxvt.nix b/old/modules/tv/urxvt.nix
similarity index 100%
rename from modules/tv/urxvt.nix
rename to old/modules/tv/urxvt.nix
diff --git a/modules/tv/users/default.nix b/old/modules/tv/users/default.nix
similarity index 100%
rename from modules/tv/users/default.nix
rename to old/modules/tv/users/default.nix
diff --git a/modules/tv/xserver.nix b/old/modules/tv/xserver.nix
similarity index 100%
rename from modules/tv/xserver.nix
rename to old/modules/tv/xserver.nix
diff --git a/modules/uriel/default.nix b/old/modules/uriel/default.nix
similarity index 100%
rename from modules/uriel/default.nix
rename to old/modules/uriel/default.nix
diff --git a/modules/uriel/repos.nix b/old/modules/uriel/repos.nix
similarity index 100%
rename from modules/uriel/repos.nix
rename to old/modules/uriel/repos.nix
diff --git a/modules/wu/default.nix b/old/modules/wu/default.nix
similarity index 100%
rename from modules/wu/default.nix
rename to old/modules/wu/default.nix
diff --git a/modules/wu/hosts.nix b/old/modules/wu/hosts.nix
similarity index 100%
rename from modules/wu/hosts.nix
rename to old/modules/wu/hosts.nix
diff --git a/modules/wu/paths.nix b/old/modules/wu/paths.nix
similarity index 100%
rename from modules/wu/paths.nix
rename to old/modules/wu/paths.nix
diff --git a/modules/wu/users.nix b/old/modules/wu/users.nix
similarity index 100%
rename from modules/wu/users.nix
rename to old/modules/wu/users.nix
diff --git a/pubkeys/deploy_wu.ssh.pub b/old/pubkeys/deploy_wu.ssh.pub
similarity index 100%
rename from pubkeys/deploy_wu.ssh.pub
rename to old/pubkeys/deploy_wu.ssh.pub
diff --git a/pubkeys/lass.ssh.pub b/old/pubkeys/lass.ssh.pub
similarity index 100%
rename from pubkeys/lass.ssh.pub
rename to old/pubkeys/lass.ssh.pub
diff --git a/pubkeys/makefu.ssh.pub b/old/pubkeys/makefu.ssh.pub
similarity index 100%
rename from pubkeys/makefu.ssh.pub
rename to old/pubkeys/makefu.ssh.pub
diff --git a/pubkeys/mv_vod.ssh.pub b/old/pubkeys/mv_vod.ssh.pub
similarity index 100%
rename from pubkeys/mv_vod.ssh.pub
rename to old/pubkeys/mv_vod.ssh.pub
diff --git a/pubkeys/tv_wu.ssh.pub b/old/pubkeys/tv_wu.ssh.pub
similarity index 100%
rename from pubkeys/tv_wu.ssh.pub
rename to old/pubkeys/tv_wu.ssh.pub
diff --git a/pubkeys/uriel.ssh.pub b/old/pubkeys/uriel.ssh.pub
similarity index 100%
rename from pubkeys/uriel.ssh.pub
rename to old/pubkeys/uriel.ssh.pub