diff --git a/.gitmodules b/.gitmodules
index 46a59b25..6dd3e85c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/Vendors/json"]
-	path = src/Vendors/json
-	url = git@github.com:nlohmann/json.git
\ No newline at end of file
+	path = third_party/json
+	url = git@github.com:nlohmann/json.git
+[submodule "third_party/grpc"]
+	path = third_party/grpc
+	url = git@github.com:grpc/grpc.git
diff --git a/src/Vendors/json b/src/Vendors/json
deleted file mode 160000
index 9ca00e48..00000000
--- a/src/Vendors/json
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9ca00e48800e205f3900dc6274550b373485c424
diff --git a/third_party/grpc b/third_party/grpc
new file mode 160000
index 00000000..ff83681c
--- /dev/null
+++ b/third_party/grpc
@@ -0,0 +1 @@
+Subproject commit ff83681cbb4296dba3dcd92aaba27cba494a934a