diff --git a/.gitmodules b/.gitmodules
index 9e9c33e..66474cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,27 @@
 [submodule "bundle/fugitive"]
-	path = vim/bundle/fugitive
+	path = vim/.vim/bundle/fugitive
 	url = https://github.com/tpope/vim-fugitive.git
 [submodule "bundle/nerdtree"]
-	path = vim/bundle/nerdtree
+	path = vim/.vim/bundle/nerdtree
 	url = https://github.com/scrooloose/nerdtree.git
 [submodule "bundle/airline"]
-	path = vim/bundle/airline
+	path = vim/.vim/bundle/airline
 	url = https://github.com/vim-airline/vim-airline
 [submodule "bundle/vim-colorschemes"]
-	path = vim/bundle/colorschemes
+	path = vim/.vim/bundle/colorschemes
 	url = https://github.com/flazz/vim-colorschemes
 [submodule "bundle/vim-scala"]
-	path = vim/bundle/vim-scala
+	path = vim/.vim/bundle/vim-scala
 	url = https://github.com/derekwyatt/vim-scala
 [submodule "bundle/vimwiki"]
-	path = vim/bundle/vimwiki
+	path = vim/.vim/bundle/vimwiki
   url = https://github.com/vimwiki/vimwiki.git
 [submodule "bundle/vim-graphql"]
-	path = vim/bundle/vim-graphql
+	path = vim/.vim/bundle/vim-graphql
 	url = https://github.com/jparise/vim-graphql
 [submodule "bundle/typescript-vim"]
-	path = vim/bundle/typescript-vim
+	path = vim/.vim/bundle/typescript-vim
 	url = https://github.com/leafgarland/typescript-vim
 [submodule "bundle/vim-elixir"]
-	path = vim/bundle/vim-elixir
+	path = vim/.vim/bundle/vim-elixir
 	url = https://github.com/elixir-lang/vim-elixir.git
diff --git a/config.sh b/config.sh
index 7c44cb9..ef5f7ea 100755
--- a/config.sh
+++ b/config.sh
@@ -2,6 +2,7 @@
 
 stow -t ~ bash
 stow -t ~ screen
+stow -t ~ vim
 
 #rm -f .screenrc
 #ln -s ~/Code/config/screenrc .screenrc
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/bundle/airline b/vim/.vim/bundle/airline
similarity index 100%
rename from vim/bundle/airline
rename to vim/.vim/bundle/airline
diff --git a/vim/bundle/colorschemes b/vim/.vim/bundle/colorschemes
similarity index 100%
rename from vim/bundle/colorschemes
rename to vim/.vim/bundle/colorschemes
diff --git a/vim/bundle/fugitive b/vim/.vim/bundle/fugitive
similarity index 100%
rename from vim/bundle/fugitive
rename to vim/.vim/bundle/fugitive
diff --git a/vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
similarity index 100%
rename from vim/bundle/nerdtree
rename to vim/.vim/bundle/nerdtree
diff --git a/vim/bundle/typescript-vim b/vim/.vim/bundle/typescript-vim
similarity index 100%
rename from vim/bundle/typescript-vim
rename to vim/.vim/bundle/typescript-vim
diff --git a/vim/bundle/vim-elixir b/vim/.vim/bundle/vim-elixir
similarity index 100%
rename from vim/bundle/vim-elixir
rename to vim/.vim/bundle/vim-elixir
diff --git a/vim/bundle/vim-graphql b/vim/.vim/bundle/vim-graphql
similarity index 100%
rename from vim/bundle/vim-graphql
rename to vim/.vim/bundle/vim-graphql
diff --git a/vim/bundle/vim-scala b/vim/.vim/bundle/vim-scala
similarity index 100%
rename from vim/bundle/vim-scala
rename to vim/.vim/bundle/vim-scala
diff --git a/vim/bundle/vimwiki b/vim/.vim/bundle/vimwiki
similarity index 100%
rename from vim/bundle/vimwiki
rename to vim/.vim/bundle/vimwiki
diff --git a/vim/.vimrc b/vim/.vim/vimrc
similarity index 100%
rename from vim/.vimrc
rename to vim/.vim/vimrc
diff --git a/vimrc b/vimrc
deleted file mode 100644
index 9840f07..0000000
--- a/vimrc
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-filetype plugin indent on
-
-" Tabbing
-function! SetupTabbing()
-  set tabstop=2
-  set expandtab
-  set shiftwidth=2
-  set softtabstop=2
-  set sw=2
-  set autoindent
-  set smartindent
-  set smarttab
-endfunction
-command! -bar SetupTabbing call SetupTabbing()
-SetupTabbing
-
-" Window settings
-set winminwidth=20
-set winwidth=100
-set winheight=20
-
-" Syntax highlighting
-syntax on
-
-" Wrapping settings
-set nowrap " nowrap makes the lines not wrap
-" set wrap " wrap makes the lines wrap
-set linebreak
-
-" keeps lines below the cursor
-set scrolloff=2
-
-" makes LaTeX use spell checking, word wrapping
-autocmd FileType tex set wrap spell
-autocmd FileType make set noexpandtab
-autocmd FileType *gitconfig set noexpandtab
-autocmd FileType python SetupTabbing
-
-" set term=xterm
-
-let java_allow_cpp_keywords = 1
-
-set ruler
-set number
-set backspace=indent,eol,start
-set hlsearch
-
-augroup HiglightTODO
-  autocmd!
-  autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
-augroup END
-