diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c46aea7..848e48e 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -12,7 +12,7 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
 
 # Load all of the plugins that were defined in ~/.zshrc
 plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin.plugin.zsh
+for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
diff --git a/plugins/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
similarity index 100%
rename from plugins/brew.plugin.zsh
rename to plugins/brew/brew.plugin.zsh
diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
similarity index 100%
rename from plugins/dirpersist.plugin.zsh
rename to plugins/dirpersist/dirpersist.plugin.zsh
diff --git a/plugins/git.plugin.zsh b/plugins/git/git.plugin.zsh
similarity index 100%
rename from plugins/git.plugin.zsh
rename to plugins/git/git.plugin.zsh
diff --git a/plugins/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
similarity index 100%
rename from plugins/lighthouse.plugin.zsh
rename to plugins/lighthouse/lighthouse.plugin.zsh
diff --git a/plugins/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
similarity index 100%
rename from plugins/macports.plugin.zsh
rename to plugins/macports/macports.plugin.zsh
diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql/mysql-macports.plugin.zsh
similarity index 100%
rename from plugins/mysql-macports.plugin.zsh
rename to plugins/mysql/mysql-macports.plugin.zsh
diff --git a/plugins/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
similarity index 100%
rename from plugins/osx.plugin.zsh
rename to plugins/osx/osx.plugin.zsh
diff --git a/plugins/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
similarity index 100%
rename from plugins/rails.plugin.zsh
rename to plugins/rails/rails.plugin.zsh
diff --git a/plugins/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
similarity index 100%
rename from plugins/ruby.plugin.zsh
rename to plugins/ruby/ruby.plugin.zsh
diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
similarity index 100%
rename from plugins/ssh-agent.plugin.zsh
rename to plugins/ssh-agent/ssh-agent.plugin.zsh
diff --git a/plugins/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
similarity index 100%
rename from plugins/textmate.plugin.zsh
rename to plugins/textmate/textmate.plugin.zsh
diff --git a/plugins/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
similarity index 100%
rename from plugins/vi-mode.plugin.zsh
rename to plugins/vi-mode/vi-mode.plugin.zsh