diff --git a/python/edu/src/META-INF/PyCharmEduPlugin.xml b/python/edu/src/META-INF/PyCharmEduPlugin.xml
index c0601a300810..1da5e69be499 100644
--- a/python/edu/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/edu/src/META-INF/PyCharmEduPlugin.xml
@@ -6,10 +6,6 @@
       <implementation-class>com.jetbrains.python.edu.PyCharmEduInitialConfigurator$First</implementation-class>
       <headless-implementation-class/>
     </component>
-    <component>
-      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
-      <implementation-class>com.jetbrains.python.console.PythonToolWindowConsoleRunnerFactory</implementation-class>
-    </component>
   </application-components>
 
   <xi:include href="/META-INF/IdeTipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/python/ide/src/META-INF/PyCharmCorePlugin.xml b/python/ide/src/META-INF/PyCharmCorePlugin.xml
index e5f00f76ad07..6548f04111d1 100644
--- a/python/ide/src/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide/src/META-INF/PyCharmCorePlugin.xml
@@ -3,10 +3,6 @@
   <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <application-components>
-    <component>
-      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
-      <implementation-class>com.jetbrains.python.console.PythonToolWindowConsoleRunnerFactory</implementation-class>
-    </component>
     <component>
       <implementation-class>com.jetbrains.python.PyCharmInitialConfigurator</implementation-class>
       <headless-implementation-class/>
diff --git a/python/pluginCore/META-INF/python-community-plugin-core.xml b/python/pluginCore/META-INF/python-community-plugin-core.xml
index 140c21785a4e..e467f308d0df 100644
--- a/python/pluginCore/META-INF/python-community-plugin-core.xml
+++ b/python/pluginCore/META-INF/python-community-plugin-core.xml
@@ -3,39 +3,14 @@
        both Community and Professional versions. -->
 
   <extensions defaultExtensionNs="com.intellij">
-    <moduleType id="PYTHON_MODULE" implementationClass="com.jetbrains.python.module.PythonModuleType"/>
-    <facetType implementation="com.jetbrains.python.facet.PythonFacetType"/>
-    <framework.detector implementation="com.jetbrains.python.facet.PythonFacetType$PythonFrameworkDetector"/>
-    <frameworkSupport implementation="com.jetbrains.python.facet.PythonFrameworkSupportProvider"/>
-    <projectStructureDetector implementation="com.jetbrains.python.module.PyProjectStructureDetector"/>
-    <moduleConfigurationEditorProvider implementation="com.jetbrains.python.module.PythonModuleConfigurationEditorProvider"/>
     <applicationService serviceInterface="com.jetbrains.python.run.PyCommonOptionsFormFactory"
                         serviceImplementation="com.jetbrains.python.run.PyPluginCommonOptionsFormFactory"/>
-    <completion.contributor language="Python" implementationClass="com.jetbrains.python.psi.impl.PyConstructorArgumentCompletionContributor"/>
-
-    <!-- Console folding for Jython only, thus it's located in python-plugin only -->
-    <stacktrace.fold substring="*sys-package-mgr*:"/>
   </extensions>
 
-  <application-components>
-    <component>
-      <implementation-class>com.jetbrains.python.facet.PythonSdkTableListener</implementation-class>
-    </component>
-  </application-components>
-
-  <module-components>
-    <component>
-      <implementation-class>com.jetbrains.python.facet.PythonFacetListener</implementation-class>
-    </component>
-  </module-components>
-
   <actions>
     <action id="PyManagePackages" class="com.jetbrains.python.packaging.PyManagePackagesAction" text="Manage Python Packages...">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
-
-    <action overrides="true" id="ForceStepInto" class="com.jetbrains.python.debugger.PyForceStepIntoAction" text="Fo_rce Step Into"
-            icon="AllIcons.Debugger.Actions.Force_step_into" description="Step into, ignore stepping filters for libraries, constructors, etc."/>
   </actions>
 
 </idea-plugin>
