diff --git a/.zprofile b/.config/zsh/.zprofile
similarity index 100%
rename from .zprofile
rename to .config/zsh/.zprofile
diff --git a/.zshrc b/.config/zsh/.zshrc
similarity index 100%
rename from .zshrc
rename to .config/zsh/.zshrc
diff --git a/.zshenv b/.zshenv
index f9a371e..2f87109 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,11 +1,17 @@
-export HISTFILE="$HOME/.zsh_history"
+# ZSH configuration
+export ZDOTDIR="$HOME/.config/zsh"
+
+# History
+export HISTFILE="$HOME/.config/zsh/.zsh_history"
 export HISTSIZE=5000
 export SAVEHIST=100000
 
+# CLI config
 export CLICOLOR=1
 export EDITOR='vim'
 export PAGER='less'
 
+# Packaging
 export USER_NICKNAME="Rodolphe Bréard"
 export DEBEMAIL="packages+deb@what.tf"
 export DEBFULLNAME="$USER_NICKNAME"