diff --git a/init.zsh b/init.zsh
index 028f222..c0ef551 100644
--- a/init.zsh
+++ b/init.zsh
@@ -48,7 +48,6 @@ autoload -Uz compinit && compinit -i
 
 # Source files (the order matters).
 source "${0:h}/helper.zsh"
-source "${0:h}/environment.zsh"
 
 # Source modules defined in ~/.zshrc.
 for omodule in "$omodules[@]"; do
diff --git a/environment.zsh b/modules/environment/init.zsh
similarity index 100%
rename from environment.zsh
rename to modules/environment/init.zsh