diff --git a/.gitmodules b/.gitmodules
index 2488838..ce7f74d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -86,16 +86,16 @@
 	path = .vim/bundle/vim-indent-guides
 	url = https://github.com/nathanaelkane/vim-indent-guides.git
 [submodule ".vim/bundle/YouCompleteMe"]
-	path = .vim/bundle/YouCompleteMe
+	path = .vim/bundle_extra/YouCompleteMe
 	url = https://github.com/Valloric/YouCompleteMe.git
 [submodule ".vim/bundle/tern_for_vim"]
-	path = .vim/bundle/tern_for_vim
+	path = .vim/bundle_extra/tern_for_vim
 	url = https://github.com/marijnh/tern_for_vim
 [submodule ".vim/bundle/vim-jdaddy"]
 	path = .vim/bundle/vim-jdaddy
 	url = https://github.com/tpope/vim-jdaddy.git
 [submodule ".vim/bundle/ale"]
-	path = .vim/bundle/ale
+	path = .vim/bundle_extra/ale
 	url = https://github.com/w0rp/ale.git
 [submodule ".vim/bundle/vim-rooter"]
 	path = .vim/bundle/vim-rooter
@@ -107,8 +107,8 @@
 	path = .vim/bundle/vim-signify
 	url = https://github.com/mhinz/vim-signify.git
 [submodule ".vim/bundle/fzf"]
-	path = .vim/bundle/fzf
+	path = .vim/bundle_extra/fzf
 	url = https://github.com/junegunn/fzf
 [submodule ".vim/bundle/fzf.vim"]
-	path = .vim/bundle/fzf.vim
+	path = .vim/bundle_extra/fzf.vim
 	url = https://github.com/junegunn/fzf.vim.git
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle_extra/YouCompleteMe
similarity index 100%
rename from .vim/bundle/YouCompleteMe
rename to .vim/bundle_extra/YouCompleteMe
diff --git a/.vim/bundle/ale b/.vim/bundle_extra/ale
similarity index 100%
rename from .vim/bundle/ale
rename to .vim/bundle_extra/ale
diff --git a/.vim/bundle/fzf b/.vim/bundle_extra/fzf
similarity index 100%
rename from .vim/bundle/fzf
rename to .vim/bundle_extra/fzf
diff --git a/.vim/bundle/fzf.vim b/.vim/bundle_extra/fzf.vim
similarity index 100%
rename from .vim/bundle/fzf.vim
rename to .vim/bundle_extra/fzf.vim
diff --git a/.vim/bundle/tern_for_vim b/.vim/bundle_extra/tern_for_vim
similarity index 100%
rename from .vim/bundle/tern_for_vim
rename to .vim/bundle_extra/tern_for_vim
diff --git a/.vim/plugins.vim b/.vim/plugins.vim
index 8b27fb8..a335a9c 100644
--- a/.vim/plugins.vim
+++ b/.vim/plugins.vim
@@ -1,6 +1,10 @@
 " vim-pathogen
 runtime bundle/vim-pathogen/autoload/pathogen.vim
-execute pathogen#infect()
+if has('unix')
+    execute pathogen#infect('bundle/{}', 'bundle_extra/{}')
+else
+    execute pathogen#infect('bundle/{}')
+endif
 
 " ale
 let g:ale_lint_on_text_changed = 'never'