diff --git a/zsh.d/00-options b/zsh/zsh.d/00-options
similarity index 100%
rename from zsh.d/00-options
rename to zsh/zsh.d/00-options
diff --git a/zsh.d/10-environment b/zsh/zsh.d/10-environment
similarity index 100%
rename from zsh.d/10-environment
rename to zsh/zsh.d/10-environment
diff --git a/zsh.d/20-bindkeys b/zsh/zsh.d/20-bindkeys
similarity index 100%
rename from zsh.d/20-bindkeys
rename to zsh/zsh.d/20-bindkeys
diff --git a/zsh.d/20-complete b/zsh/zsh.d/20-complete
similarity index 100%
rename from zsh.d/20-complete
rename to zsh/zsh.d/20-complete
diff --git a/zsh.d/30-aliases b/zsh/zsh.d/30-aliases
similarity index 100%
rename from zsh.d/30-aliases
rename to zsh/zsh.d/30-aliases
diff --git a/zsh.d/30-less b/zsh/zsh.d/30-less
similarity index 100%
rename from zsh.d/30-less
rename to zsh/zsh.d/30-less
diff --git a/zsh.d/30-prompt b/zsh/zsh.d/30-prompt
similarity index 100%
rename from zsh.d/30-prompt
rename to zsh/zsh.d/30-prompt
diff --git a/zsh.d/30-termcolors b/zsh/zsh.d/30-termcolors
similarity index 100%
rename from zsh.d/30-termcolors
rename to zsh/zsh.d/30-termcolors
diff --git a/zsh.d/90-functions b/zsh/zsh.d/90-functions
similarity index 100%
rename from zsh.d/90-functions
rename to zsh/zsh.d/90-functions
diff --git a/zsh.d/Darwin/50-darwin b/zsh/zsh.d/Darwin/50-darwin
similarity index 100%
rename from zsh.d/Darwin/50-darwin
rename to zsh/zsh.d/Darwin/50-darwin
diff --git a/zsh.d/Darwin/90-coreutilsDarwin b/zsh/zsh.d/Darwin/90-coreutilsDarwin
similarity index 100%
rename from zsh.d/Darwin/90-coreutilsDarwin
rename to zsh/zsh.d/Darwin/90-coreutilsDarwin
diff --git a/zsh.d/Darwin/90-dsFunctions b/zsh/zsh.d/Darwin/90-dsFunctions
similarity index 100%
rename from zsh.d/Darwin/90-dsFunctions
rename to zsh/zsh.d/Darwin/90-dsFunctions
diff --git a/zsh.d/Darwin/90-macportsDarwin b/zsh/zsh.d/Darwin/90-macportsDarwin
similarity index 100%
rename from zsh.d/Darwin/90-macportsDarwin
rename to zsh/zsh.d/Darwin/90-macportsDarwin
diff --git a/zsh.d/Linux/50-linux b/zsh/zsh.d/Linux/50-linux
similarity index 100%
rename from zsh.d/Linux/50-linux
rename to zsh/zsh.d/Linux/50-linux
diff --git a/zshrc b/zsh/zshrc
similarity index 100%
rename from zshrc
rename to zsh/zshrc