diff --git a/python/helpers/pydev/pydevd_plugin_utils.py b/python/helpers/pydev/pydevd_plugin_utils.py
index 52297e90eaa5..74b49c6346cc 100644
--- a/python/helpers/pydev/pydevd_plugin_utils.py
+++ b/python/helpers/pydev/pydevd_plugin_utils.py
@@ -2,8 +2,7 @@ import os
 import types
 
 import pydev_log
-from pluginbase import PluginBase
-
+from third_party.pluginbase import PluginBase
 
 
 def load_plugins(package):
diff --git a/python/helpers/pydev/pkgutil_old.py b/python/helpers/pydev/third_party/pkgutil_old.py
similarity index 100%
rename from python/helpers/pydev/pkgutil_old.py
rename to python/helpers/pydev/third_party/pkgutil_old.py
diff --git a/python/helpers/pydev/pluginbase.py b/python/helpers/pydev/third_party/pluginbase.py
similarity index 99%
rename from python/helpers/pydev/pluginbase.py
rename to python/helpers/pydev/third_party/pluginbase.py
index b80d3e124414..63eab3cf0b0c 100644
--- a/python/helpers/pydev/pluginbase.py
+++ b/python/helpers/pydev/third_party/pluginbase.py
@@ -12,17 +12,17 @@
 import os
 import sys
 
-from pydevd_constants import IS_PY24, IS_PY27, IS_PY3K
+from pydevd_constants import IS_PY24, IS_PY3K
+
 
 if IS_PY24:
-    from uuid_old import uuid4
+    from third_party.uuid_old import uuid4
 else:
     from uuid import uuid4
 
 if IS_PY3K:
     import pkgutil
 else:
-    import pkgutil_old as pkgutil
 
 import errno
 try:
diff --git a/python/helpers/pydev/uuid_old.py b/python/helpers/pydev/third_party/uuid_old.py
similarity index 100%
rename from python/helpers/pydev/uuid_old.py
rename to python/helpers/pydev/third_party/uuid_old.py