diff --git a/lib/aliases.zsh b/functions/alias.zsh
similarity index 100%
rename from lib/aliases.zsh
rename to functions/alias.zsh
diff --git a/lib/theme-and-appearance.zsh b/functions/appearance.zsh
similarity index 100%
rename from lib/theme-and-appearance.zsh
rename to functions/appearance.zsh
diff --git a/lib/completion.zsh b/functions/completion.zsh
similarity index 100%
rename from lib/completion.zsh
rename to functions/completion.zsh
diff --git a/lib/correction.zsh b/functions/correction.zsh
similarity index 100%
rename from lib/correction.zsh
rename to functions/correction.zsh
diff --git a/lib/directories.zsh b/functions/directory.zsh
similarity index 100%
rename from lib/directories.zsh
rename to functions/directory.zsh
diff --git a/lib/grep.zsh b/functions/grep.zsh
similarity index 100%
rename from lib/grep.zsh
rename to functions/grep.zsh
diff --git a/lib/history.zsh b/functions/history.zsh
similarity index 100%
rename from lib/history.zsh
rename to functions/history.zsh
diff --git a/lib/key-bindings.zsh b/functions/keyboard.zsh
similarity index 100%
rename from lib/key-bindings.zsh
rename to functions/keyboard.zsh
diff --git a/lib/misc.zsh b/functions/mixed.zsh
similarity index 100%
rename from lib/misc.zsh
rename to functions/mixed.zsh
diff --git a/lib/spectrum.zsh b/functions/spectrum.zsh
similarity index 100%
rename from lib/spectrum.zsh
rename to functions/spectrum.zsh
diff --git a/lib/termsupport.zsh b/functions/terminal.zsh
similarity index 100%
rename from lib/termsupport.zsh
rename to functions/terminal.zsh
diff --git a/lib/functions.zsh b/functions/utility.zsh
similarity index 100%
rename from lib/functions.zsh
rename to functions/utility.zsh
diff --git a/oh-my-zsh.zsh b/oh-my-zsh.zsh
index 7961e8c..2cd105b 100644
--- a/oh-my-zsh.zsh
+++ b/oh-my-zsh.zsh
@@ -6,8 +6,8 @@ if [[ "$TERM" == 'dumb' ]]; then
 fi
 
 # Load all files in $ZSH/oh-my-zsh/lib/ that end in .zsh.
-for config_file in $ZSH/lib/*.zsh; do
-  source "$config_file"
+for function_file in $ZSH/functions/*.zsh; do
+  source "$function_file"
 done
 
 # Add all defined plugins to fpath.