diff --git a/.gitmodules b/.gitmodules
index df576f8..b234416 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,54 +1,54 @@
 [submodule ".vim/bundle/Gundo"]
-	path = .vim/bundle/Gundo
+	path = .oldvim/vim/bundle/Gundo
 	url = https://github.com/vim-scripts/Gundo.git
 	ignore = dirty
 [submodule ".vim/bundle/ShowMarks"]
-	path = .vim/bundle/ShowMarks
+	path = .oldvim/vim/bundle/ShowMarks
 	url = https://github.com/vim-scripts/ShowMarks.git
 	ignore = dirty
 [submodule ".vim/bundle/vundle"]
-	path = .vim/bundle/vundle
+	path = .oldvim/vim/bundle/vundle
 	url = https://github.com/gmarik/vundle.git
 	ignore = dirty
 [submodule ".vim/bundle/Align"]
-	path = .vim/bundle/Align
+	path = .oldvim/vim/bundle/Align
 	url = https://github.com/vim-scripts/Align.git
 [submodule ".vim/bundle/vim-markdown"]
-	path = .vim/bundle/vim-markdown
+	path = .oldvim/vim/bundle/vim-markdown
 	url = https://github.com/tpope/vim-markdown.git
 [submodule ".vim/bundle/FuzzyFinder"]
-	path = .vim/bundle/FuzzyFinder
+	path = .oldvim/vim/bundle/FuzzyFinder
 	url = https://github.com/vim-scripts/FuzzyFinder.git
 [submodule ".vim/bundle/L9"]
-	path = .vim/bundle/L9
+	path = .oldvim/vim/bundle/L9
 	url = https://github.com/vim-scripts/L9.git
 [submodule ".vim/bundle/Tabular"]
-	path = .vim/bundle/Tabular
+	path = .oldvim/vim/bundle/Tabular
 	url = https://github.com/vim-scripts/Tabular.git
 [submodule ".vim/bundle/The-NERD-tree"]
-	path = .vim/bundle/The-NERD-tree
+	path = .oldvim/vim/bundle/The-NERD-tree
 	url = https://github.com/vim-scripts/The-NERD-tree.git
 [submodule ".vim/bundle/ctrlp.vim"]
-	path = .vim/bundle/ctrlp.vim
+	path = .oldvim/vim/bundle/ctrlp.vim
 	url = https://github.com/vim-scripts/ctrlp.vim.git
 [submodule ".vim/bundle/gnupg"]
-	path = .vim/bundle/gnupg
+	path = .oldvim/vim/bundle/gnupg
 	url = https://github.com/vim-scripts/gnupg.git
 [submodule ".vim/bundle/vim-puppet"]
-	path = .vim/bundle/vim-puppet
+	path = .oldvim/vim/bundle/vim-puppet
 	url = https://github.com/voxpupuli/vim-puppet.git
 [submodule ".vim/bundle/vim-plist"]
-	path = .vim/bundle/vim-plist
+	path = .oldvim/vim/bundle/vim-plist
 	url = https://github.com/hunner/vim-plist.git
 [submodule ".vim/bundle/vim-coffee-script"]
-	path = .vim/bundle/vim-coffee-script
+	path = .oldvim/vim/bundle/vim-coffee-script
 	url = https://github.com/vim-scripts/vim-coffee-script.git
 [submodule ".vim/bundle/syntastic"]
-	path = .vim/bundle/syntastic
+	path = .oldvim/vim/bundle/syntastic
 	url = https://github.com/scrooloose/syntastic.git
 [submodule ".vim/bundle/YouCompleteMe"]
-	path = .vim/bundle/YouCompleteMe
+	path = .oldvim/vim/bundle/YouCompleteMe
 	url = https://github.com/Valloric/YouCompleteMe.git
 [submodule ".vim/bundle/ag"]
-	path = .vim/bundle/ag
+	path = .oldvim/vim/bundle/ag
 	url = https://github.com/rking/ag.vim
