diff --git a/.gitmodules b/.gitmodules
index dc31743..797b236 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "vim/pack/default/start/fugitive"]
-	path = vim/pack/default/start/fugitive
-	url = https://tpope.io/vim/fugitive.git
-[submodule "vim/pack/default/start/editorconfig-vim"]
-	path = vim/pack/default/start/editorconfig-vim
-	url = https://github.com/editorconfig/editorconfig-vim.git
 [submodule "nvim/pack/colors/start/molokai"]
 	path = nvim/pack/colors/start/molokai
 	url = https://github.com/tomasr/molokai.git
@@ -25,3 +19,6 @@
 [submodule "nvim/pack/syntaxes/start/vim-gutentags"]
 	path = nvim/pack/syntaxes/start/vim-gutentags
 	url = https://github.com/ludovicchabant/vim-gutentags.git
+[submodule "nvim/pack/project/editorconfig-vim"]
+	path = nvim/pack/project/editorconfig-vim
+	url = https://github.com/editorconfig/editorconfig-vim.git
diff --git a/nvim/pack/project/editorconfig-vim b/nvim/pack/project/editorconfig-vim
new file mode 160000
index 0000000..0a3c1d8
--- /dev/null
+++ b/nvim/pack/project/editorconfig-vim
@@ -0,0 +1 @@
+Subproject commit 0a3c1d8082e38a5ebadcba7bb3a608d88a9ff044
diff --git a/vim/pack/default/start/editorconfig-vim b/vim/pack/default/start/editorconfig-vim
deleted file mode 160000
index 8aff78a..0000000
--- a/vim/pack/default/start/editorconfig-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8aff78a03357bf573abcec407a543762f281b7d3
diff --git a/vim/pack/default/start/fugitive b/vim/pack/default/start/fugitive
deleted file mode 160000
index 85e2c73..0000000
--- a/vim/pack/default/start/fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 85e2c73830b6bb01ce7fc3a926d2b25836a253eb