diff --git a/dot_config/git/config b/dot_config/git/config
deleted file mode 100644
index 3dc0f85..0000000
--- a/dot_config/git/config
+++ /dev/null
@@ -1,6 +0,0 @@
-[user]
-email = nikolasweger@googlemail.com
-name = eeleater
-
-[pull]
-rebase = false
diff --git a/dot_gitconfig.tmpl b/dot_config/git/config.tmpl
similarity index 100%
rename from dot_gitconfig.tmpl
rename to dot_config/git/config.tmpl
diff --git a/dot_zshrc b/dot_zshrc
deleted file mode 100644
index a49c649..0000000
--- a/dot_zshrc
+++ /dev/null
@@ -1,56 +0,0 @@
-# https://github.com/romkatv/zsh4humans/blob/v5/README.md (tmux: integrated, system, no)
-zstyle ':z4h:' start-tmux 'no'
-
-# keyboard setting
-zstyle ':z4h:bindkey' keyboard 'pc'
-zstyle ':z4h:autosuggestions' forward-char 'accept'
-zstyle ':z4h:fzf-complete' recurse-dirs 'no'
-
-# automatic teleportation of z4h to ssh (yes, no) example: zstyle ':z4h:ssh:pxm' enable 'yes'
-zstyle ':z4h:ssh:*' enable 'no'
-
-# install plugins
-z4h install ohmyzsh/ohmyzsh || return
-z4h install urbainvaes/fzf-marks || return
-z4h install mroth/evalcache || return
-z4h install trapd00r/LS_COLORS || return
-z4h install zpm-zsh/colorize || return
-z4h install desyncr/auto-ls || return
-
-# initialize z4h
-z4h init || return
-
-# exports
-z4h source -c $HOME/.config/zsh/export.zsh
-z4h source -c $HOME/.config/local/export.zsh
-
-# libraries
-z4h source -c $HOME/.config/zsh/libraries.zsh
-z4h source -c $HOME/.config/local/libraries.zsh
-
-# plugins
-z4h source -c $HOME/.config/zsh/plugins.zsh
-z4h source -c $HOME/.config/local/plugins.zsh
-
-# eval stuff
-z4h source -c $HOME/.config/zsh/evalcache.zsh
-z4h source -c $HOME/.config/local/evalcache.zsh
-
-# aliases
-z4h source -c $HOME/.config/zsh/aliases.zsh
-z4h source -c $HOME/.config/local/aliases.zsh
-
-# key bindings
-z4h source -c $HOME/.config/zsh/keybinds.zsh
-z4h source -c $HOME/.config/local/keybinds.zsh
-
-# ssh stuff
-z4h source -c $HOME/.config/zsh/sshagent.zsh
-z4h source -c $HOME/.config/zsh/sshcompfix.zsh
-
-# named directories
-z4h source -c $HOME/.config/zsh/dirs.zsh
-z4h source -c $HOME/.config/local/dirs.zsh
-
-# localrc
-z4h source -c $HOME/.config/local/rc.zsh