diff --git a/README.md b/README.md
index 340340e..c2fb769 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,7 @@ mnemonic aliases. Please feel free to edit them:
 ### How To Customize ZSH
 
 YADR allows you to completely customize your ZSH without having to fork and maintain the project. Here's how it works: YADR will
-source (include) any files matching the pattern `*.before.zsh` or `*.after.zsh` in the `custom/zsh` directory. `before` files are
+source (include) any files in `.yadr/custom/zsh/before/*` or `.yadr/custom/zsh/after/*`. The `before` files are
 useful for setting the theme and plugins. `after` files allow you to override options set by YADR, define your own aliases, etc.
 
 To make your life easier, create a `zsh` folder in your Dropbox (or as a git repo) and symlink it into `~/.yadr/custom`. Do it like this:
diff --git a/custom/zsh.sample/after.sample.zsh b/custom/zsh.sample/after/after.sample.zsh
similarity index 100%
rename from custom/zsh.sample/after.sample.zsh
rename to custom/zsh.sample/after/after.sample.zsh
diff --git a/custom/zsh.sample/before.sample.zsh b/custom/zsh.sample/before/before.sample.zsh
similarity index 100%
rename from custom/zsh.sample/before.sample.zsh
rename to custom/zsh.sample/before/before.sample.zsh
diff --git a/zsh/zshrc b/zsh/zshrc
index 04d08f6..39b9d62 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -19,11 +19,11 @@ if [[ -d $HOME/.oh-my-zsh ]]; then
 
   # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
   # Example format: plugins=(rails git textmate ruby lighthouse)
-  plugins=(vi-mode git rvm ruby rails autojump bundler gem gnu-utils heroku rake redis-cli zsh-syntax-highlighting history-substring-search)
+  plugins=(vi-mode git rvm ruby rails autojump bundler gem gnu-utils heroku rake redis-cli zsh-syntax-highlighting history-substring-search ssh-agent)
 
   # source every zsh file in user's custom/zsh/before. This is useful for setting theme and plugins.
-  if [[ -d $yadr/custom/zsh/ ]]; then
-    for config_file ($yadr/custom/zsh/**/*.before.zsh) source $config_file
+  if [[ -d $yadr/custom/zsh/before ]]; then
+    for config_file ($yadr/custom/zsh/before/*) source $config_file
   fi
 
   # Source oh-my-zsh
@@ -55,8 +55,8 @@ fi
 # zsh/after
 # ==================
 # source every zsh file in user's custom/zsh/after.
-if [[ -d $yadr/custom/zsh/ ]]; then
-  for config_file ($yadr/custom/zsh/**/*.after.zsh) source $config_file
+if [[ -d $yadr/custom/zsh/after ]]; then
+  for config_file ($yadr/custom/zsh/after/*) source $config_file
 fi
 
 # Put secret configuration settings in ~/.secrets