\ No newline at end of file
diff --git a/python/pluginCore/python-community-plugin-core.iml b/python/pluginCore/python-community-plugin-core.iml
index 5c5b806b5a00..e4eafd35625f 100644
--- a/python/pluginCore/python-community-plugin-core.iml
+++ b/python/pluginCore/python-community-plugin-core.iml
@@ -9,8 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="python-community" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/pluginJava/META-INF/python-community-plugin-java.xml b/python/pluginJava/META-INF/python-community-plugin-java.xml
index 7330818c828f..96f2bd98261e 100644
--- a/python/pluginJava/META-INF/python-community-plugin-java.xml
+++ b/python/pluginJava/META-INF/python-community-plugin-java.xml
@@ -2,7 +2,15 @@
   <!-- Components and extensions declared in this file work ONLY in the Python plugin,
        both Community and Professional versions. -->
   <extensions defaultExtensionNs="com.intellij">
+    <moduleType id="PYTHON_MODULE" implementationClass="com.jetbrains.python.module.PythonModuleType"/>
+    <facetType implementation="com.jetbrains.python.facet.PythonFacetType"/>
+    <framework.detector implementation="com.jetbrains.python.facet.PythonFacetType$PythonFrameworkDetector"/>
+    <frameworkSupport implementation="com.jetbrains.python.facet.PythonFrameworkSupportProvider"/>
+    <projectStructureDetector implementation="com.jetbrains.python.module.PyProjectStructureDetector"/>
+    <moduleConfigurationEditorProvider implementation="com.jetbrains.python.module.PythonModuleConfigurationEditorProvider"/>
     <completion.contributor language="Python" implementationClass="com.jetbrains.python.psi.impl.PyConstructorArgumentCompletionContributor"/>
+    <!-- Console folding for Jython only, thus it's located in python-plugin only -->
+    <stacktrace.fold substring="*sys-package-mgr*:"/>
   </extensions>
 
   <extensions defaultExtensionNs="Pythonid">
@@ -11,4 +19,16 @@
     <pySuperMethodsSearch implementation="com.jetbrains.python.psi.impl.PyJavaSuperMethodsSearchExecutor"/>
     <importCandidateProvider implementation="com.jetbrains.python.psi.impl.PyJavaImportCandidateProvider"/>
   </extensions>
+
+  <application-components>
+    <component>
+      <implementation-class>com.jetbrains.python.facet.PythonSdkTableListener</implementation-class>
+    </component>
+  </application-components>
+
+  <module-components>
+    <component>
+      <implementation-class>com.jetbrains.python.facet.PythonFacetListener</implementation-class>
+    </component>
+  </module-components>
 </idea-plugin>
