diff --git a/zsh/.zprofile b/zsh/.config/zsh/.zprofile
similarity index 100%
rename from zsh/.zprofile
rename to zsh/.config/zsh/.zprofile
diff --git a/zsh/.zshrc b/zsh/.config/zsh/.zshrc
similarity index 96%
rename from zsh/.zshrc
rename to zsh/.config/zsh/.zshrc
index 0d1c68d..4ef9c00 100644
--- a/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -35,6 +35,9 @@ zplug "plugins/yarn", from:oh-my-zsh
 zplug "zsh-users/zsh-autosuggestions", from:github, defer:3
 zplug "zsh-users/zsh-syntax-highlighting", from:github, defer:3
 
+# Let zplug manage itself
+zplug 'zplug/zplug', hook-build:'zplug --self-manage'
+
 # Install packages
 if ! zplug check --verbose; then
 	printf "Install zplug plugins? [y/N]: "
diff --git a/zsh/.zshenv b/zsh/.zshenv
index da00a48..0e437a5 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -226,6 +226,9 @@ ex=:\
 # Save history file in proper place
 HISTFILE=~/.cache/zsh/history
 
+# Load config files from their proper place
+ZDOTDIR=~/.config/zsh
+
 # Use alternative muhome
 export MU_HOME="/home/alrayyes/.cache/mu"