diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3a6e1af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+vim/bundle
+vim/
diff --git a/vim/.vim/bundle/Align b/.vim/bundle/Align
similarity index 100%
rename from vim/.vim/bundle/Align
rename to .vim/bundle/Align
diff --git a/vim/.vim/bundle/Gundo b/.vim/bundle/Gundo
similarity index 100%
rename from vim/.vim/bundle/Gundo
rename to .vim/bundle/Gundo
diff --git a/vim/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim
similarity index 100%
rename from vim/.vim/bundle/ctrlp.vim
rename to .vim/bundle/ctrlp.vim
diff --git a/vim/.vim/bundle/ghcmod-vim b/.vim/bundle/ghcmod-vim
similarity index 100%
rename from vim/.vim/bundle/ghcmod-vim
rename to .vim/bundle/ghcmod-vim
diff --git a/vim/.vim/bundle/gitignore b/.vim/bundle/gitignore
similarity index 100%
rename from vim/.vim/bundle/gitignore
rename to .vim/bundle/gitignore
diff --git a/vim/.vim/bundle/haskell-vim b/.vim/bundle/haskell-vim
similarity index 100%
rename from vim/.vim/bundle/haskell-vim
rename to .vim/bundle/haskell-vim
diff --git a/vim/.vim/bundle/neco-ghc b/.vim/bundle/neco-ghc
similarity index 100%
rename from vim/.vim/bundle/neco-ghc
rename to .vim/bundle/neco-ghc
diff --git a/vim/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
similarity index 100%
rename from vim/.vim/bundle/nerdtree
rename to .vim/bundle/nerdtree
diff --git a/vim/.vim/bundle/supertab b/.vim/bundle/supertab
similarity index 100%
rename from vim/.vim/bundle/supertab
rename to .vim/bundle/supertab
diff --git a/vim/.vim/bundle/syntastic b/.vim/bundle/syntastic
similarity index 100%
rename from vim/.vim/bundle/syntastic
rename to .vim/bundle/syntastic
diff --git a/vim/.vim/bundle/tabular b/.vim/bundle/tabular
similarity index 100%
rename from vim/.vim/bundle/tabular
rename to .vim/bundle/tabular
diff --git a/vim/.vim/bundle/tagbar b/.vim/bundle/tagbar
similarity index 100%
rename from vim/.vim/bundle/tagbar
rename to .vim/bundle/tagbar
diff --git a/vim/.vim/bundle/tslime.vim b/.vim/bundle/tslime.vim
similarity index 100%
rename from vim/.vim/bundle/tslime.vim
rename to .vim/bundle/tslime.vim
diff --git a/vim/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
similarity index 100%
rename from vim/.vim/bundle/vim-airline
rename to .vim/bundle/vim-airline
diff --git a/vim/.vim/bundle/vim-bbye b/.vim/bundle/vim-bbye
similarity index 100%
rename from vim/.vim/bundle/vim-bbye
rename to .vim/bundle/vim-bbye
diff --git a/vim/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary
similarity index 100%
rename from vim/.vim/bundle/vim-commentary
rename to .vim/bundle/vim-commentary
diff --git a/vim/.vim/bundle/vim-extradite b/.vim/bundle/vim-extradite
similarity index 100%
rename from vim/.vim/bundle/vim-extradite
rename to .vim/bundle/vim-extradite
diff --git a/vim/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
similarity index 100%
rename from vim/.vim/bundle/vim-fugitive
rename to .vim/bundle/vim-fugitive
diff --git a/vim/.vim/bundle/vim-haskellConcealPlus b/.vim/bundle/vim-haskellConcealPlus
similarity index 100%
rename from vim/.vim/bundle/vim-haskellConcealPlus
rename to .vim/bundle/vim-haskellConcealPlus
diff --git a/vim/.vim/bundle/vim-hoogle b/.vim/bundle/vim-hoogle
similarity index 100%
rename from vim/.vim/bundle/vim-hoogle
rename to .vim/bundle/vim-hoogle
diff --git a/vim/.vim/bundle/vim-indent-guides b/.vim/bundle/vim-indent-guides
similarity index 100%
rename from vim/.vim/bundle/vim-indent-guides
rename to .vim/bundle/vim-indent-guides
diff --git a/vim/.vim/bundle/vim-indent-object b/.vim/bundle/vim-indent-object
similarity index 100%
rename from vim/.vim/bundle/vim-indent-object
rename to .vim/bundle/vim-indent-object
diff --git a/vim/.vim/bundle/vim-tmux-navigator b/.vim/bundle/vim-tmux-navigator
similarity index 100%
rename from vim/.vim/bundle/vim-tmux-navigator
rename to .vim/bundle/vim-tmux-navigator
diff --git a/vim/.vim/bundle/vimproc.vim b/.vim/bundle/vimproc.vim
similarity index 100%
rename from vim/.vim/bundle/vimproc.vim
rename to .vim/bundle/vimproc.vim
diff --git a/vim/.vim/bundle/vundle b/.vim/bundle/vundle
similarity index 100%
rename from vim/.vim/bundle/vundle
rename to .vim/bundle/vundle
diff --git a/vim/.vim/bundle/wombat256.vim b/.vim/bundle/wombat256.vim
similarity index 100%
rename from vim/.vim/bundle/wombat256.vim
rename to .vim/bundle/wombat256.vim
diff --git a/vim/.vim/ftdetect/zepto.vim b/.vim/ftdetect/zepto.vim
similarity index 100%
rename from vim/.vim/ftdetect/zepto.vim
rename to .vim/ftdetect/zepto.vim
diff --git a/vim/.vim/syntax/zepto.vim b/.vim/syntax/zepto.vim
similarity index 100%
rename from vim/.vim/syntax/zepto.vim
rename to .vim/syntax/zepto.vim
diff --git a/vim/.vim/zepto.vim b/.vim/zepto.vim
similarity index 100%
rename from vim/.vim/zepto.vim
rename to .vim/zepto.vim
diff --git a/Makefile b/Makefile
index 99f35b9..37f0fcf 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ valgrind:
 
 vim:
 	cp vimrc ~/.vimrc.local
