diff --git a/.config/Makefile b/.config/Makefile
deleted file mode 100644
index 3407f57..0000000
--- a/.config/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=.config
-modules=awesome clfswm cower dunst fehlstart fish herbstluftwm \
-	newsbeuter zathura
-
-include ../dotfiles.mk
diff --git a/.config/awesome/Makefile b/.config/awesome/Makefile
deleted file mode 100644
index 071a7ad..0000000
--- a/.config/awesome/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=awesome
-modules=themes
-objects=bowl.lua ext.lua infoline.lua keychain.lua oni.lua rc.lua
-
-include ../../dotfiles.mk
diff --git a/.config/awesome/themes/Makefile b/.config/awesome/themes/Makefile
deleted file mode 100644
index 2c32a7e..0000000
--- a/.config/awesome/themes/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=themes
-modules=custom
-
-include ../../../dotfiles.mk
diff --git a/.config/awesome/themes/custom/Makefile b/.config/awesome/themes/custom/Makefile
deleted file mode 100644
index c5e3982..0000000
--- a/.config/awesome/themes/custom/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=custom
-objects=theme.lua
-
-include ../../../../dotfiles.mk
diff --git a/.config/clfswm/Makefile b/.config/clfswm/Makefile
deleted file mode 100644
index 974bea3..0000000
--- a/.config/clfswm/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=clfswm
-objects=clfswmrc
-
-include ../../dotfiles.mk
diff --git a/.config/cower/Makefile b/.config/cower/Makefile
deleted file mode 100644
index c7765dc..0000000
--- a/.config/cower/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=cower
-objects=config
-
-include ../../dotfiles.mk
diff --git a/.config/dunst/Makefile b/.config/dunst/Makefile
deleted file mode 100644
index 6076e74..0000000
--- a/.config/dunst/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=dunst
-objects=dunstrc
-
-include ../../dotfiles.mk
diff --git a/.config/fehlstart/Makefile b/.config/fehlstart/Makefile
deleted file mode 100644
index 0c6998d..0000000
--- a/.config/fehlstart/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=fehlstart
-objects=fehlstart.rc
-
-include ../../dotfiles.mk
diff --git a/.config/fish/Makefile b/.config/fish/Makefile
deleted file mode 100644
index cdce7a6..0000000
--- a/.config/fish/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=fish
-objects=config.fish
-
-include ../../dotfiles.mk
diff --git a/.config/herbstluftwm/Makefile b/.config/herbstluftwm/Makefile
deleted file mode 100644
index e8f232f..0000000
--- a/.config/herbstluftwm/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIR=herbstluftwm
-objects=autostart panel.sh
-
-include ../../dotfiles.mk
-
-install-autostart: MODE=744
diff --git a/.config/newsbeuter/Makefile b/.config/newsbeuter/Makefile
deleted file mode 100644
index df228e9..0000000
--- a/.config/newsbeuter/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=newsbeuter
-objects=config urls
-
-include ../../dotfiles.mk
diff --git a/.config/zathura/Makefile b/.config/zathura/Makefile
deleted file mode 100644
index b076c74..0000000
--- a/.config/zathura/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=zathura
-objects=zathurarc
-
-include ../../dotfiles.mk
diff --git a/.conkerorrc/Makefile b/.conkerorrc/Makefile
deleted file mode 100644
index be7ee27..0000000
--- a/.conkerorrc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=.conkerorrc
-modules=themes styles
-objects=gtk2rc init.js ext_restore.js
-
-include ../dotfiles.mk
diff --git a/.conkerorrc/styles/Makefile b/.conkerorrc/styles/Makefile
deleted file mode 100644
index 8057419..0000000
--- a/.conkerorrc/styles/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=styles
-objects=github.css help.css git-scm.css
-
-include ../../dotfiles.mk
diff --git a/.conkerorrc/themes/Makefile b/.conkerorrc/themes/Makefile
deleted file mode 100644
index 6e95dc4..0000000
--- a/.conkerorrc/themes/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=themes
-modules=naquadah yoshi
-
-include ../../dotfiles.mk
diff --git a/.conkerorrc/themes/naquadah/Makefile b/.conkerorrc/themes/naquadah/Makefile
deleted file mode 100644
index 6a1634a..0000000
--- a/.conkerorrc/themes/naquadah/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=naquadah
-objects=conkeror--scrollbars.css hints--url-panel.css minibuffer.css \
-	mode-line.css new-tabs.css tab-bar.css theme.json
-
-include ../../../dotfiles.mk
diff --git a/.conkerorrc/themes/yoshi/Makefile b/.conkerorrc/themes/yoshi/Makefile
deleted file mode 100644
index 1c5bb94..0000000
--- a/.conkerorrc/themes/yoshi/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=yoshi
-objects=conkeror--scrollbars.css hints--url-panel.css minibuffer.css \
-	mode-line.css new-tabs.css tab-bar.css theme.json
-
-include ../../../dotfiles.mk
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6dc3062..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.old
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e368c11..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".config/zsh/syntax-highlighting"]
-	path = .config/zsh/syntax-highlighting
-	url = git://github.com/zsh-users/zsh-syntax-highlighting
diff --git a/.local/Makefile b/.local/Makefile
deleted file mode 100644
index a473a83..0000000
--- a/.local/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.local
-modules=share
-
-include ../dotfiles.mk
diff --git a/.local/share/Makefile b/.local/share/Makefile
deleted file mode 100644
index da723ff..0000000
--- a/.local/share/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=share
-modules=applications
-
-include ../../dotfiles.mk
diff --git a/.local/share/applications/Makefile b/.local/share/applications/Makefile
deleted file mode 100644
index 4fb9a44..0000000
--- a/.local/share/applications/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=applications
-objects=moc.desktop ncmpcpp.desktop poweroff.desktop reboot.desktop
-
-include ../../../dotfiles.mk
diff --git a/.moc/Makefile b/.moc/Makefile
deleted file mode 100644
index ec1b2b7..0000000
--- a/.moc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIR=.moc
-modules=themes
-objects=config
-
-include ../dotfiles.mk
diff --git a/.moc/themes/Makefile b/.moc/themes/Makefile
deleted file mode 100644
index 77c8f1f..0000000
--- a/.moc/themes/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=themes
-objects=custom
-
-include ../../dotfiles.mk
diff --git a/.mutt/Makefile b/.mutt/Makefile
deleted file mode 100644
index ba059f1..0000000
--- a/.mutt/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIR=.mutt
-objects=aethon.muttrc arch.muttrc colors.muttrc gmail.muttrc \
-	iactor.muttrc macros mailcap muttrc ninthfloor.muttrc \
-	ryuslash.org.muttrc sig
-
-include ../dotfiles.mk
diff --git a/.ncmpcpp/Makefile b/.ncmpcpp/Makefile
deleted file mode 100644
index 059c96b..0000000
--- a/.ncmpcpp/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.ncmpcpp
-objects=config
-
-include ../dotfiles.mk
diff --git a/.pentadactyl/Makefile b/.pentadactyl/Makefile
deleted file mode 100644
index 6c3ac5c..0000000
--- a/.pentadactyl/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.pentadactyl
-modules=plugins
-
-include ../dotfiles.mk
diff --git a/.pentadactyl/plugins/Makefile b/.pentadactyl/plugins/Makefile
deleted file mode 100644
index badaa01..0000000
--- a/.pentadactyl/plugins/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=plugins
-objects=emacs.penta
-
-include ../../dotfiles.mk
diff --git a/.sawfish/Makefile b/.sawfish/Makefile
deleted file mode 100644
index 842bb1a..0000000
--- a/.sawfish/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.sawfish
-objects=rc
-
-include ../dotfiles.mk
diff --git a/.ssh/Makefile b/.ssh/Makefile
deleted file mode 100644
index b805834..0000000
--- a/.ssh/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.ssh
-objects=config
-
-include ../dotfiles.mk
diff --git a/.w3m/Makefile b/.w3m/Makefile
deleted file mode 100644
index ba96315..0000000
--- a/.w3m/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.w3m
-objects=config
-
-include ../dotfiles.mk
diff --git a/.weechat/Makefile b/.weechat/Makefile
deleted file mode 100644
index 6f81768..0000000
--- a/.weechat/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.weechat
-objects=alias.conf irc.conf weechat.conf
-
-include ../dotfiles.mk
diff --git a/.zsh/Makefile b/.zsh/Makefile
deleted file mode 100644
index acd5e4e..0000000
--- a/.zsh/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=.zsh
-modules=functions
-
-include ../dotfiles.mk
diff --git a/.zsh/functions/Makefile b/.zsh/functions/Makefile
deleted file mode 100644
index f71df23..0000000
--- a/.zsh/functions/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIR=functions
-objects=env venv add-to-list
-
-include ../../dotfiles.mk
diff --git a/.zsh/syntax-highlighting b/.zsh/syntax-highlighting
deleted file mode 160000
index d2715e2..0000000
--- a/.zsh/syntax-highlighting
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d2715e2cb3294880bbc6a75b91288243054218d0
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7b8c8ce..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-export DESTDIR:=$(HOME)
-modules=.config .conkerorrc .local .moc .ncmpcpp .sawfish .ssh \
-	.w3m .zsh sbcl
-objects=.bash_profile .beetsconfig .gitconfig .guile .hgrc \
-	.offlineimap.py .offlineimaprc .screenrc .stumpwmrc .urlview \
-	.Xdefaults .xinitrc .Xmodmap .xsession .zprofile .zshrc .zile
-
-export MAKEROOT=y
-
-include dotfiles.mk
-
-install-.xinitrc: MODE=744
-install-.xsession: MODE=744
diff --git a/.config/awesome/bowl.lua b/awesome/.config/awesome/bowl.lua
similarity index 100%
rename from .config/awesome/bowl.lua
rename to awesome/.config/awesome/bowl.lua
diff --git a/.config/awesome/ext.lua b/awesome/.config/awesome/ext.lua
similarity index 100%
rename from .config/awesome/ext.lua
rename to awesome/.config/awesome/ext.lua
diff --git a/.config/awesome/infoline.lua b/awesome/.config/awesome/infoline.lua
similarity index 100%
rename from .config/awesome/infoline.lua
rename to awesome/.config/awesome/infoline.lua
diff --git a/.config/awesome/keychain.lua b/awesome/.config/awesome/keychain.lua
similarity index 100%
rename from .config/awesome/keychain.lua
rename to awesome/.config/awesome/keychain.lua
diff --git a/.config/awesome/oni.lua b/awesome/.config/awesome/oni.lua
similarity index 100%
rename from .config/awesome/oni.lua
rename to awesome/.config/awesome/oni.lua
diff --git a/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
similarity index 100%
rename from .config/awesome/rc.lua
rename to awesome/.config/awesome/rc.lua
diff --git a/.config/awesome/themes/custom/README b/awesome/.config/awesome/themes/custom/README
similarity index 100%
rename from .config/awesome/themes/custom/README
rename to awesome/.config/awesome/themes/custom/README
diff --git a/.config/awesome/themes/custom/theme.lua b/awesome/.config/awesome/themes/custom/theme.lua
similarity index 100%
rename from .config/awesome/themes/custom/theme.lua
rename to awesome/.config/awesome/themes/custom/theme.lua
diff --git a/.beetsconfig b/beets/.beetsconfig
similarity index 100%
rename from .beetsconfig
rename to beets/.beetsconfig
diff --git a/.config/clfswm/clfswmrc b/clfswm/.config/clfswm/clfswmrc
similarity index 100%
rename from .config/clfswm/clfswmrc
rename to clfswm/.config/clfswm/clfswmrc
diff --git a/.conkerorrc/ext_restore.js b/conkeror/.conkerorrc/ext_restore.js
similarity index 100%
rename from .conkerorrc/ext_restore.js
rename to conkeror/.conkerorrc/ext_restore.js
diff --git a/.conkerorrc/gtk2rc b/conkeror/.conkerorrc/gtk2rc
similarity index 100%
rename from .conkerorrc/gtk2rc
rename to conkeror/.conkerorrc/gtk2rc
diff --git a/.conkerorrc/init.js b/conkeror/.conkerorrc/init.js
similarity index 100%
rename from .conkerorrc/init.js
rename to conkeror/.conkerorrc/init.js
diff --git a/.conkerorrc/styles/.gitignore b/conkeror/.conkerorrc/styles/.gitignore
similarity index 100%
rename from .conkerorrc/styles/.gitignore
rename to conkeror/.conkerorrc/styles/.gitignore
diff --git a/.conkerorrc/styles/base.less b/conkeror/.conkerorrc/styles/base.less
similarity index 100%
rename from .conkerorrc/styles/base.less
rename to conkeror/.conkerorrc/styles/base.less
diff --git a/.conkerorrc/styles/git-scm.less b/conkeror/.conkerorrc/styles/git-scm.less
similarity index 100%
rename from .conkerorrc/styles/git-scm.less
rename to conkeror/.conkerorrc/styles/git-scm.less
diff --git a/.conkerorrc/styles/github.css b/conkeror/.conkerorrc/styles/github.css
similarity index 100%
rename from .conkerorrc/styles/github.css
rename to conkeror/.conkerorrc/styles/github.css
diff --git a/.conkerorrc/styles/help.less b/conkeror/.conkerorrc/styles/help.less
similarity index 100%
rename from .conkerorrc/styles/help.less
rename to conkeror/.conkerorrc/styles/help.less
diff --git a/.conkerorrc/styles/tango.less b/conkeror/.conkerorrc/styles/tango.less
similarity index 100%
rename from .conkerorrc/styles/tango.less
rename to conkeror/.conkerorrc/styles/tango.less
diff --git a/.conkerorrc/styles/yoshi.less b/conkeror/.conkerorrc/styles/yoshi.less
similarity index 100%
rename from .conkerorrc/styles/yoshi.less
rename to conkeror/.conkerorrc/styles/yoshi.less
diff --git a/.conkerorrc/themes/naquadah/conkeror--scrollbars.css b/conkeror/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
similarity index 100%
rename from .conkerorrc/themes/naquadah/conkeror--scrollbars.css
rename to conkeror/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
diff --git a/.conkerorrc/themes/naquadah/hints--url-panel.css b/conkeror/.conkerorrc/themes/naquadah/hints--url-panel.css
similarity index 100%
rename from .conkerorrc/themes/naquadah/hints--url-panel.css
rename to conkeror/.conkerorrc/themes/naquadah/hints--url-panel.css
diff --git a/.conkerorrc/themes/naquadah/minibuffer.css b/conkeror/.conkerorrc/themes/naquadah/minibuffer.css
similarity index 100%
rename from .conkerorrc/themes/naquadah/minibuffer.css
rename to conkeror/.conkerorrc/themes/naquadah/minibuffer.css
diff --git a/.conkerorrc/themes/naquadah/mode-line.css b/conkeror/.conkerorrc/themes/naquadah/mode-line.css
similarity index 100%
rename from .conkerorrc/themes/naquadah/mode-line.css
rename to conkeror/.conkerorrc/themes/naquadah/mode-line.css
diff --git a/.conkerorrc/themes/naquadah/new-tabs.css b/conkeror/.conkerorrc/themes/naquadah/new-tabs.css
similarity index 100%
rename from .conkerorrc/themes/naquadah/new-tabs.css
rename to conkeror/.conkerorrc/themes/naquadah/new-tabs.css
diff --git a/.conkerorrc/themes/naquadah/tab-bar.css b/conkeror/.conkerorrc/themes/naquadah/tab-bar.css
similarity index 100%
rename from .conkerorrc/themes/naquadah/tab-bar.css
rename to conkeror/.conkerorrc/themes/naquadah/tab-bar.css
diff --git a/.conkerorrc/themes/naquadah/theme.json b/conkeror/.conkerorrc/themes/naquadah/theme.json
similarity index 100%
rename from .conkerorrc/themes/naquadah/theme.json
rename to conkeror/.conkerorrc/themes/naquadah/theme.json
diff --git a/.conkerorrc/themes/yoshi/conkeror--scrollbars.css b/conkeror/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
similarity index 100%
rename from .conkerorrc/themes/yoshi/conkeror--scrollbars.css
rename to conkeror/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
diff --git a/.conkerorrc/themes/yoshi/hints--url-panel.css b/conkeror/.conkerorrc/themes/yoshi/hints--url-panel.css
similarity index 100%
rename from .conkerorrc/themes/yoshi/hints--url-panel.css
rename to conkeror/.conkerorrc/themes/yoshi/hints--url-panel.css
diff --git a/.conkerorrc/themes/yoshi/minibuffer.css b/conkeror/.conkerorrc/themes/yoshi/minibuffer.css
similarity index 100%
rename from .conkerorrc/themes/yoshi/minibuffer.css
rename to conkeror/.conkerorrc/themes/yoshi/minibuffer.css
diff --git a/.conkerorrc/themes/yoshi/mode-line.css b/conkeror/.conkerorrc/themes/yoshi/mode-line.css
similarity index 100%
rename from .conkerorrc/themes/yoshi/mode-line.css
rename to conkeror/.conkerorrc/themes/yoshi/mode-line.css
diff --git a/.conkerorrc/themes/yoshi/new-tabs.css b/conkeror/.conkerorrc/themes/yoshi/new-tabs.css
similarity index 100%
rename from .conkerorrc/themes/yoshi/new-tabs.css
rename to conkeror/.conkerorrc/themes/yoshi/new-tabs.css
diff --git a/.conkerorrc/themes/yoshi/tab-bar.css b/conkeror/.conkerorrc/themes/yoshi/tab-bar.css
similarity index 100%
rename from .conkerorrc/themes/yoshi/tab-bar.css
rename to conkeror/.conkerorrc/themes/yoshi/tab-bar.css
diff --git a/.conkerorrc/themes/yoshi/theme.json b/conkeror/.conkerorrc/themes/yoshi/theme.json
similarity index 100%
rename from .conkerorrc/themes/yoshi/theme.json
rename to conkeror/.conkerorrc/themes/yoshi/theme.json
diff --git a/.conky_box.lua b/conky/.conky_box.lua
similarity index 100%
rename from .conky_box.lua
rename to conky/.conky_box.lua
diff --git a/.conkyrc b/conky/.conkyrc
similarity index 100%
rename from .conkyrc
rename to conky/.conkyrc
diff --git a/.config/cower/config b/cower/.config/cower/config
similarity index 100%
rename from .config/cower/config
rename to cower/.config/cower/config
diff --git a/dotfiles.mk b/dotfiles.mk
deleted file mode 100644
index 4132992..0000000
--- a/dotfiles.mk
+++ /dev/null
@@ -1,135 +0,0 @@
-LOAD_PATH=. /usr/share/emacs/site-lisp $(HOME)/.emacs.d/site-lisp
-EMACS=emacs $(addprefix -L ,$(LOAD_PATH))
-MODE=644
-
-ifeq ($(shell if [ "`tput colors`" -gt 0 ]; then echo -n "y"; fi),y)
-FG_BLU=\033[0;34m
-FG_YEL=\033[0;33m
-FG_GRE=\033[0;32m
-FG_RED=\033[0;31m
-CLR_RE=\033[0;00m
-else
-FG_BLU=
-FG_YEL=
-FG_GRE=
-FG_RED=
-CLR_RE=
-endif
-
-compile = $(EMACS) -Q -batch -eval "(byte-compile-file \"$(1)\")"
-define newer =
-$(shell if [ "$(1)" -nt "$(DESTDIR)/$(1)" ]; then echo "newer"; fi)
-endef
-define older =
-$(shell if [ "$(1)" -ot "$(DESTDIR)/$(1)" ]; then echo "older"; fi)
-endef
-
-check-objects=$(addprefix check-,$(objects))
-install-objects=$(addprefix install-,$(objects))
-reverse-objects=$(addprefix reverse-,$(objects))
-cleanup-objects=$(addprefix cleanup-,$(objects))
-uninstall-objects=$(addprefix uninstall-,$(objects))
-
-check-modules=$(addprefix check-,$(modules))
-install-modules=$(addprefix install-,$(modules))
-reverse-modules=$(addprefix reverse-,$(modules))
-cleanup-modules=$(addprefix cleanup-,$(modules))
-uninstall-modules=$(addprefix uninstall-,$(modules))
-
-.PHONY: all install cleanup check cleanup $(modules) \
-	$(install-objects) $(cleanup-objects) $(check-objects) \
-	$(install-modules) $(cleanup-modules) $(check-modules) \
-	$(reverse) $(reverse-objects) $(reverse-modules) \
-	$(uninstall-objects) $(uninstall-modules)
-all: $(modules) $(objects)
-
-ifeq ($(MAKEROOT),y)
-check: $(check-modules) $(check-objects)
-install: cleanup $(install-modules) $(install-objects) Makefile.old
-reverse: $(reverse-modules) $(reverse-objects)
-uninstall: $(uninstall-modules) $(uninstall-objects)
-	@rmdir --ignore-fail-on-non-empty $(DESTDIR) 2> /dev/null || true
-ifeq ($(firstword $(MAKEFILE_LIST)),Makefile.old)
-cleanup: $(cleanup-modules) $(cleanup-objects)
-	@rmdir --ignore-fail-on-non-empty $(DESTDIR) 2> /dev/null || true
-else
-cleanup: export NEWOBJS = $(objects)
-cleanup: export NEWMODS = $(modules)
-cleanup:
-	@$(MAKE) -s -f Makefile.old cleanup
-
-Makefile.old: $(firstword $(MAKEFILE_LIST))
-	@cp "$^" "$@"
-
-ifdef SUBDIR
-DESTDIR:=$(DESTDIR)/$(SUBDIR)
-endif
-endif
-else
-check:
-	@$(MAKE) -s -C ../ check
-install:
-	@$(MAKE) -s -C ../ install
-reverse:
-	@$(MAKE) -s -C ../ reverse
-cleanup:
-	@$(MAKE) -s -C ../ cleanup
-uninstall:
-	@$(MAKE) -s -C ../ uninstall
-endif
-
-$(modules): %:
-	$(MAKE) -C $*
-
-$(install-objects): install-%: %
-	@$(if $(call newer,$*), \
-		echo -e "$(FG_GRE)+ $(FG_YEL)$(MKDPREFIX)$* $(CLR_RE)to $(DESTDIR) as $(MODE)"; \
-		install -pDm $(MODE) "$*" "$(DESTDIR)/$*", \
-		$(if $(call older,$*) ,\
-			echo -e "$(FG_RED)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"))
-
-$(install-modules): install-%:
-	@$(MAKE) -s -C $* install MKDPREFIX=$(MKDPREFIX)$*/
-
-$(reverse-objects): reverse-%:
-	@$(if $(call older,$*), \
-		echo -e "$(FG_GRE)+ $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"; \
-		cp -a "$(DESTDIR)/$*" "$*", \
-		echo -e "$(FG_RED)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)")
-
-$(reverse-modules): reverse-%:
-	@$(MAKE) -s -C $* reverse MKDPREFIX=$(MKDPREFIX)$*/
-
-$(cleanup-objects): cleanup-%:
-	@$(if $(findstring $*,$(NEWOBJS)),, \
-		@$(if $(call older,$*), \
-	 		echo -e "$(FG_RED)+ $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \
-			echo -e "$(FG_GRE)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"; \
-			unlink "$(DESTDIR)/$*" || true))
-
-$(cleanup-modules): cleanup-%:
-	@$(if $(findstring $*,$(NEWMODS)), \
-		@$(MAKE) -C $* cleanup MKDPREFIX=$(MKDPREFIX)$*/, \
-		@$(MAKE) -C $* uninstall MKDPREFIX=$(MKDPREFIX)$*/)
-
-$(check-objects): check-%:
-	@$(if $(call newer,$*), \
-		echo -e "$(FG_GRE)+ $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \
-		$(if $(call older,$*), \
-			echo -e "$(FG_RED)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \
-			echo -e "$(FG_BLU)= $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"))
-
-$(check-modules): check-%:
-	@$(MAKE) -s -C $* check MKDPREFIX=$(MKDPREFIX)$*/
-
-$(uninstall-objects): uninstall-%:
-	@$(if $(call older,$*), \
-		echo -e "$(FG_RED)+ $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \
-		echo -e "$(FG_GRE)- $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"; \
-		unlink "$(DESTDIR)/$*" || true)
-
-$(uninstall-modules): uninstall-%:
-	@$(MAKE) -s -C $* uninstall MKDPREFIX=$(MKDPREFIX)$*/
-
-$(filter %.elc,$(objects)): %.elc: %.el
-	$(call compile,$^)
diff --git a/dotfiles2.mk b/dotfiles2.mk
deleted file mode 100644
index 521b06d..0000000
--- a/dotfiles2.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-DESTDIR?=$(HOME)
-DESTDIR:=$(DESTDIR)/$(SUBDIR)
-
-RSYNC=rsync
-RFLAGS=--links --perms --times --group --owner --dirs --verbose \
-	--update --delete --exclude=Makefile --exclude=.gitignore \
-	$(addprefix --exclude=,$(EXCLUDE))
-
-install-modules=$(addprefix install-,$(MODULES))
-
-install: $(install-modules)
-	@echo "Syncing $(CURDIR)/ with $(DESTDIR)"
-	@$(RSYNC) $(RFLAGS) $(CURDIR)/ $(DESTDIR)
-	@echo
-
-$(install-modules): install-%:
-	@DESTDIR=$(DESTDIR) $(MAKE) -s -C $* install
diff --git a/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc
similarity index 100%
rename from .config/dunst/dunstrc
rename to dunst/.config/dunst/dunstrc
diff --git a/.config/fehlstart/fehlstart.rc b/fehlstart/.config/fehlstart/fehlstart.rc
similarity index 100%
rename from .config/fehlstart/fehlstart.rc
rename to fehlstart/.config/fehlstart/fehlstart.rc
diff --git a/.local/share/applications/moc.desktop b/fehlstart/.local/share/applications/moc.desktop
similarity index 100%
rename from .local/share/applications/moc.desktop
rename to fehlstart/.local/share/applications/moc.desktop
diff --git a/.local/share/applications/ncmpcpp.desktop b/fehlstart/.local/share/applications/ncmpcpp.desktop
similarity index 100%
rename from .local/share/applications/ncmpcpp.desktop
rename to fehlstart/.local/share/applications/ncmpcpp.desktop
diff --git a/.local/share/applications/poweroff.desktop b/fehlstart/.local/share/applications/poweroff.desktop
similarity index 100%
rename from .local/share/applications/poweroff.desktop
rename to fehlstart/.local/share/applications/poweroff.desktop
diff --git a/.local/share/applications/reboot.desktop b/fehlstart/.local/share/applications/reboot.desktop
similarity index 100%
rename from .local/share/applications/reboot.desktop
rename to fehlstart/.local/share/applications/reboot.desktop
diff --git a/.config/fish/config.fish b/fish/.config/fish/config.fish
similarity index 100%
rename from .config/fish/config.fish
rename to fish/.config/fish/config.fish
diff --git a/.config/fontconfig/fonts.conf b/fontconfig/.config/fontconfig/fonts.conf
similarity index 100%
rename from .config/fontconfig/fonts.conf
rename to fontconfig/.config/fontconfig/fonts.conf
diff --git a/.gitconfig b/git/.gitconfig
similarity index 100%
rename from .gitconfig
rename to git/.gitconfig
diff --git a/.guile b/guile/.guile
similarity index 100%
rename from .guile
rename to guile/.guile
diff --git a/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
similarity index 100%
rename from .config/herbstluftwm/autostart
rename to herbstluftwm/.config/herbstluftwm/autostart
diff --git a/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/panel.sh
similarity index 100%
rename from .config/herbstluftwm/panel.sh
rename to herbstluftwm/.config/herbstluftwm/panel.sh
diff --git a/.hgrc b/mercurial/.hgrc
similarity index 100%
rename from .hgrc
rename to mercurial/.hgrc
diff --git a/.moc/.gitignore b/moc/.moc/.gitignore
similarity index 100%
rename from .moc/.gitignore
rename to moc/.moc/.gitignore
diff --git a/.moc/config b/moc/.moc/config
similarity index 100%
rename from .moc/config
rename to moc/.moc/config
diff --git a/.moc/themes/custom b/moc/.moc/themes/custom
similarity index 100%
rename from .moc/themes/custom
rename to moc/.moc/themes/custom
diff --git a/.mutt/.gitignore b/mutt/.mutt/.gitignore
similarity index 100%
rename from .mutt/.gitignore
rename to mutt/.mutt/.gitignore
diff --git a/.mutt/aethon.muttrc b/mutt/.mutt/aethon.muttrc
similarity index 100%
rename from .mutt/aethon.muttrc
rename to mutt/.mutt/aethon.muttrc
diff --git a/.mutt/arch.muttrc b/mutt/.mutt/arch.muttrc
similarity index 100%
rename from .mutt/arch.muttrc
rename to mutt/.mutt/arch.muttrc
diff --git a/.mutt/colors.muttrc b/mutt/.mutt/colors.muttrc
similarity index 100%
rename from .mutt/colors.muttrc
rename to mutt/.mutt/colors.muttrc
diff --git a/.mutt/gmail.muttrc b/mutt/.mutt/gmail.muttrc
similarity index 100%
rename from .mutt/gmail.muttrc
rename to mutt/.mutt/gmail.muttrc
diff --git a/.mutt/iactor.muttrc b/mutt/.mutt/iactor.muttrc
similarity index 100%
rename from .mutt/iactor.muttrc
rename to mutt/.mutt/iactor.muttrc
diff --git a/.mutt/macros b/mutt/.mutt/macros
similarity index 100%
rename from .mutt/macros
rename to mutt/.mutt/macros
diff --git a/.mutt/mailcap b/mutt/.mutt/mailcap
similarity index 100%
rename from .mutt/mailcap
rename to mutt/.mutt/mailcap
diff --git a/.mutt/muttrc b/mutt/.mutt/muttrc
similarity index 100%
rename from .mutt/muttrc
rename to mutt/.mutt/muttrc
diff --git a/.mutt/ninthfloor.muttrc b/mutt/.mutt/ninthfloor.muttrc
similarity index 100%
rename from .mutt/ninthfloor.muttrc
rename to mutt/.mutt/ninthfloor.muttrc
diff --git a/.mutt/ryuslash.org.muttrc b/mutt/.mutt/ryuslash.org.muttrc
similarity index 100%
rename from .mutt/ryuslash.org.muttrc
rename to mutt/.mutt/ryuslash.org.muttrc
diff --git a/.mutt/sig b/mutt/.mutt/sig
similarity index 100%
rename from .mutt/sig
rename to mutt/.mutt/sig
diff --git a/.urlview b/mutt/.urlview
similarity index 100%
rename from .urlview
rename to mutt/.urlview
diff --git a/.ncmpcpp/config b/ncmpcpp/.ncmpcpp/config
similarity index 100%
rename from .ncmpcpp/config
rename to ncmpcpp/.ncmpcpp/config
diff --git a/.config/newsbeuter/.gitignore b/newsbeuter/.config/newsbeuter/.gitignore
similarity index 100%
rename from .config/newsbeuter/.gitignore
rename to newsbeuter/.config/newsbeuter/.gitignore
diff --git a/.config/newsbeuter/config b/newsbeuter/.config/newsbeuter/config
similarity index 100%
rename from .config/newsbeuter/config
rename to newsbeuter/.config/newsbeuter/config
diff --git a/.config/newsbeuter/urls b/newsbeuter/.config/newsbeuter/urls
similarity index 100%
rename from .config/newsbeuter/urls
rename to newsbeuter/.config/newsbeuter/urls
diff --git a/notion/cfg_notion.lua b/notion/.notion/cfg_notion.lua
similarity index 100%
rename from notion/cfg_notion.lua
rename to notion/.notion/cfg_notion.lua
diff --git a/notion/cfg_notioncore.lua b/notion/.notion/cfg_notioncore.lua
similarity index 100%
rename from notion/cfg_notioncore.lua
rename to notion/.notion/cfg_notioncore.lua
diff --git a/notion/Makefile b/notion/Makefile
deleted file mode 100644
index 2daf159..0000000
--- a/notion/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIR=.notion
-
-include ../dotfiles2.mk
-
-install: RFLAGS:=$(RFLAGS) --exclude=default-session--0
-install: RFLAGS:=$(RFLAGS) --exclude=.welcome_msg_displayed
diff --git a/.offlineimap.py b/offlineimap/.offlineimap.py
similarity index 100%
rename from .offlineimap.py
rename to offlineimap/.offlineimap.py
diff --git a/.offlineimaprc b/offlineimap/.offlineimaprc
similarity index 100%
rename from .offlineimaprc
rename to offlineimap/.offlineimaprc
diff --git a/.pentadactyl/plugins/emacs.penta b/pentadactil/.pentadactyl/plugins/emacs.penta
similarity index 100%
rename from .pentadactyl/plugins/emacs.penta
rename to pentadactil/.pentadactyl/plugins/emacs.penta
diff --git a/.sawfish/rc b/sawfish/.sawfish/rc
similarity index 100%
rename from .sawfish/rc
rename to sawfish/.sawfish/rc
diff --git a/sbcl/Makefile b/sbcl/Makefile
deleted file mode 100644
index 1be8c1a..0000000
--- a/sbcl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-objects=.sbclrc
-
-include ../dotfiles.mk
-
-.sbclrc: sbclrc.org
-	$(EMACS) -Q -batch \
-       -eval "(progn (require 'org) (require 'ob-tangle) \
-				     (org-babel-tangle-file \"$^\"))"
diff --git a/.screenrc b/screen/.screenrc
similarity index 100%
rename from .screenrc
rename to screen/.screenrc
diff --git a/.scwmrc b/scwm/.scwmrc
similarity index 100%
rename from .scwmrc
rename to scwm/.scwmrc
diff --git a/.slrnrc b/slrn/.slrnrc
similarity index 100%
rename from .slrnrc
rename to slrn/.slrnrc
diff --git a/.ssh/.gitignore b/ssh/.ssh/.gitignore
similarity index 100%
rename from .ssh/.gitignore
rename to ssh/.ssh/.gitignore
diff --git a/.ssh/config b/ssh/.ssh/config
similarity index 100%
rename from .ssh/config
rename to ssh/.ssh/config
diff --git a/.stumpwmrc b/stumpwm/.stumpwmrc
similarity index 100%
rename from .stumpwmrc
rename to stumpwm/.stumpwmrc
diff --git a/.tmux.conf b/tmux/.tmux.conf
similarity index 100%
rename from .tmux.conf
rename to tmux/.tmux.conf
diff --git a/.w3m/.gitignore b/w3m/.w3m/.gitignore
similarity index 100%
rename from .w3m/.gitignore
rename to w3m/.w3m/.gitignore
diff --git a/.w3m/config b/w3m/.w3m/config
similarity index 100%
rename from .w3m/config
rename to w3m/.w3m/config
diff --git a/.weechat/alias.conf b/weechat/.weechat/alias.conf
similarity index 100%
rename from .weechat/alias.conf
rename to weechat/.weechat/alias.conf
diff --git a/.weechat/irc.conf b/weechat/.weechat/irc.conf
similarity index 100%
rename from .weechat/irc.conf
rename to weechat/.weechat/irc.conf
diff --git a/.weechat/weechat.conf b/weechat/.weechat/weechat.conf
similarity index 100%
rename from .weechat/weechat.conf
rename to weechat/.weechat/weechat.conf
diff --git a/.Xdefaults b/x11/.Xdefaults
similarity index 100%
rename from .Xdefaults
rename to x11/.Xdefaults
diff --git a/.Xmodmap b/x11/.Xmodmap
similarity index 100%
rename from .Xmodmap
rename to x11/.Xmodmap
diff --git a/.xinitrc b/x11/.xinitrc
similarity index 100%
rename from .xinitrc
rename to x11/.xinitrc
diff --git a/.xsession b/x11/.xsession
similarity index 100%
rename from .xsession
rename to x11/.xsession
diff --git a/.xbindkeysrc.scm b/xbindkeys/.xbindkeysrc.scm
similarity index 100%
rename from .xbindkeysrc.scm
rename to xbindkeys/.xbindkeysrc.scm
diff --git a/xmonad/.gitignore b/xmonad/.xmonad/.gitignore
similarity index 100%
rename from xmonad/.gitignore
rename to xmonad/.xmonad/.gitignore
diff --git a/xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
similarity index 100%
rename from xmonad/xmonad.hs
rename to xmonad/.xmonad/xmonad.hs
diff --git a/xmonad/Makefile b/xmonad/Makefile
deleted file mode 100644
index 9b8d3c3..0000000
--- a/xmonad/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-DESTDIR := $(DESTDIR)/.xmonad
-objects=xmonad-x86_64-linux xmonad.hs
-
-GHC := ghc
-
-include ../dotfiles.mk
-
-xmonad-x86_64-linux: xmonad.hs
-	$(GHC) --make $^ -i -ilib -fforce-recomp -main-is main  -v0 -o $@
-install-xmonad-x86_64-linux: MODE=744
diff --git a/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc
similarity index 100%
rename from .config/zathura/zathurarc
rename to zathura/.config/zathura/zathurarc
diff --git a/.zile b/zile/.zile
similarity index 100%
rename from .zile
rename to zile/.zile
diff --git a/.bash_profile b/zsh/.bash_profile
similarity index 100%
rename from .bash_profile
rename to zsh/.bash_profile
diff --git a/.zprofile b/zsh/.zprofile
similarity index 100%
rename from .zprofile
rename to zsh/.zprofile
diff --git a/.zsh/.gitignore b/zsh/.zsh/.gitignore
similarity index 100%
rename from .zsh/.gitignore
rename to zsh/.zsh/.gitignore
diff --git a/.zsh/functions/add-to-list b/zsh/.zsh/functions/add-to-list
similarity index 100%
rename from .zsh/functions/add-to-list
rename to zsh/.zsh/functions/add-to-list
diff --git a/.zsh/functions/env b/zsh/.zsh/functions/env
similarity index 100%
rename from .zsh/functions/env
rename to zsh/.zsh/functions/env
diff --git a/.zsh/functions/venv b/zsh/.zsh/functions/venv
similarity index 100%
rename from .zsh/functions/venv
rename to zsh/.zsh/functions/venv
diff --git a/.zshrc b/zsh/.zshrc
similarity index 100%
rename from .zshrc
rename to zsh/.zshrc