diff --git a/.gitmodules b/.gitmodules
index be95b13..9e9c33e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,27 @@
 [submodule "bundle/fugitive"]
-	path = bundle/fugitive
+	path = vim/bundle/fugitive
 	url = https://github.com/tpope/vim-fugitive.git
 [submodule "bundle/nerdtree"]
-	path = bundle/nerdtree
+	path = vim/bundle/nerdtree
 	url = https://github.com/scrooloose/nerdtree.git
 [submodule "bundle/airline"]
-	path = bundle/airline
+	path = vim/bundle/airline
 	url = https://github.com/vim-airline/vim-airline
 [submodule "bundle/vim-colorschemes"]
-	path = bundle/colorschemes
+	path = vim/bundle/colorschemes
 	url = https://github.com/flazz/vim-colorschemes
 [submodule "bundle/vim-scala"]
-	path = bundle/vim-scala
+	path = vim/bundle/vim-scala
 	url = https://github.com/derekwyatt/vim-scala
 [submodule "bundle/vimwiki"]
-	path = bundle/vimwiki
+	path = vim/bundle/vimwiki
   url = https://github.com/vimwiki/vimwiki.git
 [submodule "bundle/vim-graphql"]
-	path = bundle/vim-graphql
+	path = vim/bundle/vim-graphql
 	url = https://github.com/jparise/vim-graphql
 [submodule "bundle/typescript-vim"]
-	path = bundle/typescript-vim
+	path = vim/bundle/typescript-vim
 	url = https://github.com/leafgarland/typescript-vim
 [submodule "bundle/vim-elixir"]
-	path = bundle/vim-elixir
+	path = vim/bundle/vim-elixir
 	url = https://github.com/elixir-lang/vim-elixir.git
diff --git a/vimrc b/vim/.vimrc
similarity index 100%
rename from vimrc
rename to vim/.vimrc
diff --git a/autoload/pathogen.vim b/vim/autoload/pathogen.vim
similarity index 100%
rename from autoload/pathogen.vim
rename to vim/autoload/pathogen.vim
diff --git a/bundle/airline b/vim/bundle/airline
similarity index 100%
rename from bundle/airline
rename to vim/bundle/airline
diff --git a/bundle/colorschemes b/vim/bundle/colorschemes
similarity index 100%
rename from bundle/colorschemes
rename to vim/bundle/colorschemes
diff --git a/bundle/fugitive b/vim/bundle/fugitive
similarity index 100%
rename from bundle/fugitive
rename to vim/bundle/fugitive
diff --git a/bundle/nerdtree b/vim/bundle/nerdtree
similarity index 100%
rename from bundle/nerdtree
rename to vim/bundle/nerdtree
diff --git a/bundle/typescript-vim b/vim/bundle/typescript-vim
similarity index 100%
rename from bundle/typescript-vim
rename to vim/bundle/typescript-vim
diff --git a/bundle/vim-elixir b/vim/bundle/vim-elixir
similarity index 100%
rename from bundle/vim-elixir
rename to vim/bundle/vim-elixir
diff --git a/bundle/vim-graphql b/vim/bundle/vim-graphql
similarity index 100%
rename from bundle/vim-graphql
rename to vim/bundle/vim-graphql
diff --git a/bundle/vim-scala b/vim/bundle/vim-scala
similarity index 100%
rename from bundle/vim-scala
rename to vim/bundle/vim-scala
diff --git a/bundle/vimwiki b/vim/bundle/vimwiki
similarity index 100%
rename from bundle/vimwiki
rename to vim/bundle/vimwiki