-	cp -r vim ~/.vim
+	cp -r .vim ~/.vim
 
 zsh:
 	cp zshrc ~/.zshrc
diff --git a/vim/bundle/Align b/vim/bundle/Align
deleted file mode 160000
index 787662f..0000000
--- a/vim/bundle/Align
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 787662fe90cd057942bc5b682fd70c87e1a9dd77
diff --git a/vim/bundle/Gundo b/vim/bundle/Gundo
deleted file mode 160000
index f443470..0000000
--- a/vim/bundle/Gundo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f443470b96364c24a775629418a6b2562ec9173e
diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim
deleted file mode 160000
index b5d3fe6..0000000
--- a/vim/bundle/ctrlp.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
diff --git a/vim/bundle/ghcmod-vim b/vim/bundle/ghcmod-vim
deleted file mode 160000
index 7e5f610..0000000
--- a/vim/bundle/ghcmod-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7e5f6102aa709244f5d4cedec807eac4b901c4cb
diff --git a/vim/bundle/gitignore b/vim/bundle/gitignore
deleted file mode 160000
index 061c5c7..0000000
--- a/vim/bundle/gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 061c5c756713f42b92b6b69b0a081075319a60d0
diff --git a/vim/bundle/haskell-vim b/vim/bundle/haskell-vim
deleted file mode 160000
index 890395d..0000000
--- a/vim/bundle/haskell-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 890395d5f5dc32d4cb76d00a2bd3b496e3d5e9c7
diff --git a/vim/bundle/neco-ghc b/vim/bundle/neco-ghc
deleted file mode 160000
index 7d2c360..0000000
--- a/vim/bundle/neco-ghc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7d2c360736679064986925873b8d1e2b1978d9f8
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
deleted file mode 160000
index 3b98a7f..0000000
--- a/vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3b98a7fcae8f9fff356907171f0406ff8cd28921
diff --git a/vim/bundle/supertab b/vim/bundle/supertab
deleted file mode 160000
index c8bfece..0000000
--- a/vim/bundle/supertab
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
deleted file mode 160000
index 710a854..0000000
--- a/vim/bundle/syntastic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 710a854f6a6832004b225c25d5c076bb537fd589
diff --git a/vim/bundle/tabular b/vim/bundle/tabular
deleted file mode 160000
index 60f2564..0000000
--- a/vim/bundle/tabular
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 60f25648814f0695eeb6c1040d97adca93c4e0bb
diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar
deleted file mode 160000
index c6b473f..0000000
--- a/vim/bundle/tagbar
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6b473f5593a1cb9e567bb1a9a897f196f1f720a
diff --git a/vim/bundle/tslime.vim b/vim/bundle/tslime.vim
deleted file mode 160000
index 71ec1cb..0000000
--- a/vim/bundle/tslime.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
deleted file mode 160000
index f45ecda..0000000
--- a/vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f45ecdac15d99ed2354873a8b4d40432fd0a85a3
diff --git a/vim/bundle/vim-bbye b/vim/bundle/vim-bbye
deleted file mode 160000
index a018cbc..0000000
--- a/vim/bundle/vim-bbye
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a018cbc1ba63b1a8b86b7c468645e7642637ec4a
diff --git a/vim/bundle/vim-commentary b/vim/bundle/vim-commentary
deleted file mode 160000
index 9c68513..0000000
--- a/vim/bundle/vim-commentary
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9c685131a5facfa0d643feca3a61b41c007d8170
diff --git a/vim/bundle/vim-extradite b/vim/bundle/vim-extradite
deleted file mode 160000
index a1dc4b6..0000000
--- a/vim/bundle/vim-extradite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a1dc4b63befd5032e65a0c94e7257d4636aa6a3f
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
deleted file mode 160000
index 4cc201c..0000000
--- a/vim/bundle/vim-fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c
diff --git a/vim/bundle/vim-haskellConcealPlus b/vim/bundle/vim-haskellConcealPlus
deleted file mode 160000
index 9c12f6d..0000000
--- a/vim/bundle/vim-haskellConcealPlus
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9c12f6d816fc73e1262683a5293daee79790623a
diff --git a/vim/bundle/vim-hoogle b/vim/bundle/vim-hoogle
deleted file mode 160000
index 81f2831..0000000
--- a/vim/bundle/vim-hoogle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81f28318b0d4174984c33df99db7752891c5c4e9
diff --git a/vim/bundle/vim-indent-guides b/vim/bundle/vim-indent-guides
deleted file mode 160000
index 184e558..0000000
--- a/vim/bundle/vim-indent-guides
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 184e55848de2304cabc5c03d2afe9b8fd098c58c
diff --git a/vim/bundle/vim-indent-object b/vim/bundle/vim-indent-object
deleted file mode 160000
index 78fffa6..0000000
--- a/vim/bundle/vim-indent-object
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e
diff --git a/vim/bundle/vim-tmux-navigator b/vim/bundle/vim-tmux-navigator
deleted file mode 160000
index 928a52f..0000000
--- a/vim/bundle/vim-tmux-navigator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 928a52fbda90ec70b2eb6edaf570654df4521af0
diff --git a/vim/bundle/vimproc.vim b/vim/bundle/vimproc.vim
deleted file mode 160000
index 0f68bcd..0000000
--- a/vim/bundle/vimproc.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f68bcd93399ecbcde3eaa4efd09107314c9bdee
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
deleted file mode 160000
index cfd3b2d..0000000
--- a/vim/bundle/vundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933
diff --git a/vim/bundle/wombat256.vim b/vim/bundle/wombat256.vim
deleted file mode 160000
index 8734ba4..0000000
--- a/vim/bundle/wombat256.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8734ba45dcf5e38c4d2686b35c94f9fcb30427e2
diff --git a/zshrc b/zshrc
index b7b08dd..22daf28 100644
--- a/zshrc
+++ b/zshrc
@@ -202,19 +202,19 @@ pinfo(){
 
 save_dotfiles(){
     local DOTPATH=~/Documents/Code/Github/.dotfiles/
-    cp ~/.bash_profile ${DOTPATH}bash_profile
-    cp -r ~/.cabal/config ${DOTPATH}cabal/config
-    cp -r ~/.scripts ${DOTPATH}
+    cp -r ~/.cabal/config ${DOTPATH}cabal/
     cp -r ~/.emacs.d ${DOTPATH}
+    cp -r ~/.scripts ${DOTPATH}
+    cp -r ~/.vim ${DOTPATH}
+    cp ~/.bash_profile ${DOTPATH}bash_profile
     cp ~/.ghci ${DOTPATH}ghci
-    cp ~/.gitignore ${DOTPATH}gitignore
     cp ~/.gitconfig ${DOTPATH}gitconfig
+    cp ~/.gitignore ${DOTPATH}gitignore
+    cp ~/.inputrc ${DOTPATH}inputrc
     cp ~/.pip-upgrade ${DOTPATH}pip-upgrade
     cp ~/.pythonrc ${DOTPATH}pythonrc
-    cp ~/.inputrc ${DOTPATH}inputrc
     cp ~/.tmux.conf ${DOTPATH}tmux.conf
     cp ~/.valgrindrc ${DOTPATH}valgrindrc
-    cp -r ~/.vim ${DOTPATH}vim
     cp ~/.vimrc ${DOTPATH}vimrc
     cp ~/.zshrc ${DOTPATH}zshrc
 }