diff --git a/plugins/org.python.pydev.debug/pysrc/_pydev_SimpleXMLRPCServer.py b/plugins/org.python.pydev.debug/pysrc/_pydev_SimpleXMLRPCServer.py
diff --git a/plugins/org.python.pydev.debug/pysrc/_pydev_execfile.py b/plugins/org.python.pydev.debug/pysrc/_pydev_execfile.py
diff --git a/plugins/org.python.pydev.debug/pysrc/_pydev_xmlrpclib.py b/plugins/org.python.pydev.debug/pysrc/_pydev_xmlrpclib.py
diff --git a/plugins/org.python.pydev.debug/pysrc/copied_completer.py b/plugins/org.python.pydev.debug/pysrc/copied_completer.py
diff --git a/plugins/org.python.pydev.debug/pysrc/copied_importsTipper.py b/plugins/org.python.pydev.debug/pysrc/copied_importsTipper.py
diff --git a/plugins/org.python.pydev.debug/pysrc/pydev_imports.py b/plugins/org.python.pydev.debug/pysrc/pydev_imports.py
diff --git a/plugins/org.python.pydev.debug/pysrc/pydev_localhost.py b/plugins/org.python.pydev.debug/pysrc/pydev_localhost.py
diff --git a/plugins/org.python.pydev.debug/pysrc/tests/.cvsignore b/plugins/org.python.pydev.debug/pysrc/tests/.cvsignore
diff --git a/plugins/org.python.pydev.debug/pysrc/tests/samples/.cvsignore b/plugins/org.python.pydev.debug/pysrc/tests/samples/.cvsignore
diff --git a/plugins/org.python.pydev.debug/pysrc/tests/samples/nested_dir/.cvsignore b/plugins/org.python.pydev.debug/pysrc/tests/samples/nested_dir/.cvsignore
diff --git a/plugins/org.python.pydev.debug/pysrc/tests/samples/nested_dir/nested2/.cvsignore b/plugins/org.python.pydev.debug/pysrc/tests/samples/nested_dir/nested2/.cvsignore
diff --git a/plugins/org.python.pydev.debug/pysrc/tests/samples/nested_dir/nested3/.cvsignore b/plugins/org.python.pydev.debug/pysrc/tests/samples/nested_dir/nested3/.cvsignore
diff --git a/plugins/org.python.pydev.debug/src/org/python/pydev/debug/core/PydevDebugPlugin.java b/plugins/org.python.pydev.debug/src/org/python/pydev/debug/core/PydevDebugPlugin.java
@@ -32,6 +32,7 @@
 import org.python.pydev.core.bundle.ImageCache;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.debug.newconsole.prefs.ColorManager;
+import org.python.pydev.plugin.PydevPlugin;
 
 /**
  * The main plugin for Python Debugger.
@@ -130,21 +131,7 @@ public void run() {
      * @throws CoreException
      */
     public static File getScriptWithinPySrc(String targetExec) throws CoreException {
-
-        IPath relative = new Path("pysrc").addTrailingSeparator().append(targetExec);
-
-        Bundle bundle = getDefault().getBundle();
-
-        URL bundleURL = Platform.find(bundle, relative);
-        URL fileURL;
-        try {
-            fileURL = Platform.asLocalURL(bundleURL);
-            File f = new File(fileURL.getPath());
-
-            return f;
-        } catch (IOException e) {
-            throw new CoreException(makeStatus(IStatus.ERROR, "Can't find python debug script", null));
-        }
+        return PydevPlugin.getScriptWithinPySrc(targetExec);
     }
 
     /**
@@ -154,21 +141,7 @@ public static File getScriptWithinPySrc(String targetExec) throws CoreException
      * @throws CoreException
      */
     public static File getPySrcPath() throws CoreException {
-
-        IPath relative = new Path("pysrc");
-
-        Bundle bundle = getDefault().getBundle();
-
-        URL bundleURL = Platform.find(bundle, relative);
-        URL fileURL;
-        try {
-            fileURL = Platform.asLocalURL(bundleURL);
-            File f = new File(fileURL.getPath());
-
-            return f;
-        } catch (IOException e) {
-            throw new CoreException(makeStatus(IStatus.ERROR, "Can't find python debug script", null));
-        }
+        return PydevPlugin.getPySrcPath();
     }
 
 