\ No newline at end of file
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonFacet.java b/python/pluginJava/com/jetbrains/python/facet/PythonFacet.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonFacet.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonFacet.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonFacetConfiguration.java b/python/pluginJava/com/jetbrains/python/facet/PythonFacetConfiguration.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonFacetConfiguration.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonFacetConfiguration.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonFacetListener.java b/python/pluginJava/com/jetbrains/python/facet/PythonFacetListener.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonFacetListener.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonFacetListener.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonFacetType.java b/python/pluginJava/com/jetbrains/python/facet/PythonFacetType.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonFacetType.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonFacetType.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonFrameworkSupportConfigurable.java b/python/pluginJava/com/jetbrains/python/facet/PythonFrameworkSupportConfigurable.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonFrameworkSupportConfigurable.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonFrameworkSupportConfigurable.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java b/python/pluginJava/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonSdkComboBox.java b/python/pluginJava/com/jetbrains/python/facet/PythonSdkComboBox.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonSdkComboBox.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonSdkComboBox.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonSdkEditorTab.form b/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.form
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonSdkEditorTab.form
rename to python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.form
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonSdkEditorTab.java b/python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonSdkEditorTab.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonSdkEditorTab.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonSdkTableListener.java b/python/pluginJava/com/jetbrains/python/facet/PythonSdkTableListener.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonSdkTableListener.java
rename to python/pluginJava/com/jetbrains/python/facet/PythonSdkTableListener.java
diff --git a/python/pluginCore/com/jetbrains/python/module/PyProjectStructureDetector.java b/python/pluginJava/com/jetbrains/python/module/PyProjectStructureDetector.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/module/PyProjectStructureDetector.java
rename to python/pluginJava/com/jetbrains/python/module/PyProjectStructureDetector.java
diff --git a/python/pluginCore/com/jetbrains/python/module/PythonModuleBuilder.java b/python/pluginJava/com/jetbrains/python/module/PythonModuleBuilder.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/module/PythonModuleBuilder.java
rename to python/pluginJava/com/jetbrains/python/module/PythonModuleBuilder.java
diff --git a/python/pluginCore/com/jetbrains/python/module/PythonModuleConfigurationEditorProvider.java b/python/pluginJava/com/jetbrains/python/module/PythonModuleConfigurationEditorProvider.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/module/PythonModuleConfigurationEditorProvider.java
rename to python/pluginJava/com/jetbrains/python/module/PythonModuleConfigurationEditorProvider.java
diff --git a/python/pluginCore/com/jetbrains/python/module/PythonModuleType.java b/python/pluginJava/com/jetbrains/python/module/PythonModuleType.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/module/PythonModuleType.java
rename to python/pluginJava/com/jetbrains/python/module/PythonModuleType.java
diff --git a/python/pluginJava/python-community-plugin-java.iml b/python/pluginJava/python-community-plugin-java.iml
index b001861026c5..500f8dd18dbd 100644
--- a/python/pluginJava/python-community-plugin-java.iml
+++ b/python/pluginJava/python-community-plugin-java.iml
@@ -8,9 +8,12 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="java-psi-api" />
+    <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="python-psi-api" />
     <orderEntry type="module" module-name="python-community" />
+    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="java-psi-api" />
     <orderEntry type="module" module-name="java-indexing-api" />
+    <orderEntry type="module" module-name="idea-ui" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/pluginResources/META-INF/plugin.xml b/python/pluginResources/META-INF/plugin.xml
index 54ea457412c6..7153807829fb 100644
--- a/python/pluginResources/META-INF/plugin.xml
+++ b/python/pluginResources/META-INF/plugin.xml
@@ -28,11 +28,4 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
      plugins are loaded as separate plugins) and another is used for the real release build (when auxiliary
      plugins are packed inside the Python plugin jar) -->
   <xi:include href="/META-INF/python-plugin-dependencies.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <application-components>
-    <component>
-      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
-      <implementation-class>com.jetbrains.python.console.PydevConsoleRunnerFactory</implementation-class>
-    </component>
-  </application-components>
 </idea-plugin>
diff --git a/python/src/META-INF/python-core-core.xml b/python/src/META-INF/python-core-core.xml
index 60b4c6bda355..0b9eb327a3d3 100644
--- a/python/src/META-INF/python-core-core.xml
+++ b/python/src/META-INF/python-core-core.xml
@@ -668,6 +668,9 @@
   </project-components>
 
   <actions>
+    <action overrides="true" id="ForceStepInto" class="com.jetbrains.python.debugger.PyForceStepIntoAction" text="Fo_rce Step Into"
+            icon="AllIcons.Debugger.Actions.Force_step_into" description="Step into, ignore stepping filters for libraries, constructors, etc."/>
+
     <group id="PyTypeHierarchyPopupMenu">
       <reference ref="TypeHierarchyBase.BaseOnThisType"/>
       <reference ref="TypeHierarchy.Class"/>
@@ -816,6 +819,9 @@
     <component>
       <implementation-class>com.jetbrains.python.testing.VFSTestFrameworkListener</implementation-class>
     </component>
+    <component>
+      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
+      <implementation-class>com.jetbrains.python.console.PydevConsoleRunnerFactory</implementation-class>
+    </component>
   </application-components>
-
 </idea-plugin>
\ No newline at end of file