diff --git a/xprofile b/xbase/.xprofile
similarity index 100%
rename from xprofile
rename to xbase/.xprofile
diff --git a/zshrc b/zsh/.zsh/10-base.zsh
similarity index 100%
rename from zshrc
rename to zsh/.zsh/10-base.zsh
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100755
index 0000000..411684e
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1 @@
+for config (~/.zsh/*.zsh) source $config
diff --git a/zshrc.local.template b/zshrc.local.template
deleted file mode 100644
index 9b32b4b..0000000
--- a/zshrc.local.template
+++ /dev/null
@@ -1,10 +0,0 @@
-### Different prompt
-#PROMPT="%{$fg[blue]%}> %{$reset_color%}"
-#RPROMPT="%{$fg[blue]%}%~%{$reset_color%}"
-
-### Auto tmux :)
-#if [ -z "$TMUX" ]; then
-#        if which tmux >/dev/null 2>&1; then
-#                tmux -q has-session && exec tmux attach-session -d || exec tmux new-session
-#        fi
-#fi