diff --git a/.gitmodules b/.gitmodules
index 5423fc1..9530a71 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,46 +1,46 @@
-[submodule "vim/bundle/nerdtree"]
-	path = vim/bundle/nerdtree
+[submodule "vim/.vim/bundle/nerdtree"]
+	path = vim/.vim/bundle/nerdtree
 	url = git@github.com:scrooloose/nerdtree.git
-[submodule "vim/bundle/vim-tmux-navigator"]
-	path = vim/bundle/vim-tmux-navigator
+[submodule "vim/.vim/bundle/vim-tmux-navigator"]
+	path = vim/.vim/bundle/vim-tmux-navigator
 	url = git@github.com:christoomey/vim-tmux-navigator.git
-[submodule "vim/bundle/YouCompleteMe"]
-	path = vim/bundle/YouCompleteMe
+[submodule "vim/.vim/bundle/YouCompleteMe"]
+	path = vim/.vim/bundle/YouCompleteMe
 	url = git@github.com:Valloric/YouCompleteMe.git
   ignore = dirty
-[submodule "vim/bundle/tagbar"]
-	path = vim/bundle/tagbar
+[submodule "vim/.vim/bundle/tagbar"]
+	path = vim/.vim/bundle/tagbar
 	url = git@github.com:majutsushi/tagbar.git
-[submodule "vim/bundle/tcomment_vim"]
-	path = vim/bundle/tcomment_vim
+[submodule "vim/.vim/bundle/tcomment_vim"]
+	path = vim/.vim/bundle/tcomment_vim
 	url = git@github.com:tomtom/tcomment_vim.git
-[submodule "vim/bundle/vim-exchange"]
-	path = vim/bundle/vim-exchange
+[submodule "vim/.vim/bundle/vim-exchange"]
+	path = vim/.vim/bundle/vim-exchange
 	url = git@github.com:tommcdo/vim-exchange.git
-[submodule "vim/bundle/tabular"]
-	path = vim/bundle/tabular
+[submodule "vim/.vim/bundle/tabular"]
+	path = vim/.vim/bundle/tabular
 	url = git@github.com:godlygeek/tabular.git
-[submodule "vim/bundle/vim-surround"]
-	path = vim/bundle/vim-surround
+[submodule "vim/.vim/bundle/vim-surround"]
+	path = vim/.vim/bundle/vim-surround
 	url = git@github.com:tpope/vim-surround.git
-[submodule "vim/bundle/vim-airline"]
-	path = vim/bundle/vim-airline
+[submodule "vim/.vim/bundle/vim-airline"]
+	path = vim/.vim/bundle/vim-airline
 	url = git@github.com:bling/vim-airline.git
-[submodule "vim/bundle/gruvbox"]
-	path = vim/bundle/gruvbox
+[submodule "vim/.vim/bundle/gruvbox"]
+	path = vim/.vim/bundle/gruvbox
 	url = git@github.com:morhetz/gruvbox.git
-[submodule "vim/bundle/vim-matchparenalways"]
-	path = vim/bundle/vim-matchparenalways
+[submodule "vim/.vim/bundle/vim-matchparenalways"]
+	path = vim/.vim/bundle/vim-matchparenalways
 	url = git@github.com:justinmk/vim-matchparenalways.git
-[submodule "vim/bundle/vim-gradle"]
-	path = vim/bundle/vim-gradle
+[submodule "vim/.vim/bundle/vim-gradle"]
+	path = vim/.vim/bundle/vim-gradle
 	url = git@github.com:tfnico/vim-gradle.git
-[submodule "vim/bundle/indentLine"]
-	path = vim/bundle/indentLine
+[submodule "vim/.vim/bundle/indentLine"]
+	path = vim/.vim/bundle/indentLine
 	url = git@github.com:Yggdroot/indentLine.git
