diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..d5297c75
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vim/bundle/YouCompleteMe"]
+	path = vim/bundle/YouCompleteMe
+	url = https://github.com/ycm-core/YouCompleteMe
diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim
deleted file mode 160000
index 9a38216a..00000000
--- a/vim/bundle/Vundle.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
deleted file mode 160000
index 72c36567..00000000
--- a/vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 72c3656799289d4635520c28e17f737066ce19d6
diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin
deleted file mode 160000
index 325a1298..00000000
--- a/vim/bundle/nerdtree-git-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 325a1298b0c9d8a4c61388a2f9956a534a9068cd
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
deleted file mode 160000
index 98bc6abd..00000000
--- a/vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 98bc6abde3860600e599c7ad17fdfb80809c04af
diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes
deleted file mode 160000
index 3bfe1d00..00000000
--- a/vim/bundle/vim-airline-themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9
diff --git a/vim/bundle/vim-colorschemes b/vim/bundle/vim-colorschemes
deleted file mode 160000
index 2f532d05..00000000
--- a/vim/bundle/vim-colorschemes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f532d0564534accf09cecfa9a1e3639865367ee