diff --git a/.gitmodules b/.gitmodules
index 98b76b0f..be177e3b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "third_party/jedi"]
-	path = third_party/jedi
+	path = third_party/ycmd/third_party/jedi
 	url = https://github.com/davidhalter/jedi
 [submodule "third_party/OmniSharpServer"]
-	path = third_party/OmniSharpServer
+	path = third_party/ycmd/third_party/OmniSharpServer
 	url = https://github.com/nosami/OmniSharpServer
 [submodule "third_party/requests-futures"]
 	path = third_party/requests-futures
@@ -11,14 +11,14 @@
 	path = third_party/requests
 	url = https://github.com/kennethreitz/requests
 [submodule "third_party/waitress"]
-	path = third_party/waitress
+	path = third_party/ycmd/third_party/waitress
 	url = https://github.com/Pylons/waitress
 [submodule "third_party/bottle"]
-	path = third_party/bottle
+	path = third_party/ycmd/third_party/bottle
 	url = https://github.com/defnull/bottle
 [submodule "third_party/frozendict"]
-	path = third_party/frozendict
+	path = third_party/ycmd/third_party/frozendict
 	url = https://github.com/slezica/python-frozendict
 [submodule "third_party/argparse"]
-	path = third_party/argparse
+	path = third_party/ycmd/third_party/argparse
 	url = https://github.com/bewest/argparse
diff --git a/third_party/OmniSharpServer b/third_party/ycmd/third_party/OmniSharpServer
similarity index 100%
rename from third_party/OmniSharpServer
rename to third_party/ycmd/third_party/OmniSharpServer
diff --git a/third_party/argparse b/third_party/ycmd/third_party/argparse
similarity index 100%
rename from third_party/argparse
rename to third_party/ycmd/third_party/argparse
diff --git a/third_party/bottle b/third_party/ycmd/third_party/bottle
similarity index 100%
rename from third_party/bottle
rename to third_party/ycmd/third_party/bottle
diff --git a/third_party/frozendict b/third_party/ycmd/third_party/frozendict
similarity index 100%
rename from third_party/frozendict
rename to third_party/ycmd/third_party/frozendict
diff --git a/third_party/jedi b/third_party/ycmd/third_party/jedi
similarity index 100%
rename from third_party/jedi
rename to third_party/ycmd/third_party/jedi
diff --git a/third_party/waitress b/third_party/ycmd/third_party/waitress
similarity index 100%
rename from third_party/waitress
rename to third_party/ycmd/third_party/waitress