-[submodule "vim/bundle/delimitMate"]
-	path = vim/bundle/delimitMate
+[submodule "vim/.vim/bundle/delimitMate"]
+	path = vim/.vim/bundle/delimitMate
 	url = git@github.com:Raimondi/delimitMate.git
-[submodule "vim/bundle/ctrlp.vim"]
-	path = vim/bundle/ctrlp.vim
+[submodule "vim/.vim/bundle/ctrlp.vim"]
+	path = vim/.vim/bundle/ctrlp.vim
 	url = git@github.com:kien/ctrlp.vim.git
diff --git a/vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim
similarity index 100%
rename from vim/autoload/pathogen.vim
rename to vim/.vim/autoload/pathogen.vim
diff --git a/vim/plugin/html_autoclosetag.vim b/vim/.vim/plugin/html_autoclosetag.vim
similarity index 100%
rename from vim/plugin/html_autoclosetag.vim
rename to vim/.vim/plugin/html_autoclosetag.vim
diff --git a/vimc/.vimrc b/vim/.vimrc
similarity index 100%
rename from vimc/.vimrc
rename to vim/.vimrc
diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe
deleted file mode 160000
index 4436d51..0000000
--- a/vim/bundle/YouCompleteMe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4436d515d38e9e6d0859d5e96218beaaf36c884b
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/delimitMate b/vim/bundle/delimitMate
deleted file mode 160000
index 470c053..0000000
--- a/vim/bundle/delimitMate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 470c053a3ba673007a85237a1ac8415428fd8446
diff --git a/vim/bundle/gruvbox b/vim/bundle/gruvbox
deleted file mode 160000
index ca1e855..0000000
--- a/vim/bundle/gruvbox
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca1e855a8f7efb8b5f7b17d5a1ef656550615fd2
diff --git a/vim/bundle/indentLine b/vim/bundle/indentLine
deleted file mode 160000
index 547ceb5..0000000
--- a/vim/bundle/indentLine
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 547ceb5b04356b87653cb763810871fd51b33781
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/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 00dfa82..0000000
--- a/vim/bundle/tagbar
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 00dfa82b00e734b453153564efeec933c48087f0
diff --git a/vim/bundle/tcomment_vim b/vim/bundle/tcomment_vim
deleted file mode 160000
index 2a7fa3b..0000000
--- a/vim/bundle/tcomment_vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2a7fa3b98d7538017f2b2068b8c2661ef884de47
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
deleted file mode 160000
index 446397e..0000000
--- a/vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 446397e006d8cba9e1ac38d8c656ba39218c139b
diff --git a/vim/bundle/vim-exchange b/vim/bundle/vim-exchange
deleted file mode 160000
index 5cb2a37..0000000
--- a/vim/bundle/vim-exchange
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5cb2a3733a99ddb93863a10acd7b86aa9af490c5
diff --git a/vim/bundle/vim-gradle b/vim/bundle/vim-gradle
deleted file mode 160000
index e77153d..0000000
--- a/vim/bundle/vim-gradle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e77153d120d23e3dc659e4b2148e469696c11022
diff --git a/vim/bundle/vim-matchparenalways b/vim/bundle/vim-matchparenalways
deleted file mode 160000
index 44da6c6..0000000
--- a/vim/bundle/vim-matchparenalways
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 44da6c695b9e6767f562c2191784bad740a39030
diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround
deleted file mode 160000
index 6afb2d9..0000000
--- a/vim/bundle/vim-surround
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6afb2d90e3b3a637da093e1022ffaa232a2aeafd
diff --git a/vim/bundle/vim-tmux-navigator b/vim/bundle/vim-tmux-navigator
deleted file mode 160000
index 85b8e5f..0000000
--- a/vim/bundle/vim-tmux-navigator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 85b8e5f60c1690cde57dbb66467ce39cd1b63343
diff --git a/vimc/.vim b/vimc/.vim
deleted file mode 120000
index c99592a..0000000
--- a/vimc/.vim
+++ /dev/null
@@ -1 +0,0 @@
-../vim
\ No newline at end of file