diff --git a/git/git.zsh b/zsh/git.zsh
similarity index 100%
rename from git/git.zsh
rename to zsh/git.zsh
diff --git a/git/completion.sh b/zsh/git_completion.sh
similarity index 100%
rename from git/completion.sh
rename to zsh/git_completion.sh
diff --git a/tmux/aliases.zsh b/zsh/tmux.zsh
similarity index 100%
rename from tmux/aliases.zsh
rename to zsh/tmux.zsh
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index a64562f..198db19 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -6,7 +6,7 @@ if [[ -d ~/code ]]; then
 fi
 
 # load all zsh config files
-for config ($ZSH/**/*.zsh) source $config
+for config ($ZSH/zsh/**/*.zsh) source $config
 
 if [[ -a ~/.localrc ]]; then
     source ~/.localrc
@@ -17,7 +17,7 @@ fi
 autoload -U compinit
 compinit
 
-for config ($ZSH/**/completion.sh) source $config
+for config ($ZSH/zsh/**/*completion.sh) source $config
 
 export EDITOR='vim'