diff --git a/.tmux.conf b/.config/tmux/tmux.conf
similarity index 95%
rename from .tmux.conf
rename to .config/tmux/tmux.conf
index a5cc33d..0c26e3f 100644
--- a/.tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -14,8 +14,8 @@ bind - split-window -v
 unbind '"'
 unbind %
 
-# reload config file (change file location to your the tmux.conf you want to use)
-bind r source-file ~/.tmux.conf
+# reload config file
+bind r source-file $XDG_CONFIG_HOME/tmux/tmux.conf
 
 # switch panes using Alt-arrow without prefix
 bind -n M-Left select-pane -L
diff --git a/.tmux.nested.conf b/.config/tmux/tmux.nested.conf
similarity index 100%
rename from .tmux.nested.conf
rename to .config/tmux/tmux.nested.conf
diff --git a/.config/zsh/.zlogin b/.config/zsh/.zlogin
index e92aa8f..dffc582 100644
--- a/.config/zsh/.zlogin
+++ b/.config/zsh/.zlogin
@@ -32,7 +32,7 @@ done
 
 ## If tmux session is nested, source modified config (e.g. for overwriting styles)
 if [[ "${SSH_CONNECTION}" ]] && [[ "${TMUX}" ]]; then
-  tmux source-file ~/.tmux.nested.conf
+  tmux source-file $XDG_CONFIG_HOME/tmux/tmux.nested.conf
 fi
 
 ## Update or install vim plugins
diff --git a/.zshenv b/.zshenv
index babb9ce..84c683a 100644
--- a/.zshenv
+++ b/.zshenv
@@ -5,7 +5,6 @@ export XDG_CONFIG_HOME=${$XDG_CONFIG_HOME:=${HOME}/.config}
 
 # Where to look for zsh config
 export ZDOTDIR=${ZDOTDIR:=${XDG_CONFIG_HOME}/zsh}
-source $ZDOTDIR/.zshenv
 
 # Load config files in $ZSH/lib that for stage 1
 for config_file ($ZDOTDIR/lib/10-*.zsh) source $config_file