diff --git a/python/ycm/completers/__init__.py b/third_party/ycmd/ycmd/__init__.py similarity index 100% rename from python/ycm/completers/__init__.py rename to third_party/ycmd/ycmd/__init__.py diff --git a/python/ycm/completers/all/__init__.py b/third_party/ycmd/ycmd/completers/__init__.py similarity index 100% rename from python/ycm/completers/all/__init__.py rename to third_party/ycmd/ycmd/completers/__init__.py diff --git a/python/ycm/completers/cpp/__init__.py b/third_party/ycmd/ycmd/completers/all/__init__.py similarity index 100% rename from python/ycm/completers/cpp/__init__.py rename to third_party/ycmd/ycmd/completers/all/__init__.py diff --git a/python/ycm/completers/all/identifier_completer.py b/third_party/ycmd/ycmd/completers/all/identifier_completer.py similarity index 100% rename from python/ycm/completers/all/identifier_completer.py rename to third_party/ycmd/ycmd/completers/all/identifier_completer.py diff --git a/python/ycm/completers/all/omni_completer.py b/third_party/ycmd/ycmd/completers/all/omni_completer.py similarity index 100% rename from python/ycm/completers/all/omni_completer.py rename to third_party/ycmd/ycmd/completers/all/omni_completer.py diff --git a/python/ycm/completers/all/tests/identifier_completer_test.py b/third_party/ycmd/ycmd/completers/all/tests/identifier_completer_test.py similarity index 100% rename from python/ycm/completers/all/tests/identifier_completer_test.py rename to third_party/ycmd/ycmd/completers/all/tests/identifier_completer_test.py diff --git a/python/ycm/completers/c/hook.py b/third_party/ycmd/ycmd/completers/c/hook.py similarity index 100% rename from python/ycm/completers/c/hook.py rename to third_party/ycmd/ycmd/completers/c/hook.py diff --git a/python/ycm/completers/completer.py b/third_party/ycmd/ycmd/completers/completer.py similarity index 100% rename from python/ycm/completers/completer.py rename to third_party/ycmd/ycmd/completers/completer.py diff --git a/python/ycm/completers/completer_utils.py b/third_party/ycmd/ycmd/completers/completer_utils.py similarity index 100% rename from python/ycm/completers/completer_utils.py rename to third_party/ycmd/ycmd/completers/completer_utils.py diff --git a/python/ycm/completers/completer_utils_test.py b/third_party/ycmd/ycmd/completers/completer_utils_test.py similarity index 100% rename from python/ycm/completers/completer_utils_test.py rename to third_party/ycmd/ycmd/completers/completer_utils_test.py diff --git a/python/ycm/completers/cpp/tests/__init__.py b/third_party/ycmd/ycmd/completers/cpp/__init__.py similarity index 100% rename from python/ycm/completers/cpp/tests/__init__.py rename to third_party/ycmd/ycmd/completers/cpp/__init__.py diff --git a/python/ycm/completers/cpp/clang_completer.py b/third_party/ycmd/ycmd/completers/cpp/clang_completer.py similarity index 100% rename from python/ycm/completers/cpp/clang_completer.py rename to third_party/ycmd/ycmd/completers/cpp/clang_completer.py diff --git a/python/ycm/completers/cpp/clang_helpers.py b/third_party/ycmd/ycmd/completers/cpp/clang_helpers.py similarity index 100% rename from python/ycm/completers/cpp/clang_helpers.py rename to third_party/ycmd/ycmd/completers/cpp/clang_helpers.py diff --git a/python/ycm/completers/cpp/flags.py b/third_party/ycmd/ycmd/completers/cpp/flags.py similarity index 100% rename from python/ycm/completers/cpp/flags.py rename to third_party/ycmd/ycmd/completers/cpp/flags.py diff --git a/python/ycm/completers/cpp/hook.py b/third_party/ycmd/ycmd/completers/cpp/hook.py similarity index 100% rename from python/ycm/completers/cpp/hook.py rename to third_party/ycmd/ycmd/completers/cpp/hook.py diff --git a/python/ycm/completers/cs/__init__.py b/third_party/ycmd/ycmd/completers/cpp/tests/__init__.py similarity index 100% rename from python/ycm/completers/cs/__init__.py rename to third_party/ycmd/ycmd/completers/cpp/tests/__init__.py diff --git a/python/ycm/completers/cpp/tests/flags_test.py b/third_party/ycmd/ycmd/completers/cpp/tests/flags_test.py similarity index 100% rename from python/ycm/completers/cpp/tests/flags_test.py rename to third_party/ycmd/ycmd/completers/cpp/tests/flags_test.py diff --git a/python/ycm/completers/general/__init__.py b/third_party/ycmd/ycmd/completers/cs/__init__.py similarity index 100% rename from python/ycm/completers/general/__init__.py rename to third_party/ycmd/ycmd/completers/cs/__init__.py diff --git a/python/ycm/completers/cs/cs_completer.py b/third_party/ycmd/ycmd/completers/cs/cs_completer.py similarity index 100% rename from python/ycm/completers/cs/cs_completer.py rename to third_party/ycmd/ycmd/completers/cs/cs_completer.py diff --git a/python/ycm/completers/cs/hook.py b/third_party/ycmd/ycmd/completers/cs/hook.py similarity index 100% rename from python/ycm/completers/cs/hook.py rename to third_party/ycmd/ycmd/completers/cs/hook.py diff --git a/python/ycm/completers/general/tests/__init__.py b/third_party/ycmd/ycmd/completers/general/__init__.py similarity index 100% rename from python/ycm/completers/general/tests/__init__.py rename to third_party/ycmd/ycmd/completers/general/__init__.py diff --git a/python/ycm/completers/general/filename_completer.py b/third_party/ycmd/ycmd/completers/general/filename_completer.py similarity index 100% rename from python/ycm/completers/general/filename_completer.py rename to third_party/ycmd/ycmd/completers/general/filename_completer.py diff --git a/python/ycm/completers/general/general_completer_store.py b/third_party/ycmd/ycmd/completers/general/general_completer_store.py similarity index 100% rename from python/ycm/completers/general/general_completer_store.py rename to third_party/ycmd/ycmd/completers/general/general_completer_store.py diff --git a/python/ycm/completers/general/syntax_parse.py b/third_party/ycmd/ycmd/completers/general/syntax_parse.py similarity index 100% rename from python/ycm/completers/general/syntax_parse.py rename to third_party/ycmd/ycmd/completers/general/syntax_parse.py diff --git a/python/ycm/completers/python/__init__.py b/third_party/ycmd/ycmd/completers/general/tests/__init__.py similarity index 100% rename from python/ycm/completers/python/__init__.py rename to third_party/ycmd/ycmd/completers/general/tests/__init__.py diff --git a/python/ycm/completers/general/tests/filename_completer_test.py b/third_party/ycmd/ycmd/completers/general/tests/filename_completer_test.py similarity index 100% rename from python/ycm/completers/general/tests/filename_completer_test.py rename to third_party/ycmd/ycmd/completers/general/tests/filename_completer_test.py diff --git a/python/ycm/completers/general/tests/syntax_parse_test.py b/third_party/ycmd/ycmd/completers/general/tests/syntax_parse_test.py similarity index 100% rename from python/ycm/completers/general/tests/syntax_parse_test.py rename to third_party/ycmd/ycmd/completers/general/tests/syntax_parse_test.py diff --git a/python/ycm/completers/general/tests/testdata/cpp_syntax b/third_party/ycmd/ycmd/completers/general/tests/testdata/cpp_syntax similarity index 100% rename from python/ycm/completers/general/tests/testdata/cpp_syntax rename to third_party/ycmd/ycmd/completers/general/tests/testdata/cpp_syntax diff --git a/python/ycm/completers/general/tests/testdata/filename_completer/include/Qt/QtGui b/third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/include/Qt/QtGui similarity index 100% rename from python/ycm/completers/general/tests/testdata/filename_completer/include/Qt/QtGui rename to third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/include/Qt/QtGui diff --git a/python/ycm/completers/general/tests/testdata/filename_completer/include/QtGui/QDialog b/third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/include/QtGui/QDialog similarity index 100% rename from python/ycm/completers/general/tests/testdata/filename_completer/include/QtGui/QDialog rename to third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/include/QtGui/QDialog diff --git a/python/ycm/completers/general/tests/testdata/filename_completer/include/QtGui/QWidget b/third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/include/QtGui/QWidget similarity index 100% rename from python/ycm/completers/general/tests/testdata/filename_completer/include/QtGui/QWidget rename to third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/include/QtGui/QWidget diff --git a/python/ycm/completers/general/tests/testdata/filename_completer/test.cpp b/third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/test.cpp similarity index 100% rename from python/ycm/completers/general/tests/testdata/filename_completer/test.cpp rename to third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/test.cpp diff --git a/python/ycm/completers/general/tests/testdata/filename_completer/test.hpp b/third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/test.hpp similarity index 100% rename from python/ycm/completers/general/tests/testdata/filename_completer/test.hpp rename to third_party/ycmd/ycmd/completers/general/tests/testdata/filename_completer/test.hpp diff --git a/python/ycm/completers/general/tests/testdata/java_syntax b/third_party/ycmd/ycmd/completers/general/tests/testdata/java_syntax similarity index 100% rename from python/ycm/completers/general/tests/testdata/java_syntax rename to third_party/ycmd/ycmd/completers/general/tests/testdata/java_syntax diff --git a/python/ycm/completers/general/tests/testdata/python_syntax b/third_party/ycmd/ycmd/completers/general/tests/testdata/python_syntax similarity index 100% rename from python/ycm/completers/general/tests/testdata/python_syntax rename to third_party/ycmd/ycmd/completers/general/tests/testdata/python_syntax diff --git a/python/ycm/completers/general/ultisnips_completer.py b/third_party/ycmd/ycmd/completers/general/ultisnips_completer.py similarity index 100% rename from python/ycm/completers/general/ultisnips_completer.py rename to third_party/ycmd/ycmd/completers/general/ultisnips_completer.py diff --git a/python/ycm/completers/general_completer.py b/third_party/ycmd/ycmd/completers/general_completer.py similarity index 100% rename from python/ycm/completers/general_completer.py rename to third_party/ycmd/ycmd/completers/general_completer.py diff --git a/python/ycm/completers/objc/hook.py b/third_party/ycmd/ycmd/completers/objc/hook.py similarity index 100% rename from python/ycm/completers/objc/hook.py rename to third_party/ycmd/ycmd/completers/objc/hook.py diff --git a/python/ycm/completers/objcpp/hook.py b/third_party/ycmd/ycmd/completers/objcpp/hook.py similarity index 100% rename from python/ycm/completers/objcpp/hook.py rename to third_party/ycmd/ycmd/completers/objcpp/hook.py diff --git a/python/ycm/server/__init__.py b/third_party/ycmd/ycmd/completers/python/__init__.py similarity index 100% rename from python/ycm/server/__init__.py rename to third_party/ycmd/ycmd/completers/python/__init__.py diff --git a/python/ycm/completers/python/hook.py b/third_party/ycmd/ycmd/completers/python/hook.py similarity index 100% rename from python/ycm/completers/python/hook.py rename to third_party/ycmd/ycmd/completers/python/hook.py diff --git a/python/ycm/completers/python/jedi_completer.py b/third_party/ycmd/ycmd/completers/python/jedi_completer.py similarity index 100% rename from python/ycm/completers/python/jedi_completer.py rename to third_party/ycmd/ycmd/completers/python/jedi_completer.py diff --git a/python/ycm/server/default_settings.json b/third_party/ycmd/ycmd/default_settings.json similarity index 100% rename from python/ycm/server/default_settings.json rename to third_party/ycmd/ycmd/default_settings.json diff --git a/python/ycm/extra_conf_store.py b/third_party/ycmd/ycmd/extra_conf_store.py similarity index 100% rename from python/ycm/extra_conf_store.py rename to third_party/ycmd/ycmd/extra_conf_store.py diff --git a/python/ycm/server/handlers.py b/third_party/ycmd/ycmd/handlers.py similarity index 100% rename from python/ycm/server/handlers.py rename to third_party/ycmd/ycmd/handlers.py diff --git a/python/ycm/server/hmac_plugin.py b/third_party/ycmd/ycmd/hmac_plugin.py similarity index 100% rename from python/ycm/server/hmac_plugin.py rename to third_party/ycmd/ycmd/hmac_plugin.py diff --git a/python/ycm/server/responses.py b/third_party/ycmd/ycmd/responses.py similarity index 100% rename from python/ycm/server/responses.py rename to third_party/ycmd/ycmd/responses.py diff --git a/python/ycm/server/server_state.py b/third_party/ycmd/ycmd/server_state.py similarity index 100% rename from python/ycm/server/server_state.py rename to third_party/ycmd/ycmd/server_state.py diff --git a/python/ycm/server/server_utils.py b/third_party/ycmd/ycmd/server_utils.py similarity index 100% rename from python/ycm/server/server_utils.py rename to third_party/ycmd/ycmd/server_utils.py diff --git a/python/ycm/server/tests/__init__.py b/third_party/ycmd/ycmd/tests/__init__.py similarity index 100% rename from python/ycm/server/tests/__init__.py rename to third_party/ycmd/ycmd/tests/__init__.py diff --git a/python/ycm/server/tests/diagnostics_test.py b/third_party/ycmd/ycmd/tests/diagnostics_test.py similarity index 100% rename from python/ycm/server/tests/diagnostics_test.py rename to third_party/ycmd/ycmd/tests/diagnostics_test.py diff --git a/python/ycm/tests/extra_conf_store_test.py b/third_party/ycmd/ycmd/tests/extra_conf_store_test.py similarity index 100% rename from python/ycm/tests/extra_conf_store_test.py rename to third_party/ycmd/ycmd/tests/extra_conf_store_test.py diff --git a/python/ycm/server/tests/get_completions_test.py b/third_party/ycmd/ycmd/tests/get_completions_test.py similarity index 100% rename from python/ycm/server/tests/get_completions_test.py rename to third_party/ycmd/ycmd/tests/get_completions_test.py diff --git a/python/ycm/server/tests/misc_handlers_test.py b/third_party/ycmd/ycmd/tests/misc_handlers_test.py similarity index 100% rename from python/ycm/server/tests/misc_handlers_test.py rename to third_party/ycmd/ycmd/tests/misc_handlers_test.py diff --git a/python/ycm/server/tests/subcommands_test.py b/third_party/ycmd/ycmd/tests/subcommands_test.py similarity index 100% rename from python/ycm/server/tests/subcommands_test.py rename to third_party/ycmd/ycmd/tests/subcommands_test.py diff --git a/python/ycm/server/tests/test_utils.py b/third_party/ycmd/ycmd/tests/test_utils.py similarity index 100% rename from python/ycm/server/tests/test_utils.py rename to third_party/ycmd/ycmd/tests/test_utils.py diff --git a/python/ycm/server/tests/testdata/.ycm_extra_conf.py b/third_party/ycmd/ycmd/tests/testdata/.ycm_extra_conf.py similarity index 100% rename from python/ycm/server/tests/testdata/.ycm_extra_conf.py rename to third_party/ycmd/ycmd/tests/testdata/.ycm_extra_conf.py diff --git a/python/ycm/server/tests/testdata/basic.cpp b/third_party/ycmd/ycmd/tests/testdata/basic.cpp similarity index 100% rename from python/ycm/server/tests/testdata/basic.cpp rename to third_party/ycmd/ycmd/tests/testdata/basic.cpp diff --git a/python/ycm/server/tests/testdata/client_data/.ycm_extra_conf.py b/third_party/ycmd/ycmd/tests/testdata/client_data/.ycm_extra_conf.py similarity index 100% rename from python/ycm/server/tests/testdata/client_data/.ycm_extra_conf.py rename to third_party/ycmd/ycmd/tests/testdata/client_data/.ycm_extra_conf.py diff --git a/python/ycm/server/tests/testdata/client_data/main.cpp b/third_party/ycmd/ycmd/tests/testdata/client_data/main.cpp similarity index 100% rename from python/ycm/server/tests/testdata/client_data/main.cpp rename to third_party/ycmd/ycmd/tests/testdata/client_data/main.cpp diff --git a/python/ycm/server/tests/testdata/noflags/.ycm_extra_conf.py b/third_party/ycmd/ycmd/tests/testdata/noflags/.ycm_extra_conf.py similarity index 100% rename from python/ycm/server/tests/testdata/noflags/.ycm_extra_conf.py rename to third_party/ycmd/ycmd/tests/testdata/noflags/.ycm_extra_conf.py diff --git a/python/ycm/server/tests/testdata/noflags/basic.cpp b/third_party/ycmd/ycmd/tests/testdata/noflags/basic.cpp similarity index 100% rename from python/ycm/server/tests/testdata/noflags/basic.cpp rename to third_party/ycmd/ycmd/tests/testdata/noflags/basic.cpp diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy.sln b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy.sln similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy.sln rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy.sln diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Program.cs b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Program.cs similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Program.cs rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Program.cs diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Properties/AssemblyInfo.cs b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Properties/AssemblyInfo.cs similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Properties/AssemblyInfo.cs rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/Properties/AssemblyInfo.cs diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/testy.csproj b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/testy.csproj similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/testy.csproj rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy/testy.csproj diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy2.sln b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy2.sln similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy2.sln rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-named-like-folder/testy2.sln diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Program.cs b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Program.cs similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Program.cs rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Program.cs diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Properties/AssemblyInfo.cs b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Properties/AssemblyInfo.cs similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Properties/AssemblyInfo.cs rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/Properties/AssemblyInfo.cs diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/testy.csproj b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/testy.csproj similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/testy.csproj rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy/testy.csproj diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy1.sln b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy1.sln similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy1.sln rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy1.sln diff --git a/python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy2.sln b/third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy2.sln similarity index 100% rename from python/ycm/server/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy2.sln rename to third_party/ycmd/ycmd/tests/testdata/testy-multiple-solutions/solution-not-named-like-folder/testy2.sln diff --git a/python/ycm/server/tests/testdata/testy/Program.cs b/third_party/ycmd/ycmd/tests/testdata/testy/Program.cs similarity index 100% rename from python/ycm/server/tests/testdata/testy/Program.cs rename to third_party/ycmd/ycmd/tests/testdata/testy/Program.cs diff --git a/python/ycm/server/tests/testdata/testy/Properties/AssemblyInfo.cs b/third_party/ycmd/ycmd/tests/testdata/testy/Properties/AssemblyInfo.cs similarity index 100% rename from python/ycm/server/tests/testdata/testy/Properties/AssemblyInfo.cs rename to third_party/ycmd/ycmd/tests/testdata/testy/Properties/AssemblyInfo.cs diff --git a/python/ycm/server/tests/testdata/testy/testy.csproj b/third_party/ycmd/ycmd/tests/testdata/testy/testy.csproj similarity index 100% rename from python/ycm/server/tests/testdata/testy/testy.csproj rename to third_party/ycmd/ycmd/tests/testdata/testy/testy.csproj diff --git a/python/ycm/server/tests/testdata/testy/testy.sln b/third_party/ycmd/ycmd/tests/testdata/testy/testy.sln similarity index 100% rename from python/ycm/server/tests/testdata/testy/testy.sln rename to third_party/ycmd/ycmd/tests/testdata/testy/testy.sln diff --git a/python/ycm/server/tests/testdata/testy/testy.userprefs b/third_party/ycmd/ycmd/tests/testdata/testy/testy.userprefs similarity index 100% rename from python/ycm/server/tests/testdata/testy/testy.userprefs rename to third_party/ycmd/ycmd/tests/testdata/testy/testy.userprefs diff --git a/python/ycm/user_options_store.py b/third_party/ycmd/ycmd/user_options_store.py similarity index 100% rename from python/ycm/user_options_store.py rename to third_party/ycmd/ycmd/user_options_store.py diff --git a/python/ycm/utils.py b/third_party/ycmd/ycmd/utils.py similarity index 100% rename from python/ycm/utils.py rename to third_party/ycmd/ycmd/utils.py diff --git a/python/ycm/server/watchdog_plugin.py b/third_party/ycmd/ycmd/watchdog_plugin.py similarity index 100% rename from python/ycm/server/watchdog_plugin.py rename to third_party/ycmd/ycmd/watchdog_plugin.py diff --git a/python/ycm/server/ycmd.py b/third_party/ycmd/ycmd/ycmd.py similarity index 100% rename from python/ycm/server/ycmd.py rename to third_party/ycmd/ycmd/ycmd.py