diff --git a/custom/zsh/README.markdown b/custom/zsh.sample/README.markdown
similarity index 100%
rename from custom/zsh/README.markdown
rename to custom/zsh.sample/README.markdown
diff --git a/custom/zsh/after.sample/sample.zsh b/custom/zsh.sample/after.sample.zsh
similarity index 100%
rename from custom/zsh/after.sample/sample.zsh
rename to custom/zsh.sample/after.sample.zsh
diff --git a/custom/zsh/before.sample/sample.zsh b/custom/zsh.sample/before.sample.zsh
similarity index 100%
rename from custom/zsh/before.sample/sample.zsh
rename to custom/zsh.sample/before.sample.zsh
diff --git a/zsh/zshrc b/zsh/zshrc
index 1666837..2afbe7d 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -21,8 +21,8 @@ if [[ -d $HOME/.oh-my-zsh ]]; then
   plugins=(brew git github ruby)
 
   # source every zsh file in user's custom/zsh/before. This is useful for setting theme and plugins.
-  if [[ -d $yadr/custom/zsh/before/ ]]; then
-    for config_file ($yadr/custom/zsh/before/**/*.zsh) source $config_file
+  if [[ -d $yadr/custom/zsh/ ]]; then
+    for config_file ($yadr/custom/zsh/**/*.before.zsh) source $config_file
   fi
 
   # Source oh-my-zsh
@@ -54,8 +54,8 @@ fi
 # zsh/after
 # ==================
 # source every zsh file in user's custom/zsh/after.
-if [[ -d $yadr/custom/zsh/after/ ]]; then
-  for config_file ($yadr/custom/zsh/after/**/*.zsh) source $config_file
+if [[ -d $yadr/custom/zsh/ ]]; then
+  for config_file ($yadr/custom/zsh/**/*.after.zsh) source $config_file
 fi
 
 # Put secret configuration settings in ~/.secrets