26d97a9355d37c55e0b044d8dafc425cc0ca7217

 1diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
 2index c46aea7ac77eb63f7c59ba2c94083f5d56161a5d..848e48eb5e7002391a4a352c8bd7828a09023998 100644
 3--- a/oh-my-zsh.sh
 4+++ b/oh-my-zsh.sh
 5@@ -12,7 +12,7 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
 6 
 7 # Load all of the plugins that were defined in ~/.zshrc
 8 plugin=${plugin:=()}
 9-for plugin ($plugins) source $ZSH/plugins/$plugin.plugin.zsh
10+for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
11 
12 # Check for updates on initial load...
13 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
14diff --git a/plugins/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
15rename from plugins/brew.plugin.zsh
16rename to plugins/brew/brew.plugin.zsh
17diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
18rename from plugins/dirpersist.plugin.zsh
19rename to plugins/dirpersist/dirpersist.plugin.zsh
20diff --git a/plugins/git.plugin.zsh b/plugins/git/git.plugin.zsh
21rename from plugins/git.plugin.zsh
22rename to plugins/git/git.plugin.zsh
23diff --git a/plugins/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
24rename from plugins/lighthouse.plugin.zsh
25rename to plugins/lighthouse/lighthouse.plugin.zsh
26diff --git a/plugins/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
27rename from plugins/macports.plugin.zsh
28rename to plugins/macports/macports.plugin.zsh
29diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql/mysql-macports.plugin.zsh
30rename from plugins/mysql-macports.plugin.zsh
31rename to plugins/mysql/mysql-macports.plugin.zsh
32diff --git a/plugins/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
33rename from plugins/osx.plugin.zsh
34rename to plugins/osx/osx.plugin.zsh
35diff --git a/plugins/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
36rename from plugins/rails.plugin.zsh
37rename to plugins/rails/rails.plugin.zsh
38diff --git a/plugins/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
39rename from plugins/ruby.plugin.zsh
40rename to plugins/ruby/ruby.plugin.zsh
41diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
42rename from plugins/ssh-agent.plugin.zsh
43rename to plugins/ssh-agent/ssh-agent.plugin.zsh
44diff --git a/plugins/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
45rename from plugins/textmate.plugin.zsh
46rename to plugins/textmate/textmate.plugin.zsh
47diff --git a/plugins/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
48rename from plugins/vi-mode.plugin.zsh
49rename to plugins/vi-mode/vi-mode.plugin.zsh