diff --git a/init.zsh b/init.zsh
index 303d6158..b2e083ba 100644
--- a/init.zsh
+++ b/init.zsh
@@ -34,7 +34,6 @@ autoload -Uz compinit && compinit -i
 
 # Source files (the order matters).
 source "${0:h}/helper.zsh"
-source "${0:h}/environment.zsh"
 
 # Autoload Zsh functions.
 autoload -Uz age
diff --git a/environment.zsh b/modules/environment/init.zsh
similarity index 100%
rename from environment.zsh
rename to modules/environment/init.zsh