diff --git a/...ython.pydev.debug/tests/org/python/pydev/debug/newconsole/PydevConsoleDebugCommsTest.java b/...ython.pydev.debug/tests/org/python/pydev/debug/newconsole/PydevConsoleDebugCommsTest.java
@@ -48,7 +48,7 @@ public class PydevConsoleDebugCommsTest extends TestCase {
 
 	@Override
 	protected void setUp() throws Exception {
-		String consoleFile = REF.createFileFromParts(TestDependent.TEST_PYDEV_PLUGIN_LOC, "PySrc", "pydevconsole.py").getAbsolutePath();
+		String consoleFile = REF.createFileFromParts(TestDependent.TEST_PYDEV_PLUGIN_LOC, "pysrc", "pydevconsole.py").getAbsolutePath();
 		String pydevdDir = new File(TestDependent.TEST_PYDEV_DEBUG_PLUGIN_LOC, "pysrc").getAbsolutePath();
 		Integer[] ports = SocketUtil.findUnusedLocalPorts(2);
 		int port = ports[0];

diff --git a/plugins/org.python.pydev/PySrc/.cvsignore b/plugins/org.python.pydev/PySrc/.cvsignore
diff --git a/plugins/org.python.pydev/PySrc/ThirdParty/.cvsignore b/plugins/org.python.pydev/PySrc/ThirdParty/.cvsignore
diff --git a/plugins/org.python.pydev/PySrc/ThirdParty/wrapped_for_pydev/ctypes/.cvsignore b/plugins/org.python.pydev/PySrc/ThirdParty/wrapped_for_pydev/ctypes/.cvsignore
diff --git a/plugins/org.python.pydev/PySrc/ThirdParty/wrapped_for_pydev/ctypes/macholib/.cvsignore b/plugins/org.python.pydev/PySrc/ThirdParty/wrapped_for_pydev/ctypes/macholib/.cvsignore
diff --git a/plugins/org.python.pydev/PySrc/_completer.py → ...rg.python.pydev/PySrc/_pydev_completer.py b/plugins/org.python.pydev/PySrc/_completer.py → ...rg.python.pydev/PySrc/_pydev_completer.py
@@ -13,14 +13,14 @@
 
 try:
     import java.lang #@UnusedImport
-    import jyimportsTipper #as importsTipper #changed to be backward compatible with 1.5
-    importsTipper = jyimportsTipper
+    import _pydev_jy_imports_tipper #as _pydev_imports_tipper #changed to be backward compatible with 1.5
+    _pydev_imports_tipper = _pydev_jy_imports_tipper
 except ImportError:
     IS_JYTHON = False
-    import importsTipper
+    import _pydev_imports_tipper
 
 
-dir2 = importsTipper.GenerateImportsTipForModule
+dir2 = _pydev_imports_tipper.GenerateImportsTipForModule
 
 
 #=======================================================================================================================

diff --git a/...python.pydev.debug/pysrc/_pydev_getopt.py → ...s/org.python.pydev/PySrc/_pydev_getopt.py b/...python.pydev.debug/pysrc/_pydev_getopt.py → ...s/org.python.pydev/PySrc/_pydev_getopt.py
diff --git a/...s/org.python.pydev/PySrc/importsTipper.py → ...thon.pydev/PySrc/_pydev_imports_tipper.py b/...s/org.python.pydev/PySrc/importsTipper.py → ...thon.pydev/PySrc/_pydev_imports_tipper.py
@@ -1,7 +1,7 @@
 import os.path
 import inspect
 import sys
-from _tipper_common import DoFind
+from _pydev_tipper_common import DoFind
 
 #completion types.
 TYPE_IMPORT = '0'

diff --git a/...org.python.pydev/PySrc/jyimportsTipper.py → ...n.pydev/PySrc/_pydev_jy_imports_tipper.py b/...org.python.pydev/PySrc/jyimportsTipper.py → ...n.pydev/PySrc/_pydev_jy_imports_tipper.py
@@ -4,7 +4,7 @@
 from java.lang import String #@UnresolvedImport
 import java.lang #@UnresolvedImport
 import sys
-from _tipper_common import DoFind
+from _pydev_tipper_common import DoFind
 
 
 try:

diff --git a/.../org.python.pydev/PySrc/_tipper_common.py → ...ython.pydev/PySrc/_pydev_tipper_common.py b/.../org.python.pydev/PySrc/_tipper_common.py → ...ython.pydev/PySrc/_pydev_tipper_common.py
diff --git a/plugins/org.python.pydev/PySrc/interpreterInfo.py b/plugins/org.python.pydev/PySrc/interpreterInfo.py
@@ -29,7 +29,7 @@
     try:
         import ctypes #use from the system if available
     except ImportError:
-        sys.path.append(os.path.join(sys.path[0], 'ThirdParty/wrapped_for_pydev'))
+        sys.path.append(os.path.join(sys.path[0], 'third_party/wrapped_for_pydev'))
         import ctypes
 
     def nativePath(path):

diff --git a/plugins/org.python.pydev/PySrc/pycompletion.py b/plugins/org.python.pydev/PySrc/pycompletion.py
@@ -3,7 +3,7 @@
 @author Radim Kubacki
 '''
 import __builtin__
-import importsTipper
+import _pydev_imports_tipper
 import traceback
 import StringIO
 import sys
@@ -19,7 +19,7 @@ def GetImports(module_name):
     try:
         processor = pycompletionserver.Processor()
         data = urllib.unquote_plus(module_name)
-        def_file, completions = importsTipper.GenerateTip(data)
+        def_file, completions = _pydev_imports_tipper.GenerateTip(data)
         return processor.formatCompletionMessage(def_file, completions)
     except:
         s = StringIO.StringIO()

diff --git a/plugins/org.python.pydev/PySrc/pycompletionserver.py b/plugins/org.python.pydev/PySrc/pycompletionserver.py
@@ -21,15 +21,15 @@
     from java.lang import Thread
     IS_JYTHON = True
     SERVER_NAME = 'jycompletionserver'
-    import jyimportsTipper #as importsTipper #changed to be backward compatible with 1.5
-    importsTipper = jyimportsTipper
+    import _pydev_jy_imports_tipper #as _pydev_imports_tipper #changed to be backward compatible with 1.5
+    _pydev_imports_tipper = _pydev_jy_imports_tipper
 
 except ImportError:
     #it is python
     IS_JYTHON = False
     SERVER_NAME = 'pycompletionserver'
     from threading import Thread
-    import importsTipper
+    import _pydev_imports_tipper
 
 
 import sys
@@ -316,7 +316,7 @@ def run(self):
                             if data.startswith(MSG_IMPORTS):
                                 data = data.replace(MSG_IMPORTS, '')
                                 data = unquote_plus(data)
-                                defFile, comps = importsTipper.GenerateTip(data, log)
+                                defFile, comps = _pydev_imports_tipper.GenerateTip(data, log)
                                 returnMsg = self.getCompletionsMessage(defFile, comps)
 
                             elif data.startswith(MSG_CHANGE_PYTHONPATH):
@@ -328,7 +328,7 @@ def run(self):
                             elif data.startswith(MSG_SEARCH):
                                 data = data.replace(MSG_SEARCH, '')
                                 data = unquote_plus(data)
-                                (f, line, col), foundAs = importsTipper.Search(data)
+                                (f, line, col), foundAs = _pydev_imports_tipper.Search(data)
                                 returnMsg = self.getCompletionsMessage(f, [(line, col, foundAs)])
 
                             elif data.startswith(MSG_CHANGE_DIR):

diff --git a/plugins/org.python.pydev/PySrc/pydev_console_utils.py b/plugins/org.python.pydev/PySrc/pydev_console_utils.py
@@ -216,8 +216,8 @@ def getDescription(self, text):
                         if doc is not None:
                             return doc
 
-                        import jyimportsTipper
-                        is_method, infos = jyimportsTipper.ismethod(obj)
+                        import _pydev_jy_imports_tipper
+                        is_method, infos = _pydev_jy_imports_tipper.ismethod(obj)
                         ret = ''
                         if is_method:
                             for info in infos:

diff --git a/...ython.pydev.debug/pysrc/pydev_coverage.py → .../org.python.pydev/PySrc/pydev_coverage.py b/...ython.pydev.debug/pysrc/pydev_coverage.py → .../org.python.pydev/PySrc/pydev_coverage.py
diff --git a/plugins/org.python.pydev/PySrc/pydev_ipython_console.py b/plugins/org.python.pydev/PySrc/pydev_ipython_console.py
@@ -57,7 +57,7 @@ def getCompletions(self, text, act_tok):
                 return ret
 
             #Otherwise, use the default PyDev completer (to get nice icons)
-            from _completer import Completer
+            from _pydev_completer import Completer
             completer = Completer(self.getNamespace(), None)
             return completer.complete(act_tok)
         except:

diff --git a/...ython.pydev.debug/pysrc/pydev_runfiles.py → .../org.python.pydev/PySrc/pydev_runfiles.py b/...ython.pydev.debug/pysrc/pydev_runfiles.py → .../org.python.pydev/PySrc/pydev_runfiles.py
diff --git a/...ev.debug/pysrc/pydev_runfiles_coverage.py → ...on.pydev/PySrc/pydev_runfiles_coverage.py b/...ev.debug/pysrc/pydev_runfiles_coverage.py → ...on.pydev/PySrc/pydev_runfiles_coverage.py
diff --git a/....pydev.debug/pysrc/pydev_runfiles_nose.py → ...python.pydev/PySrc/pydev_runfiles_nose.py b/....pydev.debug/pysrc/pydev_runfiles_nose.py → ...python.pydev/PySrc/pydev_runfiles_nose.py
diff --git a/...ev.debug/pysrc/pydev_runfiles_parallel.py → ...on.pydev/PySrc/pydev_runfiles_parallel.py b/...ev.debug/pysrc/pydev_runfiles_parallel.py → ...on.pydev/PySrc/pydev_runfiles_parallel.py
diff --git a/...g/pysrc/pydev_runfiles_parallel_client.py → ...v/PySrc/pydev_runfiles_parallel_client.py b/...g/pysrc/pydev_runfiles_parallel_client.py → ...v/PySrc/pydev_runfiles_parallel_client.py
diff --git a/...ydev.debug/pysrc/pydev_runfiles_pytest.py → ...thon.pydev/PySrc/pydev_runfiles_pytest.py b/...ydev.debug/pysrc/pydev_runfiles_pytest.py → ...thon.pydev/PySrc/pydev_runfiles_pytest.py
diff --git a/...ev.debug/pysrc/pydev_runfiles_unittest.py → ...on.pydev/PySrc/pydev_runfiles_unittest.py b/...ev.debug/pysrc/pydev_runfiles_unittest.py → ...on.pydev/PySrc/pydev_runfiles_unittest.py
diff --git a/...dev.debug/pysrc/pydev_runfiles_xml_rpc.py → ...hon.pydev/PySrc/pydev_runfiles_xml_rpc.py b/...dev.debug/pysrc/pydev_runfiles_xml_rpc.py → ...hon.pydev/PySrc/pydev_runfiles_xml_rpc.py
diff --git a/plugins/org.python.pydev/PySrc/pydevconsole.py b/plugins/org.python.pydev/PySrc/pydevconsole.py
@@ -130,7 +130,7 @@ def getNamespace(self):
 
     def getCompletions(self, text, act_tok):
         try:
-            from _completer import Completer
+            from _pydev_completer import Completer
             completer = Completer(self.namespace, None)
             return completer.complete(act_tok)
         except:

diff --git a/...ns/org.python.pydev.debug/pysrc/pydevd.py → plugins/org.python.pydev/PySrc/pydevd.py b/...ns/org.python.pydev.debug/pysrc/pydevd.py → plugins/org.python.pydev/PySrc/pydevd.py
diff --git a/...ug/pysrc/pydevd_additional_thread_info.py → ...ev/PySrc/pydevd_additional_thread_info.py b/...ug/pysrc/pydevd_additional_thread_info.py → ...ev/PySrc/pydevd_additional_thread_info.py
diff --git a/...g.python.pydev.debug/pysrc/pydevd_comm.py → ...ins/org.python.pydev/PySrc/pydevd_comm.py b/...g.python.pydev.debug/pysrc/pydevd_comm.py → ...ins/org.python.pydev/PySrc/pydevd_comm.py
@@ -791,12 +791,12 @@ def doIt(self, dbg):
         try:
             remove_path = None
             try:
-                import _completer
+                import _pydev_completer
             except:
                 path = os.environ['PYDEV_COMPLETER_PYTHONPATH']
                 sys.path.append(path)
                 remove_path = path
-                import _completer
+                import _pydev_completer
 
             try:
 
@@ -810,7 +810,7 @@ def doIt(self, dbg):
                     updated_globals.update(frame.f_globals)
                     updated_globals.update(frame.f_locals) #locals later because it has precedence over the actual globals
 
-                    completer = _completer.Completer(updated_globals, None)
+                    completer = _pydev_completer.Completer(updated_globals, None)
                     #list(tuple(name, descr, parameters, type))
                     completions = completer.complete(self.act_tok)
 

diff --git a/...ython.pydev.debug/pysrc/pydevd_console.py → .../org.python.pydev/PySrc/pydevd_console.py b/...ython.pydev.debug/pysrc/pydevd_console.py → .../org.python.pydev/PySrc/pydevd_console.py
@@ -4,7 +4,7 @@
 import sys
 import traceback
 
-import copied_completer
+import _pydev_completer
 from pydevd_tracing import GetExceptionTracebackStr
 from pydevd_vars import makeValidXmlValue
 
@@ -213,7 +213,7 @@ def get_completions(frame, act_tok):
     """
     msg = ""
     if frame is not None:
-        completer = copied_completer.Completer(get_frame_variables(frame), None)
+        completer = _pydev_completer.Completer(get_frame_variables(frame), None)
         completions = completer.complete(act_tok) #return list of tuple(name, description, parameters, type)
 
         msg = "<xml>"

diff --git a/...hon.pydev.debug/pysrc/pydevd_constants.py → ...rg.python.pydev/PySrc/pydevd_constants.py b/...hon.pydev.debug/pysrc/pydevd_constants.py → ...rg.python.pydev/PySrc/pydevd_constants.py
diff --git a/...g.python.pydev.debug/pysrc/pydevd_exec.py → ...ins/org.python.pydev/PySrc/pydevd_exec.py b/...g.python.pydev.debug/pysrc/pydevd_exec.py → ...ins/org.python.pydev/PySrc/pydevd_exec.py
diff --git a/....python.pydev.debug/pysrc/pydevd_exec2.py → ...ns/org.python.pydev/PySrc/pydevd_exec2.py b/....python.pydev.debug/pysrc/pydevd_exec2.py → ...ns/org.python.pydev/PySrc/pydevd_exec2.py
diff --git a/...on.pydev.debug/pysrc/pydevd_file_utils.py → ...g.python.pydev/PySrc/pydevd_file_utils.py b/...on.pydev.debug/pysrc/pydevd_file_utils.py → ...g.python.pydev/PySrc/pydevd_file_utils.py
diff --git a/....python.pydev.debug/pysrc/pydevd_frame.py → ...ns/org.python.pydev/PySrc/pydevd_frame.py b/....python.pydev.debug/pysrc/pydevd_frame.py → ...ns/org.python.pydev/PySrc/pydevd_frame.py
diff --git a/....pydev.debug/pysrc/pydevd_import_class.py → ...python.pydev/PySrc/pydevd_import_class.py b/....pydev.debug/pysrc/pydevd_import_class.py → ...python.pydev/PySrc/pydevd_import_class.py
@@ -1,4 +1,4 @@
-#Note: code gotten from importsTipper.
+#Note: code gotten from _pydev_imports_tipper.
 
 import sys
 

diff --git a/...org.python.pydev.debug/pysrc/pydevd_io.py → plugins/org.python.pydev/PySrc/pydevd_io.py b/...org.python.pydev.debug/pysrc/pydevd_io.py → plugins/org.python.pydev/PySrc/pydevd_io.py
diff --git a/...on.pydev.debug/pysrc/pydevd_psyco_stub.py → ...g.python.pydev/PySrc/pydevd_psyco_stub.py b/...on.pydev.debug/pysrc/pydevd_psyco_stub.py → ...g.python.pydev/PySrc/pydevd_psyco_stub.py
diff --git a/...python.pydev.debug/pysrc/pydevd_reload.py → ...s/org.python.pydev/PySrc/pydevd_reload.py b/...python.pydev.debug/pysrc/pydevd_reload.py → ...s/org.python.pydev/PySrc/pydevd_reload.py
diff --git a/...thon.pydev.debug/pysrc/pydevd_resolver.py → ...org.python.pydev/PySrc/pydevd_resolver.py b/...thon.pydev.debug/pysrc/pydevd_resolver.py → ...org.python.pydev/PySrc/pydevd_resolver.py
diff --git a/...pydev.debug/pysrc/pydevd_traceproperty.py → ...ython.pydev/PySrc/pydevd_traceproperty.py b/...pydev.debug/pysrc/pydevd_traceproperty.py → ...ython.pydev/PySrc/pydevd_traceproperty.py
diff --git a/...ython.pydev.debug/pysrc/pydevd_tracing.py → .../org.python.pydev/PySrc/pydevd_tracing.py b/...ython.pydev.debug/pysrc/pydevd_tracing.py → .../org.python.pydev/PySrc/pydevd_tracing.py
diff --git a/...g.python.pydev.debug/pysrc/pydevd_vars.py → ...ins/org.python.pydev/PySrc/pydevd_vars.py b/...g.python.pydev.debug/pysrc/pydevd_vars.py → ...ins/org.python.pydev/PySrc/pydevd_vars.py
diff --git a/...ython.pydev.debug/pysrc/pydevd_vm_type.py → .../org.python.pydev/PySrc/pydevd_vm_type.py b/...ython.pydev.debug/pysrc/pydevd_vm_type.py → .../org.python.pydev/PySrc/pydevd_vm_type.py
diff --git a/.../org.python.pydev.debug/pysrc/runfiles.py → plugins/org.python.pydev/PySrc/runfiles.py b/.../org.python.pydev.debug/pysrc/runfiles.py → plugins/org.python.pydev/PySrc/runfiles.py
diff --git a/plugins/org.python.pydev/PySrc/tests/test_jyserver.py b/plugins/org.python.pydev/PySrc/tests/test_jyserver.py
@@ -155,9 +155,9 @@ def sendKillMsg(self, socket):
 
 
 
-#"C:\Program Files\Java\jdk1.5.0_04\bin\java.exe" -Dpython.path="C:\bin\jython21\Lib";"C:\bin\jython21";"C:\Program Files\Java\jdk1.5.0_04\jre\lib\rt.jar" -classpath C:/bin/jython21/jython.jar org.python.util.jython D:\eclipse_workspace\org.python.pydev\PySrc\pycompletionserver.py 53795 58659
+#"C:\Program Files\Java\jdk1.5.0_04\bin\java.exe" -Dpython.path="C:\bin\jython21\Lib";"C:\bin\jython21";"C:\Program Files\Java\jdk1.5.0_04\jre\lib\rt.jar" -classpath C:/bin/jython21/jython.jar org.python.util.jython D:\eclipse_workspace\org.python.pydev\pysrc\pycompletionserver.py 53795 58659
 #
-#"C:\Program Files\Java\jdk1.5.0_04\bin\java.exe" -Dpython.path="C:\bin\jython21\Lib";"C:\bin\jython21";"C:\Program Files\Java\jdk1.5.0_04\jre\lib\rt.jar" -classpath C:/bin/jython21/jython.jar org.python.util.jython D:\eclipse_workspace\org.python.pydev\PySrc\tests\test_jyserver.py
+#"C:\Program Files\Java\jdk1.5.0_04\bin\java.exe" -Dpython.path="C:\bin\jython21\Lib";"C:\bin\jython21";"C:\Program Files\Java\jdk1.5.0_04\jre\lib\rt.jar" -classpath C:/bin/jython21/jython.jar org.python.util.jython D:\eclipse_workspace\org.python.pydev\pysrc\tests\test_jyserver.py
 #
 #"C:\Program Files\Java\jdk1.5.0_04\bin\java.exe" -Dpython.path="C:\bin\jython21\Lib";"C:\bin\jython21";"C:\Program Files\Java\jdk1.5.0_04\jre\lib\rt.jar" -classpath C:/bin/jython21/jython.jar org.python.util.jython d:\runtime-workbench-workspace\jython_test\src\test.py        
 if __name__ == '__main__':

diff --git a/plugins/org.python.pydev/PySrc/tests/test_jysimpleTipper.py b/plugins/org.python.pydev/PySrc/tests/test_jysimpleTipper.py
@@ -1,5 +1,5 @@
 #line to run:
-#java -classpath D:\bin\jython-2.1\jython.jar;D:\bin\eclipse331_1\plugins\org.junit_3.8.2.v200706111738\junit.jar;D:\bin\eclipse331_1\plugins\org.apache.ant_1.7.0.v200706080842\lib\ant.jar org.python.util.jython w:\org.python.pydev\PySrc\tests\test_jysimpleTipper.py
+#java -classpath D:\bin\jython-2.1\jython.jar;D:\bin\eclipse331_1\plugins\org.junit_3.8.2.v200706111738\junit.jar;D:\bin\eclipse331_1\plugins\org.apache.ant_1.7.0.v200706080842\lib\ant.jar org.python.util.jython w:\org.python.pydev\pysrc\tests\test_jysimpleTipper.py
 
 import unittest
 import os
@@ -15,10 +15,10 @@
 #sys.path.insert(1, r"D:\bin\eclipse331_1\plugins\org.apache.ant_1.7.0.v200706080842\lib\ant.jar" ) #some late loading jar tests
 
 if sys.platform.find('java') != -1:
-    from jyimportsTipper import ismethod
-    from jyimportsTipper import isclass
-    from jyimportsTipper import dirObj
-    import jyimportsTipper
+    from _pydev_jy_imports_tipper import ismethod
+    from _pydev_jy_imports_tipper import isclass
+    from _pydev_jy_imports_tipper import dirObj
+    import _pydev_jy_imports_tipper
     from java.lang.reflect import Method #@UnresolvedImport
     from java.lang import System #@UnresolvedImport
     from java.lang import String #@UnresolvedImport
@@ -56,103 +56,103 @@ def assertIn(self, tok, tips):
         raise AssertionError('%s not in %s' % (tok, s))
 
     def testImports1a(self):
-        f, tip = jyimportsTipper.GenerateTip('java.util.HashMap')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('java.util.HashMap')
         assert f.endswith('rt.jar')
 
     def testImports1c(self):
-        f, tip = jyimportsTipper.GenerateTip('java.lang.Class')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('java.lang.Class')
         assert f.endswith('rt.jar')
 
     def testImports1b(self):
         try:
-            f, tip = jyimportsTipper.GenerateTip('__builtin__.m')
+            f, tip = _pydev_jy_imports_tipper.GenerateTip('__builtin__.m')
             self.fail('err')
         except:
             pass
 
     def testImports1(self):
-        f, tip = jyimportsTipper.GenerateTip('junit.framework.TestCase')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('junit.framework.TestCase')
         assert f.endswith('junit.jar')
         ret = self.assertIn('assertEquals', tip)
 #        self.assertEquals('', ret[2])
 
     def testImports2(self):
-        f, tip = jyimportsTipper.GenerateTip('junit.framework')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('junit.framework')
         assert f.endswith('junit.jar')
         ret = self.assertIn('TestCase', tip)
         self.assertEquals('', ret[2])
 
     def testImports2a(self):
-        f, tip = jyimportsTipper.GenerateTip('org.apache.tools.ant')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('org.apache.tools.ant')
         assert f.endswith('ant.jar')
         ret = self.assertIn('Task', tip)
         self.assertEquals('', ret[2])
 
     def testImports3(self):
-        f, tip = jyimportsTipper.GenerateTip('os')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('os')
         assert f.endswith('os.py')
         ret = self.assertIn('path', tip)
         self.assertEquals('', ret[2])
 
     def testTipOnString(self):
-        f, tip = jyimportsTipper.GenerateTip('string')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('string')
         self.assertIn('join', tip)
         self.assertIn('uppercase', tip)
 
     def testImports(self):
-        tip = jyimportsTipper.GenerateTip('__builtin__')[1]
+        tip = _pydev_jy_imports_tipper.GenerateTip('__builtin__')[1]
         self.assertIn('tuple'          , tip)
         self.assertIn('RuntimeError'   , tip)
         self.assertIn('RuntimeWarning' , tip)
 
     def testImports5(self):
-        f, tip = jyimportsTipper.GenerateTip('java.lang')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('java.lang')
         assert f.endswith('rt.jar')
         tup = self.assertIn('String' , tip)
-        self.assertEquals(str(jyimportsTipper.TYPE_CLASS), tup[3])
+        self.assertEquals(str(_pydev_jy_imports_tipper.TYPE_CLASS), tup[3])
 
-        tip = jyimportsTipper.GenerateTip('java')[1]
+        tip = _pydev_jy_imports_tipper.GenerateTip('java')[1]
         tup = self.assertIn('lang' , tip)
-        self.assertEquals(str(jyimportsTipper.TYPE_IMPORT), tup[3])
+        self.assertEquals(str(_pydev_jy_imports_tipper.TYPE_IMPORT), tup[3])
 
-        tip = jyimportsTipper.GenerateTip('java.lang.String')[1]
+        tip = _pydev_jy_imports_tipper.GenerateTip('java.lang.String')[1]
         tup = self.assertIn('indexOf'          , tip)
-        self.assertEquals(str(jyimportsTipper.TYPE_FUNCTION), tup[3])
+        self.assertEquals(str(_pydev_jy_imports_tipper.TYPE_FUNCTION), tup[3])
 
-        tip = jyimportsTipper.GenerateTip('java.lang.String')[1]
+        tip = _pydev_jy_imports_tipper.GenerateTip('java.lang.String')[1]
         tup = self.assertIn('charAt'          , tip)
-        self.assertEquals(str(jyimportsTipper.TYPE_FUNCTION), tup[3])
+        self.assertEquals(str(_pydev_jy_imports_tipper.TYPE_FUNCTION), tup[3])
         self.assertEquals('(int)', tup[2])
 
         tup = self.assertIn('format'          , tip)
-        self.assertEquals(str(jyimportsTipper.TYPE_FUNCTION), tup[3])
+        self.assertEquals(str(_pydev_jy_imports_tipper.TYPE_FUNCTION), tup[3])
         self.assertEquals('(string, objectArray)', tup[2])
         self.assert_(tup[1].find('[Ljava.lang.Object;') == -1)
 
         tup = self.assertIn('getBytes'          , tip)
-        self.assertEquals(str(jyimportsTipper.TYPE_FUNCTION), tup[3])
+        self.assertEquals(str(_pydev_jy_imports_tipper.TYPE_FUNCTION), tup[3])
         self.assert_(tup[1].find('[B') == -1)
         self.assert_(tup[1].find('byte[]') != -1)
 
-        f, tip = jyimportsTipper.GenerateTip('__builtin__.str')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('__builtin__.str')
         assert f.endswith('jython.jar')
         self.assertIn('find'          , tip)
 
-        f, tip = jyimportsTipper.GenerateTip('__builtin__.dict')
+        f, tip = _pydev_jy_imports_tipper.GenerateTip('__builtin__.dict')
         assert f.endswith('jython.jar')
         self.assertIn('get'          , tip)
 
 
 class TestSearch(unittest.TestCase):
 
     def testSearchOnJython(self):
-        self.assertEqual('javaos.py', jyimportsTipper.Search('os')[0][0].split(os.sep)[-1])
-        self.assertEqual(0, jyimportsTipper.Search('os')[0][1])
+        self.assertEqual('javaos.py', _pydev_jy_imports_tipper.Search('os')[0][0].split(os.sep)[-1])
+        self.assertEqual(0, _pydev_jy_imports_tipper.Search('os')[0][1])
 
-        self.assertEqual('javaos.py', jyimportsTipper.Search('os.makedirs')[0][0].split(os.sep)[-1])
-        self.assertNotEqual(0, jyimportsTipper.Search('os.makedirs')[0][1])
+        self.assertEqual('javaos.py', _pydev_jy_imports_tipper.Search('os.makedirs')[0][0].split(os.sep)[-1])
+        self.assertNotEqual(0, _pydev_jy_imports_tipper.Search('os.makedirs')[0][1])
 
-        #print jyimportsTipper.Search('os.makedirs')
+        #print _pydev_jy_imports_tipper.Search('os.makedirs')
 
 class TestCompl(unittest.TestCase):
 
@@ -167,12 +167,12 @@ def testGettingInfoOnJython(self):
         dbg('\n\n--------------------------- java')
         assert not ismethod(java)[0]
         assert not isclass(java)
-        assert jyimportsTipper.ismodule(java)
+        assert _pydev_jy_imports_tipper.ismodule(java)
 
         dbg('\n\n--------------------------- java.lang')
         assert not ismethod(java.lang)[0]
         assert not isclass(java.lang)
-        assert jyimportsTipper.ismodule(java.lang)
+        assert _pydev_jy_imports_tipper.ismodule(java.lang)
 
         dbg('\n\n--------------------------- Method')
         assert not ismethod(Method)[0]

diff --git a/plugins/org.python.pydev/PySrc/tests/test_simpleTipper.py b/plugins/org.python.pydev/PySrc/tests/test_simpleTipper.py
@@ -20,7 +20,7 @@
     HAS_WX = False
 
     import unittest
-    import importsTipper
+    import _pydev_imports_tipper
     import inspect
 
     class Test(unittest.TestCase):
@@ -30,27 +30,27 @@ def p(self, t):
                 sys.stdout.write('%s\n' % (a,))
 
         def testImports3(self):
-            tip = importsTipper.GenerateTip('os')
+            tip = _pydev_imports_tipper.GenerateTip('os')
             ret = self.assertIn('path', tip)
             self.assertEquals('', ret[2])
 
         def testImports2(self):
             try:
-                tip = importsTipper.GenerateTip('OpenGL.GLUT')
+                tip = _pydev_imports_tipper.GenerateTip('OpenGL.GLUT')
                 self.assertIn('glutDisplayFunc', tip)
                 self.assertIn('glutInitDisplayMode', tip)
             except ImportError:
                 pass
 
         def testImports4(self):
             try:
-                tip = importsTipper.GenerateTip('mx.DateTime.mxDateTime.mxDateTime')
+                tip = _pydev_imports_tipper.GenerateTip('mx.DateTime.mxDateTime.mxDateTime')
                 self.assertIn('now', tip)
             except ImportError:
                 pass
 
         def testImports5(self):
-            tip = importsTipper.GenerateTip('__builtin__.list')
+            tip = _pydev_imports_tipper.GenerateTip('__builtin__.list')
             s = self.assertIn('sort', tip)
             self.CheckArgs(
                 s, 
@@ -60,16 +60,16 @@ def testImports5(self):
             )
 
         def testImports2a(self):
-            tips = importsTipper.GenerateTip('%s.RuntimeError' % BUILTIN_MOD)
+            tips = _pydev_imports_tipper.GenerateTip('%s.RuntimeError' % BUILTIN_MOD)
             self.assertIn('__doc__', tips)
 
         def testImports2b(self):
-            tips = importsTipper.GenerateTip('%s' % BUILTIN_MOD)
+            tips = _pydev_imports_tipper.GenerateTip('%s' % BUILTIN_MOD)
             t = self.assertIn('file' , tips)
             self.assert_('->' in t[1].strip() or 'file' in t[1])
 
         def testImports2c(self):
-            tips = importsTipper.GenerateTip('%s.file' % BUILTIN_MOD)
+            tips = _pydev_imports_tipper.GenerateTip('%s.file' % BUILTIN_MOD)
             t = self.assertIn('readlines' , tips)
             self.assert_('->' in t[1] or 'sizehint' in t[1])
 
@@ -78,30 +78,30 @@ def testImports(self):
             You can print_ the results to check...
             '''
             if HAS_WX:
-                tip = importsTipper.GenerateTip('wxPython.wx')
+                tip = _pydev_imports_tipper.GenerateTip('wxPython.wx')
                 self.assertIn('wxApp'        , tip)
 
-                tip = importsTipper.GenerateTip('wxPython.wx.wxApp')
+                tip = _pydev_imports_tipper.GenerateTip('wxPython.wx.wxApp')
 
                 try:
-                    tip = importsTipper.GenerateTip('qt')
+                    tip = _pydev_imports_tipper.GenerateTip('qt')
                     self.assertIn('QWidget'        , tip)
                     self.assertIn('QDialog'        , tip)
 
-                    tip = importsTipper.GenerateTip('qt.QWidget')
+                    tip = _pydev_imports_tipper.GenerateTip('qt.QWidget')
                     self.assertIn('rect'           , tip)
                     self.assertIn('rect'           , tip)
                     self.assertIn('AltButton'      , tip)
 
-                    tip = importsTipper.GenerateTip('qt.QWidget.AltButton')
+                    tip = _pydev_imports_tipper.GenerateTip('qt.QWidget.AltButton')
                     self.assertIn('__xor__'      , tip)
 
-                    tip = importsTipper.GenerateTip('qt.QWidget.AltButton.__xor__')
+                    tip = _pydev_imports_tipper.GenerateTip('qt.QWidget.AltButton.__xor__')
                     self.assertIn('__class__'      , tip)
                 except ImportError:
                     pass
 
-            tip = importsTipper.GenerateTip(BUILTIN_MOD)
+            tip = _pydev_imports_tipper.GenerateTip(BUILTIN_MOD)
     #        for t in tip[1]:
     #            print_ t
             self.assertIn('object'         , tip)
@@ -134,7 +134,7 @@ def testImports(self):
                     compiler_module = None
 
             if compiler_module is not None: #Not available in iron python
-                tip = importsTipper.GenerateTip(compiler_module) 
+                tip = _pydev_imports_tipper.GenerateTip(compiler_module) 
                 if compiler_module == 'compiler':
                     self.assertArgs('parse', '(buf, mode)', tip)
                     self.assertArgs('walk', '(tree, visitor, walker, verbose)', tip)
@@ -167,17 +167,17 @@ def assertIn(self, tok, tips):
 
 
         def testSearch(self):
-            s = importsTipper.Search('inspect.ismodule')
+            s = _pydev_imports_tipper.Search('inspect.ismodule')
             (f, line, col), foundAs = s
             self.assert_(line > 0)
 
 
         def testDotNetLibraries(self):
             if sys.platform == 'cli':
-                tip = importsTipper.GenerateTip('System.Drawing')
+                tip = _pydev_imports_tipper.GenerateTip('System.Drawing')
                 self.assertIn('Brushes' , tip)
 
-                tip = importsTipper.GenerateTip('System.Drawing.Brushes')
+                tip = _pydev_imports_tipper.GenerateTip('System.Drawing.Brushes')
                 self.assertIn('Aqua' , tip)
 
 

diff --git a/...bug/pysrc/tests_python/_debugger_case1.py → ...dev/PySrc/tests_python/_debugger_case1.py b/...bug/pysrc/tests_python/_debugger_case1.py → ...dev/PySrc/tests_python/_debugger_case1.py
diff --git a/...ug/pysrc/tests_python/_debugger_case10.py → ...ev/PySrc/tests_python/_debugger_case10.py b/...ug/pysrc/tests_python/_debugger_case10.py → ...ev/PySrc/tests_python/_debugger_case10.py
diff --git a/...ug/pysrc/tests_python/_debugger_case13.py → ...ev/PySrc/tests_python/_debugger_case13.py b/...ug/pysrc/tests_python/_debugger_case13.py → ...ev/PySrc/tests_python/_debugger_case13.py
diff --git a/...ug/pysrc/tests_python/_debugger_case14.py → ...ev/PySrc/tests_python/_debugger_case14.py b/...ug/pysrc/tests_python/_debugger_case14.py → ...ev/PySrc/tests_python/_debugger_case14.py
diff --git a/...bug/pysrc/tests_python/_debugger_case2.py → ...dev/PySrc/tests_python/_debugger_case2.py b/...bug/pysrc/tests_python/_debugger_case2.py → ...dev/PySrc/tests_python/_debugger_case2.py
diff --git a/...bug/pysrc/tests_python/_debugger_case3.py → ...dev/PySrc/tests_python/_debugger_case3.py b/...bug/pysrc/tests_python/_debugger_case3.py → ...dev/PySrc/tests_python/_debugger_case3.py
diff --git a/...bug/pysrc/tests_python/_debugger_case4.py → ...dev/PySrc/tests_python/_debugger_case4.py b/...bug/pysrc/tests_python/_debugger_case4.py → ...dev/PySrc/tests_python/_debugger_case4.py
diff --git a/...ug/pysrc/tests_python/_debugger_case56.py → ...ev/PySrc/tests_python/_debugger_case56.py b/...ug/pysrc/tests_python/_debugger_case56.py → ...ev/PySrc/tests_python/_debugger_case56.py
diff --git a/...bug/pysrc/tests_python/_debugger_case7.py → ...dev/PySrc/tests_python/_debugger_case7.py b/...bug/pysrc/tests_python/_debugger_case7.py → ...dev/PySrc/tests_python/_debugger_case7.py
diff --git a/...ug/pysrc/tests_python/_debugger_case89.py → ...ev/PySrc/tests_python/_debugger_case89.py b/...ug/pysrc/tests_python/_debugger_case89.py → ...ev/PySrc/tests_python/_debugger_case89.py
diff --git a/...sts_python/test_additional_thread_info.py → ...sts_python/test_additional_thread_info.py b/...sts_python/test_additional_thread_info.py → ...sts_python/test_additional_thread_info.py
diff --git a/...debug/pysrc/tests_python/test_debugger.py → ...pydev/PySrc/tests_python/test_debugger.py b/...debug/pysrc/tests_python/test_debugger.py → ...pydev/PySrc/tests_python/test_debugger.py
diff --git a/...dev.debug/pysrc/tests/samples/__init__.py → .../PySrc/tests_runfiles/samples/__init__.py b/...dev.debug/pysrc/tests/samples/__init__.py → .../PySrc/tests_runfiles/samples/__init__.py
diff --git a/...ysrc/tests/samples/nested_dir/__init__.py → ...s_runfiles/samples/nested_dir/__init__.py b/...ysrc/tests/samples/nested_dir/__init__.py → ...s_runfiles/samples/nested_dir/__init__.py
diff --git a/...ts/samples/nested_dir/nested2/__init__.py → ...es/samples/nested_dir/nested2/__init__.py b/...ts/samples/nested_dir/nested2/__init__.py → ...es/samples/nested_dir/nested2/__init__.py
diff --git a/...ples/nested_dir/nested2/deep_nest_test.py → ...ples/nested_dir/nested2/deep_nest_test.py b/...ples/nested_dir/nested2/deep_nest_test.py → ...ples/nested_dir/nested2/deep_nest_test.py
diff --git a/...mples/nested_dir/nested2/non_test_file.py → ...mples/nested_dir/nested2/non_test_file.py b/...mples/nested_dir/nested2/non_test_file.py → ...mples/nested_dir/nested2/non_test_file.py
diff --git a/...ts/samples/nested_dir/nested3/__init__.py → ...es/samples/nested_dir/nested3/__init__.py b/...ts/samples/nested_dir/nested3/__init__.py → ...es/samples/nested_dir/nested3/__init__.py
diff --git a/...tests/samples/nested_dir/nested3/junk.txt → ...files/samples/nested_dir/nested3/junk.txt b/...tests/samples/nested_dir/nested3/junk.txt → ...files/samples/nested_dir/nested3/junk.txt
diff --git a/...mples/nested_dir/nested3/non_test_file.py → ...mples/nested_dir/nested3/non_test_file.py b/...mples/nested_dir/nested3/non_test_file.py → ...mples/nested_dir/nested3/non_test_file.py
diff --git a/...tests/samples/nested_dir/non_test_file.py → ...files/samples/nested_dir/non_test_file.py b/...tests/samples/nested_dir/non_test_file.py → ...files/samples/nested_dir/non_test_file.py
diff --git a/.../tests/samples/nested_dir/simple4_test.py → ...nfiles/samples/nested_dir/simple4_test.py b/.../tests/samples/nested_dir/simple4_test.py → ...nfiles/samples/nested_dir/simple4_test.py
diff --git a/...ebug/pysrc/tests/samples/non_test_file.py → ...c/tests_runfiles/samples/non_test_file.py b/...ebug/pysrc/tests/samples/non_test_file.py → ...c/tests_runfiles/samples/non_test_file.py
diff --git a/...debug/pysrc/tests/samples/simple2_test.py → ...rc/tests_runfiles/samples/simple2_test.py b/...debug/pysrc/tests/samples/simple2_test.py → ...rc/tests_runfiles/samples/simple2_test.py
diff --git a/...debug/pysrc/tests/samples/simple3_test.py → ...rc/tests_runfiles/samples/simple3_test.py b/...debug/pysrc/tests/samples/simple3_test.py → ...rc/tests_runfiles/samples/simple3_test.py
diff --git a/....debug/pysrc/tests/samples/simple_test.py → ...Src/tests_runfiles/samples/simple_test.py b/....debug/pysrc/tests/samples/simple_test.py → ...Src/tests_runfiles/samples/simple_test.py
diff --git a/...debug/pysrc/tests/test_pydevd_property.py → ...rc/tests_runfiles/test_pydevd_property.py b/...debug/pysrc/tests/test_pydevd_property.py → ...rc/tests_runfiles/test_pydevd_property.py
diff --git a/...v.debug/pysrc/tests/test_pydevd_reload.py → ...ySrc/tests_runfiles/test_pydevd_reload.py b/...v.debug/pysrc/tests/test_pydevd_reload.py → ...ySrc/tests_runfiles/test_pydevd_reload.py
diff --git a/....pydev.debug/pysrc/tests/test_pydevdio.py → ...dev/PySrc/tests_runfiles/test_pydevdio.py b/....pydev.debug/pysrc/tests/test_pydevdio.py → ...dev/PySrc/tests_runfiles/test_pydevdio.py
diff --git a/....pydev.debug/pysrc/tests/test_runfiles.py → ...dev/PySrc/tests_runfiles/test_runfiles.py b/....pydev.debug/pysrc/tests/test_runfiles.py → ...dev/PySrc/tests_runfiles/test_runfiles.py
diff --git a/...python.pydev/PySrc/ThirdParty/__init__.py → ...ython.pydev/PySrc/third_party/__init__.py b/...python.pydev/PySrc/ThirdParty/__init__.py → ...ython.pydev/PySrc/third_party/__init__.py
diff --git a/...ython.pydev/PySrc/ThirdParty/pep8/pep8.py → ...thon.pydev/PySrc/third_party/pep8/pep8.py b/...ython.pydev/PySrc/ThirdParty/pep8/pep8.py → ...thon.pydev/PySrc/third_party/pep8/pep8.py
diff --git a/...arty/wrapped_for_pydev/ctypes/__init__.py → ...arty/wrapped_for_pydev/ctypes/__init__.py b/...arty/wrapped_for_pydev/ctypes/__init__.py → ...arty/wrapped_for_pydev/ctypes/__init__.py
diff --git a/...arty/wrapped_for_pydev/ctypes/_ctypes.dll → ...arty/wrapped_for_pydev/ctypes/_ctypes.dll b/...arty/wrapped_for_pydev/ctypes/_ctypes.dll → ...arty/wrapped_for_pydev/ctypes/_ctypes.dll
diff --git a/...Party/wrapped_for_pydev/ctypes/_endian.py → ...party/wrapped_for_pydev/ctypes/_endian.py b/...Party/wrapped_for_pydev/ctypes/_endian.py → ...party/wrapped_for_pydev/ctypes/_endian.py
diff --git a/...rapped_for_pydev/ctypes/ctypes-README.txt → ...rapped_for_pydev/ctypes/ctypes-README.txt b/...rapped_for_pydev/ctypes/ctypes-README.txt → ...rapped_for_pydev/ctypes/ctypes-README.txt
diff --git a/...ped_for_pydev/ctypes/macholib/__init__.py → ...ped_for_pydev/ctypes/macholib/__init__.py b/...ped_for_pydev/ctypes/macholib/__init__.py → ...ped_for_pydev/ctypes/macholib/__init__.py
diff --git a/...wrapped_for_pydev/ctypes/macholib/dyld.py → ...wrapped_for_pydev/ctypes/macholib/dyld.py b/...wrapped_for_pydev/ctypes/macholib/dyld.py → ...wrapped_for_pydev/ctypes/macholib/dyld.py
diff --git a/...rapped_for_pydev/ctypes/macholib/dylib.py → ...rapped_for_pydev/ctypes/macholib/dylib.py b/...rapped_for_pydev/ctypes/macholib/dylib.py → ...rapped_for_pydev/ctypes/macholib/dylib.py
diff --git a/...ed_for_pydev/ctypes/macholib/framework.py → ...ed_for_pydev/ctypes/macholib/framework.py b/...ed_for_pydev/ctypes/macholib/framework.py → ...ed_for_pydev/ctypes/macholib/framework.py
diff --git a/...irdParty/wrapped_for_pydev/ctypes/util.py → ...rd_party/wrapped_for_pydev/ctypes/util.py b/...irdParty/wrapped_for_pydev/ctypes/util.py → ...rd_party/wrapped_for_pydev/ctypes/util.py
diff --git a/...arty/wrapped_for_pydev/ctypes/wintypes.py → ...arty/wrapped_for_pydev/ctypes/wintypes.py b/...arty/wrapped_for_pydev/ctypes/wintypes.py → ...arty/wrapped_for_pydev/ctypes/wintypes.py
diff --git a/...d_for_pydev/not_in_default_pythonpath.txt → ...d_for_pydev/not_in_default_pythonpath.txt b/...d_for_pydev/not_in_default_pythonpath.txt → ...d_for_pydev/not_in_default_pythonpath.txt
diff --git a/plugins/org.python.pydev/build.properties b/plugins/org.python.pydev/build.properties
@@ -1,6 +1,6 @@
 bin.includes = plugin.xml,\
                icons/,\
-               PySrc/,\
+               pysrc/,\
                META-INF/,\
                schema/,\
                pydev.jar,\

diff --git a/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java b/plugins/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java
@@ -387,9 +387,19 @@ public ResourceBundle getResourceBundle() {
      * @throws CoreException
      */
     public static File getScriptWithinPySrc(String targetExec) throws CoreException {
-        IPath relative = new Path("PySrc").addTrailingSeparator().append(targetExec);
+        IPath relative = new Path("pysrc").addTrailingSeparator().append(targetExec);
         return PydevPlugin.getBundleInfo().getRelativePath(relative);
     }
+
+    /**
+     * @return
+     * @throws CoreException 
+     */
+    public static File getPySrcPath() throws CoreException {
+        IPath relative = new Path("pysrc");
+        return PydevPlugin.getBundleInfo().getRelativePath(relative);
+    }
+
 
     private static ImageCache imageCache = null;
 

diff --git a/plugins/org.python.pydev/tests/org/python/pydev/jythontests/JythonTest.java b/plugins/org.python.pydev/tests/org/python/pydev/jythontests/JythonTest.java
@@ -104,7 +104,7 @@ public void testJythonTestsOnSeparateProcess() throws Exception {
 	        //has to be run on a separate process because it'll call exit()
 	        List<Throwable> errors = JythonTest.execAll("test", 
 	                new File[]{
-	                    new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"PySrc/tests"),
+	                    new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"pysrc/tests"),
 	        });
 	        if(errors.size() > 0){
 	            ByteArrayOutputStream out = new ByteArrayOutputStream();

diff --git a/plugins/org.python.pydev/tests/org/python/pydev/runners/SimplePythonRunnerTest.java b/plugins/org.python.pydev/tests/org/python/pydev/runners/SimplePythonRunnerTest.java
@@ -54,7 +54,7 @@ protected void tearDown() throws Exception {
      */
     public void testEnv() throws CoreException, IOException {
 
-        File relativePath = PydevPlugin.getBundleInfo().getRelativePath(new Path("PySrc/interpreterInfo.py"));
+        File relativePath = PydevPlugin.getBundleInfo().getRelativePath(new Path("pysrc/interpreterInfo.py"));
         String string = new SimplePythonRunner().runAndGetOutput(new String[] { TestDependent.PYTHON_EXE,
                 relativePath.getCanonicalPath() }, null, null, null).o1;
         assertNotNull(string);

diff --git a/plugins/org.python.pydev/tests/org/python/pydev/ui/BundleInfoStub.java b/plugins/org.python.pydev/tests/org/python/pydev/ui/BundleInfoStub.java
@@ -25,19 +25,19 @@ public class BundleInfoStub implements IBundleInfo {
 
     public File getRelativePath(IPath relative) throws CoreException {
         if(relative.toString().indexOf("interpreterInfo.py") != -1){
-            return new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"PySrc/interpreterInfo.py");
+            return new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"pysrc/interpreterInfo.py");
         }
         if(relative.toString().indexOf("pycompletionserver.py") != -1){
-            return new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"PySrc/pycompletionserver.py");
+            return new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"pysrc/pycompletionserver.py");
         }
         if(relative.toString().indexOf("jycompletionserver.py") != -1){
-            return new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"PySrc/jycompletionserver.py");
+            return new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"pysrc/jycompletionserver.py");
         }
         if(relative.toString().indexOf("indent.py") != -1){
             return new File(TestDependent.TEST_PYDEV_JYTHON_PLUGIN_LOC+"jysrc/indent.py");
         }
-        if(relative.toString().indexOf("PySrc/pydev_sitecustomize") != -1){
-        	return new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"PySrc/pydev_sitecustomize");
+        if(relative.toString().indexOf("pysrc/pydev_sitecustomize") != -1){
+        	return new File(TestDependent.TEST_PYDEV_PLUGIN_LOC+"pysrc/pydev_sitecustomize");
         }
         throw new RuntimeException("Not available info on: "+relative);
     }