diff --git a/.vim/backups/.gitignore b/.oldvim/vim/backups/.gitignore
similarity index 100%
rename from .vim/backups/.gitignore
rename to .oldvim/vim/backups/.gitignore
diff --git a/.vim/bundle/Align b/.oldvim/vim/bundle/Align
similarity index 100%
rename from .vim/bundle/Align
rename to .oldvim/vim/bundle/Align
diff --git a/.vim/bundle/FuzzyFinder b/.oldvim/vim/bundle/FuzzyFinder
similarity index 100%
rename from .vim/bundle/FuzzyFinder
rename to .oldvim/vim/bundle/FuzzyFinder
diff --git a/.vim/bundle/Gundo b/.oldvim/vim/bundle/Gundo
similarity index 100%
rename from .vim/bundle/Gundo
rename to .oldvim/vim/bundle/Gundo
diff --git a/.vim/bundle/L9 b/.oldvim/vim/bundle/L9
similarity index 100%
rename from .vim/bundle/L9
rename to .oldvim/vim/bundle/L9
diff --git a/.vim/bundle/ShowMarks b/.oldvim/vim/bundle/ShowMarks
similarity index 100%
rename from .vim/bundle/ShowMarks
rename to .oldvim/vim/bundle/ShowMarks
diff --git a/.vim/bundle/Tabular b/.oldvim/vim/bundle/Tabular
similarity index 100%
rename from .vim/bundle/Tabular
rename to .oldvim/vim/bundle/Tabular
diff --git a/.vim/bundle/The-NERD-tree b/.oldvim/vim/bundle/The-NERD-tree
similarity index 100%
rename from .vim/bundle/The-NERD-tree
rename to .oldvim/vim/bundle/The-NERD-tree
diff --git a/.vim/bundle/YouCompleteMe b/.oldvim/vim/bundle/YouCompleteMe
similarity index 100%
rename from .vim/bundle/YouCompleteMe
rename to .oldvim/vim/bundle/YouCompleteMe
diff --git a/.vim/bundle/ag b/.oldvim/vim/bundle/ag
similarity index 100%
rename from .vim/bundle/ag
rename to .oldvim/vim/bundle/ag
diff --git a/.vim/bundle/ctrlp.vim b/.oldvim/vim/bundle/ctrlp.vim
similarity index 100%
rename from .vim/bundle/ctrlp.vim
rename to .oldvim/vim/bundle/ctrlp.vim
diff --git a/.vim/bundle/gnupg b/.oldvim/vim/bundle/gnupg
similarity index 100%
rename from .vim/bundle/gnupg
rename to .oldvim/vim/bundle/gnupg
diff --git a/.vim/bundle/syntastic b/.oldvim/vim/bundle/syntastic
similarity index 100%
rename from .vim/bundle/syntastic
rename to .oldvim/vim/bundle/syntastic
diff --git a/.vim/bundle/vim-coffee-script b/.oldvim/vim/bundle/vim-coffee-script
similarity index 100%
rename from .vim/bundle/vim-coffee-script
rename to .oldvim/vim/bundle/vim-coffee-script
diff --git a/.vim/bundle/vim-markdown b/.oldvim/vim/bundle/vim-markdown
similarity index 100%
rename from .vim/bundle/vim-markdown
rename to .oldvim/vim/bundle/vim-markdown
diff --git a/.vim/bundle/vim-plist b/.oldvim/vim/bundle/vim-plist
similarity index 100%
rename from .vim/bundle/vim-plist
rename to .oldvim/vim/bundle/vim-plist
diff --git a/.vim/bundle/vim-puppet b/.oldvim/vim/bundle/vim-puppet
similarity index 100%
rename from .vim/bundle/vim-puppet
rename to .oldvim/vim/bundle/vim-puppet
diff --git a/.vim/bundle/vundle b/.oldvim/vim/bundle/vundle
similarity index 100%
rename from .vim/bundle/vundle
rename to .oldvim/vim/bundle/vundle
diff --git a/.vim/colors/inkpot.vim b/.oldvim/vim/colors/inkpot.vim
similarity index 100%
rename from .vim/colors/inkpot.vim
rename to .oldvim/vim/colors/inkpot.vim
diff --git a/.vim/colors/ir_black.vim b/.oldvim/vim/colors/ir_black.vim
similarity index 100%
rename from .vim/colors/ir_black.vim
rename to .oldvim/vim/colors/ir_black.vim
diff --git a/.vim/colors/relaxedgreen.vim b/.oldvim/vim/colors/relaxedgreen.vim
similarity index 100%
rename from .vim/colors/relaxedgreen.vim
rename to .oldvim/vim/colors/relaxedgreen.vim
diff --git a/.vim/colors/smyck.vim b/.oldvim/vim/colors/smyck.vim
similarity index 100%
rename from .vim/colors/smyck.vim
rename to .oldvim/vim/colors/smyck.vim
diff --git a/.vim/filetype.vim b/.oldvim/vim/filetype.vim
similarity index 100%
rename from .vim/filetype.vim
rename to .oldvim/vim/filetype.vim
diff --git a/.vim/init.vim b/.oldvim/vim/init.vim
similarity index 100%
rename from .vim/init.vim
rename to .oldvim/vim/init.vim
diff --git a/.vim/keymap/uniapl385_utf-8.vim b/.oldvim/vim/keymap/uniapl385_utf-8.vim
similarity index 100%
rename from .vim/keymap/uniapl385_utf-8.vim
rename to .oldvim/vim/keymap/uniapl385_utf-8.vim
diff --git a/.vim/spell/eo.utf-8.spl b/.oldvim/vim/spell/eo.utf-8.spl
similarity index 100%
rename from .vim/spell/eo.utf-8.spl
rename to .oldvim/vim/spell/eo.utf-8.spl
diff --git a/.vim/syntax/asmx86.vim b/.oldvim/vim/syntax/asmx86.vim
similarity index 100%
rename from .vim/syntax/asmx86.vim
rename to .oldvim/vim/syntax/asmx86.vim
diff --git a/.vim/syntax/haml.vim b/.oldvim/vim/syntax/haml.vim
similarity index 100%
rename from .vim/syntax/haml.vim
rename to .oldvim/vim/syntax/haml.vim
diff --git a/.vim/syntax/j.vim b/.oldvim/vim/syntax/j.vim
similarity index 100%
rename from .vim/syntax/j.vim
rename to .oldvim/vim/syntax/j.vim
diff --git a/.vim/syntax/jflex.vim b/.oldvim/vim/syntax/jflex.vim
similarity index 100%
rename from .vim/syntax/jflex.vim
rename to .oldvim/vim/syntax/jflex.vim
diff --git a/.vim/syntax/kpl.vim b/.oldvim/vim/syntax/kpl.vim
similarity index 100%
rename from .vim/syntax/kpl.vim
rename to .oldvim/vim/syntax/kpl.vim
diff --git a/.vim/syntax/lhaskell.vim b/.oldvim/vim/syntax/lhaskell.vim
similarity index 100%
rename from .vim/syntax/lhaskell.vim
rename to .oldvim/vim/syntax/lhaskell.vim
diff --git a/.vim/syntax/old/eruby.vim b/.oldvim/vim/syntax/old/eruby.vim
similarity index 100%
rename from .vim/syntax/old/eruby.vim
rename to .oldvim/vim/syntax/old/eruby.vim
diff --git a/.vim/syntax/old/rht.bak b/.oldvim/vim/syntax/old/rht.bak
similarity index 100%
rename from .vim/syntax/old/rht.bak
rename to .oldvim/vim/syntax/old/rht.bak
diff --git a/.vim/syntax/old/rhtml.vim b/.oldvim/vim/syntax/old/rhtml.vim
similarity index 100%
rename from .vim/syntax/old/rhtml.vim
rename to .oldvim/vim/syntax/old/rhtml.vim
diff --git a/.vim/syntax/old/rhtmlaoeu.vim b/.oldvim/vim/syntax/old/rhtmlaoeu.vim
similarity index 100%
rename from .vim/syntax/old/rhtmlaoeu.vim
rename to .oldvim/vim/syntax/old/rhtmlaoeu.vim
diff --git a/.vim/syntax/ragel.vim b/.oldvim/vim/syntax/ragel.vim
similarity index 100%
rename from .vim/syntax/ragel.vim
rename to .oldvim/vim/syntax/ragel.vim
diff --git a/.vim/syntax/tmux.vim b/.oldvim/vim/syntax/tmux.vim
similarity index 100%
rename from .vim/syntax/tmux.vim
rename to .oldvim/vim/syntax/tmux.vim
diff --git a/.vimrc b/.oldvim/vimrc
similarity index 100%
rename from .vimrc
rename to .oldvim/vimrc