diff --git a/.gitmodules b/.gitmodules
index 58a286e..6d450d7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,39 +1,36 @@
-[submodule "vim/pathogen"]
-	path = vim/.vim/pathogen
-	url = https://github.com/tpope/vim-pathogen
 [submodule "vim/bundle/molokai"]
-	path = vim/.vim/bundle/molokai
+	path = vim/.vim/pack/bundle/start/molokai
 	url = https://github.com/tomasr/molokai
 [submodule "vim/bundle/vim-less"]
-	path = vim/.vim/bundle/vim-less
+	path = vim/.vim/pack/bundle/start/vim-less
 	url = https://github.com/lunaru/vim-less
 [submodule "vim/bundle/syntastic"]
-	path = vim/.vim/bundle/syntastic
+	path = vim/.vim/pack/bundle/start/syntastic
 	url = https://github.com/scrooloose/syntastic.git
 [submodule "vim/bundle/vim-javascript"]
-	path = vim/.vim/bundle/vim-javascript
+	path = vim/.vim/pack/bundle/start/vim-javascript
 	url = https://github.com/pangloss/vim-javascript
 [submodule "vim/bundle/vim-vimlint"]
-	path = vim/.vim/bundle/vim-vimlint
+	path = vim/.vim/pack/bundle/start/vim-vimlint
 	url = https://github.com/syngan/vim-vimlint
 [submodule "vim/bundle/vim-vimlparser"]
-	path = vim/.vim/bundle/vim-vimlparser
+	path = vim/.vim/pack/bundle/start/vim-vimlparser
 	url = https://github.com/ynkdir/vim-vimlparser
 [submodule "vim/bundle/vim-latex"]
-	path = vim/.vim/bundle/vim-latex
+	path = vim/.vim/pack/bundle/start/vim-latex
 	url = https://github.com/lervag/vim-latex.git
 [submodule "vim/bundle/shebang"]
-	path = vim/.vim/bundle/shebang
+	path = vim/.vim/pack/bundle/start/shebang
 	url = https://github.com/vim-scripts/Shebang
 [submodule "vim/bundle/indentLine"]
-	path = vim/.vim/bundle/indentLine
+	path = vim/.vim/pack/bundle/start/indentLine
 	url = https://github.com/Yggdroot/indentLine
 [submodule "vim/.vim/bundle/rust.vim"]
-	path = vim/.vim/bundle/rust.vim
+	path = vim/.vim/pack/bundle/start/rust.vim
 	url = https://github.com/rust-lang/rust.vim.git
 [submodule "vim/.vim/bundle/editorconfig-vim"]
-	path = vim/.vim/bundle/editorconfig-vim
+	path = vim/.vim/pack/bundle/start/editorconfig-vim
 	url = https://github.com/editorconfig/editorconfig-vim
 [submodule "vim/.vim/bundle/vim-fugitive"]
-	path = vim/.vim/bundle/vim-fugitive
+	path = vim/.vim/pack/bundle/start/vim-fugitive
 	url = https://github.com/tpope/vim-fugitive.git
diff --git a/vim/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim
deleted file mode 120000
index a47dcdf..0000000
--- a/vim/.vim/autoload/pathogen.vim
+++ /dev/null
@@ -1 +0,0 @@
-../pathogen/autoload/pathogen.vim
\ No newline at end of file
diff --git a/vim/.vim/bundle/editorconfig-vim b/vim/.vim/pack/bundle/start/editorconfig-vim
similarity index 100%
rename from vim/.vim/bundle/editorconfig-vim
rename to vim/.vim/pack/bundle/start/editorconfig-vim
diff --git a/vim/.vim/bundle/indentLine b/vim/.vim/pack/bundle/start/indentLine
similarity index 100%
rename from vim/.vim/bundle/indentLine
rename to vim/.vim/pack/bundle/start/indentLine
diff --git a/vim/.vim/bundle/molokai b/vim/.vim/pack/bundle/start/molokai
similarity index 100%
rename from vim/.vim/bundle/molokai
rename to vim/.vim/pack/bundle/start/molokai
diff --git a/vim/.vim/bundle/rust.vim b/vim/.vim/pack/bundle/start/rust.vim
similarity index 100%
rename from vim/.vim/bundle/rust.vim
rename to vim/.vim/pack/bundle/start/rust.vim
diff --git a/vim/.vim/bundle/shebang b/vim/.vim/pack/bundle/start/shebang
similarity index 100%
rename from vim/.vim/bundle/shebang
rename to vim/.vim/pack/bundle/start/shebang
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/pack/bundle/start/syntastic
similarity index 100%
rename from vim/.vim/bundle/syntastic
rename to vim/.vim/pack/bundle/start/syntastic
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/pack/bundle/start/vim-fugitive
similarity index 100%
rename from vim/.vim/bundle/vim-fugitive
rename to vim/.vim/pack/bundle/start/vim-fugitive
diff --git a/vim/.vim/bundle/vim-javascript b/vim/.vim/pack/bundle/start/vim-javascript
similarity index 100%
rename from vim/.vim/bundle/vim-javascript
rename to vim/.vim/pack/bundle/start/vim-javascript
diff --git a/vim/.vim/bundle/vim-latex b/vim/.vim/pack/bundle/start/vim-latex
similarity index 100%
rename from vim/.vim/bundle/vim-latex
rename to vim/.vim/pack/bundle/start/vim-latex
diff --git a/vim/.vim/bundle/vim-less b/vim/.vim/pack/bundle/start/vim-less
similarity index 100%
rename from vim/.vim/bundle/vim-less
rename to vim/.vim/pack/bundle/start/vim-less
diff --git a/vim/.vim/bundle/vim-vimlint b/vim/.vim/pack/bundle/start/vim-vimlint
similarity index 100%
rename from vim/.vim/bundle/vim-vimlint
rename to vim/.vim/pack/bundle/start/vim-vimlint
diff --git a/vim/.vim/bundle/vim-vimlparser b/vim/.vim/pack/bundle/start/vim-vimlparser
similarity index 100%
rename from vim/.vim/bundle/vim-vimlparser
rename to vim/.vim/pack/bundle/start/vim-vimlparser
diff --git a/vim/.vim/pathogen b/vim/.vim/pathogen
deleted file mode 160000
index a553410..0000000
--- a/vim/.vim/pathogen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a553410f1bdb9000fbc764069f3a5ec3454a02bc
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index 02f937f..2a730be 100644
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -1,5 +1,3 @@
-execute pathogen#infect()
-
 scriptencoding utf-8
 
 filetype plugin indent on