diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a914742
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "vim/vim/pack/plugins/start/vim-fugitive"]
+	path = vim/vim/pack/plugins/start/vim-fugitive
+	url = https://github.com/tpope/vim-fugitive.git
+[submodule "vim/vim/pack/plugins/start/vim-unimpaired"]
+	path = vim/vim/pack/plugins/start/vim-unimpaired
+	url = https://github.com/tpope/vim-unimpaired.git
+[submodule "vim/vim/pack/plugins/start/vim-commentary"]
+	path = vim/vim/pack/plugins/start/vim-commentary
+	url = https://github.com/tpope/vim-commentary.git
+[submodule "vim/vim/pack/plugins/start/vim-polyglot"]
+	path = vim/vim/pack/plugins/start/vim-polyglot
+	url = https://github.com/sheerun/vim-polyglot.git
diff --git a/vim/vim/pack/plugins/start/vim-commentary b/vim/vim/pack/plugins/start/vim-commentary
new file mode 160000
index 0000000..141d9d3
--- /dev/null
+++ b/vim/vim/pack/plugins/start/vim-commentary
@@ -0,0 +1 @@
+Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a
diff --git a/vim/vim/pack/plugins/start/vim-fugitive b/vim/vim/pack/plugins/start/vim-fugitive
new file mode 160000
index 0000000..44ade58
--- /dev/null
+++ b/vim/vim/pack/plugins/start/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit 44ade58ed509f7b21608ae061223d4ffef1e19d8
diff --git a/vim/vim/pack/plugins/start/vim-polyglot b/vim/vim/pack/plugins/start/vim-polyglot
new file mode 160000
index 0000000..3ddca5d
--- /dev/null
+++ b/vim/vim/pack/plugins/start/vim-polyglot
@@ -0,0 +1 @@
+Subproject commit 3ddca5da461ebfaa82104f82e3cbf19d1c326ade
diff --git a/vim/vim/pack/plugins/start/vim-unimpaired b/vim/vim/pack/plugins/start/vim-unimpaired
new file mode 160000
index 0000000..a49c4f2
--- /dev/null
+++ b/vim/vim/pack/plugins/start/vim-unimpaired
@@ -0,0 +1 @@
+Subproject commit a49c4f2bf05f18a6e4f6572a19763ba7abba52b1
diff --git a/vim/vimrc-plugins b/vim/vimrc-plugins
deleted file mode 100644
index d0e9dcb..0000000
--- a/vim/vimrc-plugins
+++ /dev/null
@@ -1,20 +0,0 @@
-" ==============================================================================
-" vimrc-plugins: Plug-in configuration. Using vim-plug.
-" ==============================================================================
-" Fetch & Install Self
-if empty(glob('~/.vim/autoload/plug.vim'))
-     silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
-          \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-     autocmd VimEnter * PlugInstall | source $MYVIMRC
-endif
-
-call plug#begin('~/.vim/bundle')
-  Plug 'tpope/vim-fugitive'
-  Plug 'tpope/vim-unimpaired'
-  Plug 'tpope/vim-commentary'
-
-  "Plug 'ludovicchabant/vim-gutentags'
-  Plug 'sheerun/vim-polyglot'
-
-  Plug 'junegunn/goyo.vim'
-call plug#end()