diff --git a/aliases.zsh b/lib/aliases.zsh
similarity index 100%
rename from aliases.zsh
rename to lib/aliases.zsh
diff --git a/colors.zsh b/lib/colors.zsh
similarity index 100%
rename from colors.zsh
rename to lib/colors.zsh
diff --git a/completion.zsh b/lib/completion.zsh
similarity index 100%
rename from completion.zsh
rename to lib/completion.zsh
diff --git a/functions.zsh b/lib/functions.zsh
similarity index 100%
rename from functions.zsh
rename to lib/functions.zsh
diff --git a/git.zsh b/lib/git.zsh
similarity index 100%
rename from git.zsh
rename to lib/git.zsh
diff --git a/grep.zsh b/lib/grep.zsh
similarity index 100%
rename from grep.zsh
rename to lib/grep.zsh
diff --git a/history.zsh b/lib/history.zsh
similarity index 100%
rename from history.zsh
rename to lib/history.zsh
diff --git a/key-bindings.zsh b/lib/key-bindings.zsh
similarity index 100%
rename from key-bindings.zsh
rename to lib/key-bindings.zsh
diff --git a/prompt.zsh b/lib/prompt.zsh
similarity index 100%
rename from prompt.zsh
rename to lib/prompt.zsh
diff --git a/rake_completion.zsh b/lib/rake_completion.zsh
similarity index 100%
rename from rake_completion.zsh
rename to lib/rake_completion.zsh
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index b931f558..40c73cb4 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -2,4 +2,4 @@
 
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
-for config_file ($ZSH/*.zsh) source $config_file
+for config_file ($ZSH/lib/*.zsh) source $config_file