diff --git a/python/helpers/generator3.py b/python/helpers/generator3.py
index aa03ca2929a2..57f92f29430a 100644
--- a/python/helpers/generator3.py
+++ b/python/helpers/generator3.py
@@ -2208,7 +2208,7 @@ def buildOutputName(subdir, name):
     global action
     quals = name.split(".")
     dirname = subdir
-    if dirname and not dirname.endswith(os.path.sep):
+    if dirname and not dirname.endswith("/") and not dirname.endswith("\\") :
         dirname += os.path.sep # "a -> a/"
     for pathindex in range(len(quals) - 1): # create dirs for all quals but last
         subdirname = dirname + os.path.sep.join(quals[0: pathindex + 1])
diff --git a/python/rest/resources/META-INF/rest.xml b/python/rest/resources/META-INF/rest.xml
index e5b5ec5a4480..b8e5f8db5da1 100644
--- a/python/rest/resources/META-INF/rest.xml
+++ b/python/rest/resources/META-INF/rest.xml
@@ -7,8 +7,6 @@
     <lang.parserDefinition language="ReST" implementationClass="com.jetbrains.rest.parsing.RestParserDefinition"/>
     <colorSettingsPage implementation="com.jetbrains.rest.RestColorsPage"/>
 
-    <projectService serviceInterface="com.jetbrains.python.ReSTService"
-                    serviceImplementation="com.jetbrains.python.ReSTService"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.DirectiveCompletionContributor"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.OptionCompletionContributor"/>
     <completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.ReferenceCompletionContributor"/>
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 6928878bbcc9..9f3368427094 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -91,6 +91,9 @@
 
     <targetElementEvaluator language="Python" implementationClass="com.jetbrains.python.codeInsight.PyTargetElementEvaluator"/>
 
+    <projectService serviceInterface="com.jetbrains.python.ReSTService"
+                    serviceImplementation="com.jetbrains.python.ReSTService"/>
+
     <!-- Run/Debug -->
     <applicationService serviceInterface="com.jetbrains.python.run.PyRunConfigurationFactory"
                         serviceImplementation="com.jetbrains.python.run.PyRunConfigurationFactoryImpl"/>