diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index ade0780..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "vim/bundle/syntastic"]
- path = vim/bundle/syntastic
- url = https://github.com/vim-syntastic/syntastic.git
-[submodule "vim/bundle/supertab"]
- path = vim/bundle/supertab
- url = https://github.com/ervandew/supertab.git
-[submodule "vim/bundle/vim-unimpaired"]
- path = vim/bundle/vim-unimpaired
- url = https://github.com/tpope/vim-unimpaired
-[submodule "vim/pack/themes/opt/solarized8"]
- path = vim/pack/themes/opt/solarized8
- url = https://github.com/lifepillar/vim-solarized8.git
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
deleted file mode 100644
index 3582fbf..0000000
--- a/vim/autoload/pathogen.vim
+++ /dev/null
@@ -1,264 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer: Tim Pope
-" Version: 2.4
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.
-
-if exists("g:loaded_pathogen") || &cp
- finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage. Give a relative path to invoke
-" pathogen#interpose() or an absolute path to invoke pathogen#surround().
-" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all
-" subdirectories inside "bundle" inside all directories in the runtime path.
-" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}"
-" on versions of Vim without native package support.
-function! pathogen#infect(...) abort
- if a:0
- let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")')
- else
- let paths = ['bundle/{}', 'pack/{}/start/{}']
- endif
- if has('packages')
- call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"')
- endif
- let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$'
- for path in filter(copy(paths), 'v:val =~# static')
- call pathogen#surround(path)
- endfor
- for path in filter(copy(paths), 'v:val !~# static')
- if path =~# '^\%([$~\\/]\|\w:[\\/]\)'
- call pathogen#surround(path)
- else
- call pathogen#interpose(path)
- endif
- endfor
- call pathogen#cycle_filetype()
- if pathogen#is_disabled($MYVIMRC)
- return 'finish'
- endif
- return ''
-endfunction
-
-" Split a path into a list.
-function! pathogen#split(path) abort
- if type(a:path) == type([]) | return a:path | endif
- if empty(a:path) | return [] | endif
- let split = split(a:path,'\\\@]','\\&','')
- endif
-endfunction
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort
- let rtp = pathogen#join(1,pathogen#split(&rtp))
- let file = findfile(a:file,rtp,a:count)
- if file ==# ''
- return ''
- else
- return fnamemodify(file,':p')
- endif
-endfunction
-
-" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/vim/bundle/supertab b/vim/bundle/supertab
deleted file mode 160000
index 22aac5c..0000000
--- a/vim/bundle/supertab
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 22aac5c2cb6a8ebe906bf1495eb727717390e62e
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
deleted file mode 160000
index b0e48d0..0000000
--- a/vim/bundle/syntastic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0e48d0f66ef173cb70f83af927ba707b9d50fce
diff --git a/vim/pack/themes/opt/solarized8 b/vim/pack/plugins/opt/vim-solarized8
similarity index 100%
rename from vim/pack/themes/opt/solarized8
rename to vim/pack/plugins/opt/vim-solarized8
diff --git a/vim/pack/plugins/start/supertab b/vim/pack/plugins/start/supertab
new file mode 160000
index 0000000..40fe711
--- /dev/null
+++ b/vim/pack/plugins/start/supertab
@@ -0,0 +1 @@
+Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172
diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic
new file mode 160000
index 0000000..0293b00
--- /dev/null
+++ b/vim/pack/plugins/start/syntastic
@@ -0,0 +1 @@
+Subproject commit 0293b001763113d0cd7d5c8606835bd81624d9f7
diff --git a/vim/bundle/vim-unimpaired b/vim/pack/plugins/start/vim-unimpaired
similarity index 100%
rename from vim/bundle/vim-unimpaired
rename to vim/pack/plugins/start/vim-unimpaired
diff --git a/vimrc b/vimrc
index 75968be..d73bda6 100644
--- a/vimrc
+++ b/vimrc
@@ -3,10 +3,6 @@ let &t_8f = "\[38;2;%lu;%lu;%lum"
let &t_8b = "\[48;2;%lu;%lu;%lum"
-""" Start vim.plug
-execute pathogen#infect()
-
-
""" Syntastic
" Recommended settings
set statusline+=%#warning#