From 9d4751f238c147b1e50b16f386e19994ed165cea Mon Sep 17 00:00:00 2001
From: "Ilya.Kazakevich" <ilya.kazakevich@jetbrains.com>
Date: Thu, 18 Jan 2024 05:52:28 +0100
Subject: [PATCH] [python, ds, jupyter]: Migrate Python support to V2

Layout:

  JPS modules
  `intellij.python.community`
  `intellij.python.community.impl`
  `intellij.python.parser`
  `intellij.python.psi`
  `intellij.python.psi.impl`
  `intellij.python.ast`
  use package `com.jetbrains.python`
  and go to `intellij.python.community.impl` v2 module

  JPS module
  `intellij.python`
  uses package `com.intellij.python.pro`
  and goes to `intellij.python/pro` v2 module

  Both v2 modules (along with lots of others) come with
  `PythonId` (prof) or `PythonCore` (community) plugins

  DS bundles  `intellij.python.community.impl`

  Idea and other Mini IDEs get `PythonCore` or `PythonId` plugin that bundle modules for Idea and mini IDEs

GitOrigin-RevId: 98f418c52d90d51b9adf3250c561f2c36c767e2d
---
 .idea/misc.xml                                |  4 +-
 .idea/modules.xml                             |  3 ++
 ...ugin.xml => intellij.commandInterface.xml} | 12 ++++--
 .../resources/META-INF/IdeaPlugin.xml         |  4 +-
 .../python/PythonCommunityPluginModules.kt    |  2 +
 .../python/resources/intellij.sh.python.xml   |  1 +
 .../intellij.python.langInjection.xml         |  1 +
 .../pycharm/PyCharmCommunityProperties.kt     |  1 +
 ...j.pycharm.community.ide.impl.promotion.iml | 20 ++++++++++
 .../PyCharmProfessionalAdvertiser.java        |  5 ++-
 ...PyCharmProfessionalAdvertiserSettings.java |  4 +-
 .../community/ide/impl/promotion/actions.kt   |  0
 .../ide/impl/promotion/configurables.kt       |  0
 .../ide/impl/promotion/djangoProject.kt       |  0
 .../ide/impl/promotion/featurePages.kt        |  0
 .../ide/impl/promotion/newFileActions.kt      |  0
 .../ide/impl/promotion/statistics.kt          |  0
 ....pycharm.community.ide.impl.promotion.xml} | 31 ++++++++++-----
 .../pycharm-community-only-customization.xml  | 10 -----
 ...ycharm-v2-customization-plugin-include.xml | 12 ++++++
 ...> intellij.pycharm.community.ide.impl.xml} | 38 +++++++++++--------
 python/ide/resources/META-INF/plugin.xml      | 20 +++++-----
 ...tellij.pycharm.community.customization.iml |  1 +
 ...j.python.community.impl.community_only.iml | 13 +++++++
 .../CommunityPydevConsoleRunnerFactory.kt     |  2 +-
 ...j.python.community.impl.community_only.xml | 11 ++++++
 ...intellij.python.community.plugin.impl.xml} |  9 ++++-
 .../pluginCore/resources/META-INF/plugin.xml  | 33 +++++++---------
 ...intellij.python.community.plugin.java.xml} | 12 +++---
 .../META-INF/python-plugin-datagrip.xml       |  3 --
 .../META-INF/python-plugin-goland.xml         |  4 --
 .../META-INF/python-plugin-rider.xml          |  8 ----
 .../META-INF/python-plugin-rustrover.xml      |  3 --
 ...ij.python.community.plugin.minor.rider.iml | 11 ++++++
 ...ij.python.community.plugin.minor.rider.xml | 21 ++++++++++
 ...ntellij.python.community.plugin.minor.xml} | 15 ++++++--
 .../resources/intellij.python.copyright.xml   |  1 +
 .../intellij.python.featuresTrainer.xml       |  1 +
 .../resources/intellij.python.grazie.xml      |  1 +
 .../resources/intellij.python.markdown.xml    |  1 +
 .../intellij.python.reStructuredText.xml      | 16 +++++---
 .../resources/intellij.python.terminal.xml    |  1 +
 python/src/META-INF/python-core-community.xml |  7 ----
 .../python-v2-core-plugin-include.xml         | 27 +++++++++++++
 ...intellij.python.community.impl.poetry.xml} |  3 +-
 ...xml => intellij.python.community.impl.xml} | 12 +++---
 python/testSrc/META-INF/PyCharmCorePlugin.xml | 13 -------
 47 files changed, 260 insertions(+), 137 deletions(-)
 rename commandInterface/src/{META-INF/command-line-plugin.xml => intellij.commandInterface.xml} (79%)
 create mode 100644 python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml
 rename python/ide/impl/{src/com/intellij/pycharm/community/ide/impl => intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion}/PyCharmProfessionalAdvertiser.java (96%)
 rename python/ide/impl/{src/com/intellij/pycharm/community/ide/impl => intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion}/PyCharmProfessionalAdvertiserSettings.java (79%)
 rename python/ide/impl/{ => intellij.pycharm.community.ide.impl.promotion}/src/com/intellij/pycharm/community/ide/impl/promotion/actions.kt (100%)
 rename python/ide/impl/{ => intellij.pycharm.community.ide.impl.promotion}/src/com/intellij/pycharm/community/ide/impl/promotion/configurables.kt (100%)
 rename python/ide/impl/{ => intellij.pycharm.community.ide.impl.promotion}/src/com/intellij/pycharm/community/ide/impl/promotion/djangoProject.kt (100%)
 rename python/ide/impl/{ => intellij.pycharm.community.ide.impl.promotion}/src/com/intellij/pycharm/community/ide/impl/promotion/featurePages.kt (100%)
 rename python/ide/impl/{ => intellij.pycharm.community.ide.impl.promotion}/src/com/intellij/pycharm/community/ide/impl/promotion/newFileActions.kt (100%)
 rename python/ide/impl/{ => intellij.pycharm.community.ide.impl.promotion}/src/com/intellij/pycharm/community/ide/impl/promotion/statistics.kt (100%)
 rename python/ide/impl/{resources/META-INF/pycharm-community-promo.xml => intellij.pycharm.community.ide.impl.promotion/src/intellij.pycharm.community.ide.impl.promotion.xml} (77%)
 delete mode 100644 python/ide/impl/resources/META-INF/pycharm-community-only-customization.xml
 create mode 100644 python/ide/impl/resources/META-INF/pycharm-v2-customization-plugin-include.xml
 rename python/ide/impl/resources/{META-INF/pycharm-community-and-pro-customization.xml => intellij.pycharm.community.ide.impl.xml} (82%)
 create mode 100644 python/intellij.python.community.impl.community_only/intellij.python.community.impl.community_only.iml
 rename python/{src/com/jetbrains/python/community => intellij.python.community.impl.community_only/src/com/intellij/python/community/impl/community_only}/CommunityPydevConsoleRunnerFactory.kt (83%)
 create mode 100644 python/intellij.python.community.impl.community_only/src/intellij.python.community.impl.community_only.xml
 rename python/pluginCore/impl/resources/{META-INF/python-community-plugin-core.xml => intellij.python.community.plugin.impl.xml} (77%)
 rename python/pluginJava/{META-INF/python-community-plugin-java.xml => intellij.python.community.plugin.java.xml} (86%)
 delete mode 100644 python/pluginMinor/META-INF/python-plugin-datagrip.xml
 delete mode 100644 python/pluginMinor/META-INF/python-plugin-goland.xml
 delete mode 100644 python/pluginMinor/META-INF/python-plugin-rider.xml
 delete mode 100644 python/pluginMinor/META-INF/python-plugin-rustrover.xml
 create mode 100644 python/pluginMinor/intellij.python.community.plugin.minor.rider/intellij.python.community.plugin.minor.rider.iml
 create mode 100644 python/pluginMinor/intellij.python.community.plugin.minor.rider/src/intellij.python.community.plugin.minor.rider.xml
 rename python/pluginMinor/{META-INF/python-community-plugin-minor.xml => intellij.python.community.plugin.minor.xml} (54%)
 delete mode 100644 python/src/META-INF/python-core-community.xml
 create mode 100644 python/src/META-INF/python-v2-core-plugin-include.xml
 rename python/src/{META-INF/PyPoetryInclude.xml => intellij.python.community.impl.poetry.xml} (82%)
 rename python/src/{META-INF/python-core-common.xml => intellij.python.community.impl.xml} (99%)
 delete mode 100644 python/testSrc/META-INF/PyCharmCorePlugin.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d8626df0490f..a44da86f3389 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
-    <entry_points version="2.0" />
     <writeAnnotations>
       <writeAnnotation name="com.sampullara.cli.Argument" />
     </writeAnnotations>
@@ -33,7 +33,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="false" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SuppressKotlinCodeStyleNotification">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7ab0191906c4..87584faf9f76 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1116,17 +1116,20 @@
       <module fileurl="file://$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharm.community.build.debugBinaries.iml" filepath="$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharm.community.build.debugBinaries.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.pycharm.community.customization.iml" filepath="$PROJECT_DIR$/python/intellij.pycharm.community.customization.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.ide.impl.iml" filepath="$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.ide.impl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml" filepath="$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.pycharm.community.main.iml" filepath="$PROJECT_DIR$/python/intellij.pycharm.community.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-ast/intellij.python.ast.iml" filepath="$PROJECT_DIR$/python/python-ast/intellij.python.ast.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-common-tests/intellij.python.commonTests.iml" filepath="$PROJECT_DIR$/python/python-common-tests/intellij.python.commonTests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/openapi/intellij.python.community.iml" filepath="$PROJECT_DIR$/python/openapi/intellij.python.community.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-core-impl/intellij.python.community.core.impl.iml" filepath="$PROJECT_DIR$/python/python-core-impl/intellij.python.community.core.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.impl.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.impl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.impl.community_only/intellij.python.community.impl.community_only.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.impl.community_only/intellij.python.community.impl.community_only.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/pluginCore/intellij.python.community.plugin.iml" filepath="$PROJECT_DIR$/python/pluginCore/intellij.python.community.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/pluginCore/impl/intellij.python.community.plugin.impl.iml" filepath="$PROJECT_DIR$/python/pluginCore/impl/intellij.python.community.plugin.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/pluginJava/intellij.python.community.plugin.java.iml" filepath="$PROJECT_DIR$/python/pluginJava/intellij.python.community.plugin.java.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.plugin.main.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.plugin.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/pluginMinor/intellij.python.community.plugin.minor.iml" filepath="$PROJECT_DIR$/python/pluginMinor/intellij.python.community.plugin.minor.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/pluginMinor/intellij.python.community.plugin.minor.rider/intellij.python.community.plugin.minor.rider.iml" filepath="$PROJECT_DIR$/python/pluginMinor/intellij.python.community.plugin.minor.rider/intellij.python.community.plugin.minor.rider.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.plugin.modules.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.plugin.modules.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.plugin.tests.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.plugin.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/testFramework/intellij.python.community.testFramework.iml" filepath="$PROJECT_DIR$/python/testFramework/intellij.python.community.testFramework.iml" />
diff --git a/commandInterface/src/META-INF/command-line-plugin.xml b/commandInterface/src/intellij.commandInterface.xml
similarity index 79%
rename from commandInterface/src/META-INF/command-line-plugin.xml
rename to commandInterface/src/intellij.commandInterface.xml
index 56936c4c39d3..17c3b8f35185 100644
--- a/commandInterface/src/META-INF/command-line-plugin.xml
+++ b/commandInterface/src/intellij.commandInterface.xml
@@ -1,5 +1,8 @@
-<idea-plugin>
-
+<idea-plugin package="com.intellij.commandInterface">
+  <dependencies>
+    <plugin id="com.intellij.modules.platform"/>
+    <plugin id="com.intellij.modules.lang"/>
+  </dependencies>
   <!--
    Extension points to support gnu command line language.
    See {@link com.intellij.commandInterface.commandLine}
@@ -10,12 +13,13 @@
     <lang.parserDefinition language="CommandLine"
                            implementationClass="com.intellij.commandInterface.commandLine.CommandLineParserDefinition"/>
     <lang.syntaxHighlighter language="CommandLine"
-                                   implementationClass="com.intellij.commandInterface.commandLine.CommandLineSyntaxHighlighter"/>
+                            implementationClass="com.intellij.commandInterface.commandLine.CommandLineSyntaxHighlighter"/>
     <psi.referenceContributor language="CommandLine"
                               implementation="com.intellij.commandInterface.commandLine.CommandLineReferenceContributor"/>
     <lang.elementManipulator forClass="com.intellij.commandInterface.commandLine.CommandLineElement"
                              implementationClass="com.intellij.commandInterface.commandLine.CommandLineElementManipulator"/>
-    <localInspection language="CommandLine" shortName="CommandLineInspection" bundle="com.intellij.commandInterface.CommandInterfaceBundle" key="commandLine.inspection.name"
+    <localInspection language="CommandLine" shortName="CommandLineInspection" bundle="com.intellij.commandInterface.CommandInterfaceBundle"
+                     key="commandLine.inspection.name"
                      enabledByDefault="true" level="WARNING"
                      groupKey="INSP.GROUP.python"
                      groupBundle="messages.PyBundle"
diff --git a/community-resources/resources/META-INF/IdeaPlugin.xml b/community-resources/resources/META-INF/IdeaPlugin.xml
index cfbacbd076bb..4efc3c962494 100644
--- a/community-resources/resources/META-INF/IdeaPlugin.xml
+++ b/community-resources/resources/META-INF/IdeaPlugin.xml
@@ -5,8 +5,8 @@
   <module value="com.intellij.modules.idea"/>
   <module value="com.intellij.modules.idea.community"/>
   <module value="com.intellij.modules.java-capable"/>
-  <module value="com.intellij.modules.python-core-capable"/>
-
+  <module value="com.intellij.modules.python-core-capable"/> <!-- Python plugin can be installed -->
+  <module value="com.intellij.modules.python-in-non-pycharm-ide-capable"/> <!-- Enable Non-Pycharm-IDE support in Python plugin -->
   <content>
     <module name="intellij.notebooks.visualization"/>
     <module name="intellij.notebooks.ui"/>
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt
index 1fde0449f291..22954952ae79 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt
@@ -20,6 +20,7 @@ object PythonCommunityPluginModules {
     "intellij.python.community.core.impl",
     "intellij.python.pydev",
     "intellij.python.community.impl",
+    "intellij.python.community.impl.community_only",
     "intellij.python.langInjection",
     "intellij.python.copyright",
     "intellij.python.terminal",
@@ -37,6 +38,7 @@ object PythonCommunityPluginModules {
   fun pythonCommunityPluginLayout(body: ((PluginLayout.PluginLayoutSpec) -> Unit)? = null): PluginLayout {
     val communityOnlyModules = persistentListOf(
       "intellij.python.community.plugin.minor",
+      "intellij.python.community.plugin.minor.rider",
     )
     return pythonPlugin("intellij.python.community.plugin", pythonCommunityName, COMMUNITY_MODULES + communityOnlyModules) { spec ->
       body?.invoke(spec)
diff --git a/plugins/sh/python/resources/intellij.sh.python.xml b/plugins/sh/python/resources/intellij.sh.python.xml
index 10b5b2e950c6..457b4a8683ff 100644
--- a/plugins/sh/python/resources/intellij.sh.python.xml
+++ b/plugins/sh/python/resources/intellij.sh.python.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.sh.python">
   <dependencies>
     <plugin id="com.intellij.modules.python"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <runMarkerContributionAdditionalCondition implementation="com.intellij.sh.python.PythonFileMarkerContributionAdditionalCondition"/>
diff --git a/python/IntelliLang-python/resources/intellij.python.langInjection.xml b/python/IntelliLang-python/resources/intellij.python.langInjection.xml
index a7b041994a49..b51a085a86bf 100644
--- a/python/IntelliLang-python/resources/intellij.python.langInjection.xml
+++ b/python/IntelliLang-python/resources/intellij.python.langInjection.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.langInjection">
   <dependencies>
     <plugin id="org.intellij.intelliLang"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="org.intellij.intelliLang">
     <languageSupport implementation="com.intellij.python.langInjection.PyLanguageInjectionSupport"/>
diff --git a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
index b7e0f08050f5..a18c97686120 100644
--- a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
+++ b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
@@ -44,6 +44,7 @@ class PyCharmCommunityProperties(private val communityHome: Path) : PyCharmPrope
       PluginLayout.plugin(listOf(
         "intellij.pycharm.community.customization",
         "intellij.pycharm.community.ide.impl",
+        "intellij.pycharm.community.ide.impl.promotion",
         "intellij.jupyter.viewOnly",
         "intellij.jupyter.core"
       )
diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml
new file mode 100644
index 000000000000..fa6b9cae3267
--- /dev/null
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.pycharm.community.ide.impl" />
+    <orderEntry type="module" module-name="intellij.python.community.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="library" name="http-client" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProfessionalAdvertiser.java b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/PyCharmProfessionalAdvertiser.java
similarity index 96%
rename from python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProfessionalAdvertiser.java
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/PyCharmProfessionalAdvertiser.java
index 2e86a1c831b6..f62d7693e8bc 100644
--- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProfessionalAdvertiser.java
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/PyCharmProfessionalAdvertiser.java
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.pycharm.community.ide.impl;
+package com.intellij.pycharm.community.ide.impl.promotion;
 
 import com.intellij.ide.BrowserUtil;
 import com.intellij.lang.annotation.AnnotationHolder;
@@ -12,6 +12,7 @@ import com.intellij.openapi.util.NlsContexts.NotificationTitle;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.pycharm.community.ide.impl.PyCharmCommunityCustomizationBundle;
 import com.jetbrains.python.PyCellUtil;
 import com.jetbrains.python.psi.PyFile;
 import com.jetbrains.python.psi.impl.PyPsiUtils;
@@ -20,7 +21,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 
-public final class PyCharmProfessionalAdvertiser implements Annotator {
+final class PyCharmProfessionalAdvertiser implements Annotator {
   private static final NotificationGroup BALLOON_NOTIFICATIONS = NotificationGroupManager.getInstance().getNotificationGroup("PyCharm Professional Advertiser");
 
   @Override
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProfessionalAdvertiserSettings.java b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/PyCharmProfessionalAdvertiserSettings.java
similarity index 79%
rename from python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProfessionalAdvertiserSettings.java
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/PyCharmProfessionalAdvertiserSettings.java
index 415fbf32a31d..11b81a476ac1 100644
--- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/PyCharmProfessionalAdvertiserSettings.java
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/PyCharmProfessionalAdvertiserSettings.java
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.pycharm.community.ide.impl;
+package com.intellij.pycharm.community.ide.impl.promotion;
 
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 @State(name = "PyCharmProfessionalAdvertiser")
-public class PyCharmProfessionalAdvertiserSettings implements PersistentStateComponent<PyCharmProfessionalAdvertiserSettings> {
+class PyCharmProfessionalAdvertiserSettings implements PersistentStateComponent<PyCharmProfessionalAdvertiserSettings> {
   public boolean shown = false;
 
   @Nullable
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/actions.kt b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/actions.kt
similarity index 100%
rename from python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/actions.kt
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/actions.kt
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/configurables.kt b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/configurables.kt
similarity index 100%
rename from python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/configurables.kt
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/configurables.kt
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/djangoProject.kt b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/djangoProject.kt
similarity index 100%
rename from python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/djangoProject.kt
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/djangoProject.kt
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/featurePages.kt b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/featurePages.kt
similarity index 100%
rename from python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/featurePages.kt
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/featurePages.kt
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/newFileActions.kt b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/newFileActions.kt
similarity index 100%
rename from python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/newFileActions.kt
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/newFileActions.kt
diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/statistics.kt b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/statistics.kt
similarity index 100%
rename from python/ide/impl/src/com/intellij/pycharm/community/ide/impl/promotion/statistics.kt
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/com/intellij/pycharm/community/ide/impl/promotion/statistics.kt
diff --git a/python/ide/impl/resources/META-INF/pycharm-community-promo.xml b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/intellij.pycharm.community.ide.impl.promotion.xml
similarity index 77%
rename from python/ide/impl/resources/META-INF/pycharm-community-promo.xml
rename to python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/intellij.pycharm.community.ide.impl.promotion.xml
index 57c372e7d466..694d413b8252 100644
--- a/python/ide/impl/resources/META-INF/pycharm-community-promo.xml
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/src/intellij.pycharm.community.ide.impl.promotion.xml
@@ -1,26 +1,39 @@
-<!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
-<idea-plugin>
-  <resource-bundle>messages.PyBundle</resource-bundle>
+<idea-plugin package="com.intellij.pycharm.community.ide.impl.promotion">
+  <!--Customization code for Community Pycharm only. Promotes PyCharm Prof-->
+
+  <dependencies>
+    <module name="intellij.pycharm.community.ide.impl"/>
+    <module name="intellij.python.community.impl"/>
+  </dependencies>
+
+
+  <extensions defaultExtensionNs="com.intellij">
+    <annotator language="Python" implementationClass="com.intellij.pycharm.community.ide.impl.promotion.PyCharmProfessionalAdvertiser"/>
+    <annotator language="TEXT" implementationClass="com.intellij.pycharm.community.ide.impl.promotion.PyCharmProfessionalAdvertiser"/>
+    <annotator language="JSON" implementationClass="com.intellij.pycharm.community.ide.impl.promotion.PyCharmProfessionalAdvertiser"/>
+    <projectService serviceImplementation="com.intellij.pycharm.community.ide.impl.promotion.PyCharmProfessionalAdvertiserSettings"/>
+  </extensions>
+
   <actions resource-bundle="messages.PyCharmCommunityCustomizationBundle">
     <action class="com.intellij.pycharm.community.ide.impl.promotion.PromoAiCodeCompletion"
             id="PromoAiCodeCompletion"
-            icon="AllIcons.Ultimate.PycharmLock" />
+            icon="AllIcons.Ultimate.PycharmLock"/>
 
     <action class="com.intellij.pycharm.community.ide.impl.promotion.PromoDataFrameAction"
             id="PromoDataFrameAction"
-            icon="AllIcons.Ultimate.PycharmLock" />
+            icon="AllIcons.Ultimate.PycharmLock"/>
 
     <action class="com.intellij.pycharm.community.ide.impl.promotion.PromoDockerAction"
             id="PromoDockerAction"
-            icon="AllIcons.Ultimate.PycharmLock" />
+            icon="AllIcons.Ultimate.PycharmLock"/>
 
     <action class="com.intellij.pycharm.community.ide.impl.promotion.PromoEndpointsAction"
             id="PromoEndpointsAction"
-            icon="AllIcons.Ultimate.PycharmLock" />
+            icon="AllIcons.Ultimate.PycharmLock"/>
 
     <action class="com.intellij.pycharm.community.ide.impl.promotion.PromoPlotsAction"
             id="PromoPlotsAction"
-            icon="AllIcons.Ultimate.PycharmLock" />
+            icon="AllIcons.Ultimate.PycharmLock"/>
 
     <action id="PromoNewJupyterNotebook" class="com.intellij.pycharm.community.ide.impl.promotion.NewJupyterNotebookFile"
             icon="AllIcons.Ultimate.PycharmLock">
@@ -78,4 +91,4 @@
 
     <statistics.counterUsagesCollector implementationClass="com.intellij.pycharm.community.ide.impl.promotion.PyCharmPromoCollector"/>
   </extensions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/python/ide/impl/resources/META-INF/pycharm-community-only-customization.xml b/python/ide/impl/resources/META-INF/pycharm-community-only-customization.xml
deleted file mode 100644
index 3400ba745145..000000000000
--- a/python/ide/impl/resources/META-INF/pycharm-community-only-customization.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<idea-plugin>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <annotator language="Python" implementationClass="com.intellij.pycharm.community.ide.impl.PyCharmProfessionalAdvertiser"/>
-    <annotator language="TEXT" implementationClass="com.intellij.pycharm.community.ide.impl.PyCharmProfessionalAdvertiser"/>
-    <annotator language="JSON" implementationClass="com.intellij.pycharm.community.ide.impl.PyCharmProfessionalAdvertiser"/>
-    <projectService serviceImplementation="com.intellij.pycharm.community.ide.impl.PyCharmProfessionalAdvertiserSettings"/>
-  </extensions>
-</idea-plugin>
-
diff --git a/python/ide/impl/resources/META-INF/pycharm-v2-customization-plugin-include.xml b/python/ide/impl/resources/META-INF/pycharm-v2-customization-plugin-include.xml
new file mode 100644
index 000000000000..50847d57a484
--- /dev/null
+++ b/python/ide/impl/resources/META-INF/pycharm-v2-customization-plugin-include.xml
@@ -0,0 +1,12 @@
+<!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<idea-plugin>
+  <!-- Included both: in PyCharm Pro and Community customization plugins -->
+
+  <resource-bundle>messages.PyBundle</resource-bundle>
+
+  <content>
+    <module name="intellij.pycharm.community.ide.impl"/>
+    <module name="intellij.pycharm.community.ide.impl/training"/>
+  </content>
+
+</idea-plugin>
\ No newline at end of file
diff --git a/python/ide/impl/resources/META-INF/pycharm-community-and-pro-customization.xml b/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
similarity index 82%
rename from python/ide/impl/resources/META-INF/pycharm-community-and-pro-customization.xml
rename to python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
index 49ddc73b5e52..161bb4625fc4 100644
--- a/python/ide/impl/resources/META-INF/pycharm-community-and-pro-customization.xml
+++ b/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
@@ -1,13 +1,14 @@
-<!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
-<idea-plugin>
-  <resource-bundle>messages.PyBundle</resource-bundle>
+<idea-plugin package="com.intellij.pycharm.community.ide.impl">
+  <!--Customization code for both Community and Pro PyCharms-->
+  <dependencies>
+    <module name="intellij.python.community.impl"/>
+    <plugin id="com.intellij.modules.platform"/>
+  </dependencies>
 
-  <content>
-    <module name="intellij.pycharm.community.ide.impl/training"/>
-  </content>
   <projectListeners>
     <listener class="com.intellij.pycharm.community.ide.impl.PyModuleListener" topic="com.intellij.openapi.project.ModuleListener"/>
-    <listener class="com.intellij.pycharm.community.ide.impl.PySdkFromEnvironmentVariableConfigurator" topic="com.intellij.workspaceModel.ide.JpsProjectLoadedListener"/>
+    <listener class="com.intellij.pycharm.community.ide.impl.PySdkFromEnvironmentVariableConfigurator"
+              topic="com.intellij.workspaceModel.ide.JpsProjectLoadedListener"/>
   </projectListeners>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -42,7 +43,8 @@
     <directoryProjectConfigurator implementation="com.intellij.pycharm.community.ide.impl.PythonSourceRootConfigurator" id="sourceRoot"
                                   order="after sdk"/>
     <directoryProjectConfigurator implementation="com.intellij.pycharm.community.ide.impl.PlatformInspectionProfileConfigurator"/>
-    <directoryProjectConfigurator implementation="com.intellij.pycharm.community.ide.impl.newProject.welcome.PyWelcomeConfigurator" id="welcome" order="last"/>
+    <directoryProjectConfigurator implementation="com.intellij.pycharm.community.ide.impl.newProject.welcome.PyWelcomeConfigurator"
+                                  id="welcome" order="last"/>
 
     <applicationService serviceInterface="com.intellij.openapi.module.ModuleTypeManager"
                         serviceImplementation="com.intellij.pycharm.community.ide.impl.PythonModuleTypeManager"
@@ -67,20 +69,23 @@
     <applicationService serviceImplementation="com.intellij.pycharm.community.ide.impl.newProject.welcome.PyWelcomeSettings"/>
     <statistics.counterUsagesCollector implementationClass="com.intellij.pycharm.community.ide.impl.newProject.welcome.PyWelcomeCollector"/>
     <notificationGroup id="PyCharm Professional Advertiser" displayType="STICKY_BALLOON" isLogByDefault="false"
-      bundle="messages.PyCharmCommunityCustomizationBundle" key="notification.group.pro.advertiser"/>
+                       bundle="messages.PyCharmCommunityCustomizationBundle" key="notification.group.pro.advertiser"/>
 
     <ignoredFileProvider implementation="com.intellij.pycharm.community.ide.impl.configuration.PyTemporarilyIgnoredFileProvider"/>
 
-    <statistics.counterUsagesCollector implementationClass="com.intellij.pycharm.community.ide.impl.configuration.PySdkConfigurationCollector"/>
+    <statistics.counterUsagesCollector
+      implementationClass="com.intellij.pycharm.community.ide.impl.configuration.PySdkConfigurationCollector"/>
     <defaultToolWindowLayout implementation="com.intellij.pycharm.community.ide.impl.PyToolWindowLayoutProvider" order="last"/>
     <newUIConfigurable implementation="com.intellij.pycharm.community.ide.impl.configuration.PyExperimentalUIConfigurable"/>
   </extensions>
 
   <extensions defaultExtensionNs="Pythonid">
-    <projectSdkConfigurationExtension implementation="com.intellij.pycharm.community.ide.impl.configuration.PyRequirementsTxtOrSetupPySdkConfiguration"
-                                      id="requirementsTxtOrSetupPy"/>
-    <projectSdkConfigurationExtension implementation="com.intellij.pycharm.community.ide.impl.configuration.PyEnvironmentYmlSdkConfiguration"
-                                      id="environmentYml"/>
+    <projectSdkConfigurationExtension
+      implementation="com.intellij.pycharm.community.ide.impl.configuration.PyRequirementsTxtOrSetupPySdkConfiguration"
+      id="requirementsTxtOrSetupPy"/>
+    <projectSdkConfigurationExtension
+      implementation="com.intellij.pycharm.community.ide.impl.configuration.PyEnvironmentYmlSdkConfiguration"
+      id="environmentYml"/>
     <projectSdkConfigurationExtension implementation="com.intellij.pycharm.community.ide.impl.configuration.PyPipfileSdkConfiguration"
                                       id="pipfile" order="before requirementsTxtOrSetupPy"/>
     <projectSdkConfigurationExtension implementation="com.intellij.pycharm.community.ide.impl.configuration.PyPoetrySdkConfiguration"/>
@@ -93,10 +98,11 @@
     </action>
 
     <group id="WelcomeScreen.Platform.NewProject">
-      <action id="WelcomeScreen.CreateDirectoryProject" class="com.intellij.pycharm.community.ide.impl.newProject.steps.PyCharmNewProjectStep"/>
+      <action id="WelcomeScreen.CreateDirectoryProject"
+              class="com.intellij.pycharm.community.ide.impl.newProject.steps.PyCharmNewProjectStep"/>
       <reference ref="WelcomeScreen.OpenDirectoryProject"/>
 
       <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
     </group>
   </actions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/python/ide/resources/META-INF/plugin.xml b/python/ide/resources/META-INF/plugin.xml
index cd54e0893519..7110ef0d610d 100644
--- a/python/ide/resources/META-INF/plugin.xml
+++ b/python/ide/resources/META-INF/plugin.xml
@@ -1,21 +1,21 @@
 <!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" package="com.intellij.pycharm.community.customization.plugin" implementation-detail="true">
   <name>PyCharm Community Customization</name>
   <id>com.jetbrains.pycharm.community.customization</id>
   <vendor>JetBrains</vendor>
   <resource-bundle>messages.ActionsBundle</resource-bundle>
 
-  <depends>com.intellij.modules.pycharm.community</depends>
-  <depends>com.intellij.modules.python</depends>
+  <dependencies>
+    <plugin id="com.intellij.modules.pycharm.community"/>
+    <plugin id="com.intellij.modules.python"/>
+  </dependencies>
 
-  <xi:include href="/META-INF/pycharm-community-only-customization.xml"/>
-  <xi:include href="/META-INF/pycharm-community-and-pro-customization.xml"/>
-  <xi:include href="/META-INF/pycharm-community-promo.xml"/>
+  <xi:include href="/META-INF/pycharm-v2-customization-plugin-include.xml"/>
   <xi:include href="/META-INF/tips-pycharm-community.xml"/>
   <content>
-    <module name="intellij.jupyter.core"/>
-    <module name="intellij.jupyter.viewOnly"/>
+    <module name="intellij.jupyter.core"/> <!-- Lang for notebooks preview -->
+    <module name="intellij.jupyter.viewOnly"/> <!-- notebooks preview itself-->
+
+    <module name="intellij.pycharm.community.ide.impl.promotion"/> <!-- mostly promo of Pro -->
   </content>
-
-
 </idea-plugin>
diff --git a/python/intellij.pycharm.community.customization.iml b/python/intellij.pycharm.community.customization.iml
index 181d2aed7b4b..b8263de0640a 100644
--- a/python/intellij.pycharm.community.customization.iml
+++ b/python/intellij.pycharm.community.customization.iml
@@ -10,5 +10,6 @@
     <orderEntry type="module" module-name="intellij.pycharm.community.ide.impl" scope="RUNTIME" />
     <orderEntry type="library" name="tips-pycharm-community" level="project" />
     <orderEntry type="module" module-name="intellij.jupyter.viewOnly" />
+    <orderEntry type="module" module-name="intellij.pycharm.community.ide.impl.promotion" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/intellij.python.community.impl.community_only/intellij.python.community.impl.community_only.iml b/python/intellij.python.community.impl.community_only/intellij.python.community.impl.community_only.iml
new file mode 100644
index 000000000000..aa57b9fd6e35
--- /dev/null
+++ b/python/intellij.python.community.impl.community_only/intellij.python.community.impl.community_only.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.python.community.impl" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/community/CommunityPydevConsoleRunnerFactory.kt b/python/intellij.python.community.impl.community_only/src/com/intellij/python/community/impl/community_only/CommunityPydevConsoleRunnerFactory.kt
similarity index 83%
rename from python/src/com/jetbrains/python/community/CommunityPydevConsoleRunnerFactory.kt
rename to python/intellij.python.community.impl.community_only/src/com/intellij/python/community/impl/community_only/CommunityPydevConsoleRunnerFactory.kt
index 4cb80836a273..055157d2c983 100644
--- a/python/src/com/jetbrains/python/community/CommunityPydevConsoleRunnerFactory.kt
+++ b/python/intellij.python.community.impl.community_only/src/com/intellij/python/community/impl/community_only/CommunityPydevConsoleRunnerFactory.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.jetbrains.python.community
+package com.intellij.python.community.impl.community_only
 
 import com.jetbrains.python.console.PydevConsoleRunnerFactory
 
diff --git a/python/intellij.python.community.impl.community_only/src/intellij.python.community.impl.community_only.xml b/python/intellij.python.community.impl.community_only/src/intellij.python.community.impl.community_only.xml
new file mode 100644
index 000000000000..ff05154d9e56
--- /dev/null
+++ b/python/intellij.python.community.impl.community_only/src/intellij.python.community.impl.community_only.xml
@@ -0,0 +1,11 @@
+<!-- Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<idea-plugin package="com.intellij.python.community.impl.community_only">
+  <!--Community only, never professional: both plugin and DS -->
+  <dependencies>
+    <module name="intellij.python.community.impl"/>
+  </dependencies>
+  <extensions defaultExtensionNs="com.intellij">
+    <applicationService serviceInterface="com.jetbrains.python.console.PythonConsoleRunnerFactory"
+                        serviceImplementation="com.intellij.python.community.impl.community_only.CommunityPydevConsoleRunnerFactory"/>
+  </extensions>
+</idea-plugin>
diff --git a/python/pluginCore/impl/resources/META-INF/python-community-plugin-core.xml b/python/pluginCore/impl/resources/intellij.python.community.plugin.impl.xml
similarity index 77%
rename from python/pluginCore/impl/resources/META-INF/python-community-plugin-core.xml
rename to python/pluginCore/impl/resources/intellij.python.community.plugin.impl.xml
index c6fb9e09cf23..acefb386d6d8 100644
--- a/python/pluginCore/impl/resources/META-INF/python-community-plugin-core.xml
+++ b/python/pluginCore/impl/resources/intellij.python.community.plugin.impl.xml
@@ -1,4 +1,11 @@
-<idea-plugin>
+<idea-plugin package="com.intellij.python.community.plugin.impl">
+  <!--Plugin for other (not PyCharm) IDEs, including IU-->
+  <dependencies>
+    <!--Any IDE but NOT PyCharm-->
+    <plugin id="com.intellij.modules.python-in-non-pycharm-ide-capable"/>
+
+    <module name="intellij.python.community.impl"/>
+  </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.jetbrains.python.run.PyCommonOptionsFormFactory"
diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml
index 676c4c660117..9bc2627ab8e5 100644
--- a/python/pluginCore/resources/META-INF/plugin.xml
+++ b/python/pluginCore/resources/META-INF/plugin.xml
@@ -1,6 +1,7 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
-  <!-- Components and extensions declared in this file work ONLY in Python plugin, not in standalone PyCharm.
-       Anything related to Python/Java integration must go in this file. -->
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/"
+             package="PythonCore">
+  <!--Python community support for Pycharm, DS and IC. Package is fake, plugin doesn't contain any classes directly-->
+
 
   <id>PythonCore</id>
   <name>Python Community Edition</name>
@@ -16,25 +17,17 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
 
   <vendor url="https://www.jetbrains.com/pycharm/">JetBrains</vendor>
 
-  <depends>com.intellij.modules.python-core-capable</depends>
+  <dependencies>
+    <plugin id="com.intellij.modules.python-core-capable"/>
+  </dependencies>
 
-  <xi:include href="/META-INF/python-core-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-core-community.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <depends optional="true" config-file="python-community-plugin-java.xml">com.intellij.java</depends>
-  <depends optional="true" config-file="python-community-plugin-minor.xml">com.intellij.modules.clion</depends>
-  <depends optional="true" config-file="python-plugin-rider.xml">com.intellij.modules.rider</depends>
-  <depends optional="true" config-file="python-plugin-datagrip.xml">com.intellij.modules.datagrip</depends>
-  <depends optional="true" config-file="python-plugin-goland.xml">com.intellij.modules.go</depends>
-  <depends optional="true" config-file="python-plugin-rustrover.xml">com.intellij.modules.rustrover</depends>
+  <!-- Python bundled modules for content -->
+  <xi:include href="/META-INF/python-v2-core-plugin-include.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <content>
-    <module name="intellij.python.terminal"/>
-    <module name="intellij.python.featuresTrainer"/>
-    <module name="intellij.python.markdown"/>
-    <module name="intellij.python.grazie"/>
-    <module name="intellij.python.langInjection"/>
-    <module name="intellij.python.copyright"/>
-    <module name="intellij.python.reStructuredText"/>
+    <!--Mini-IDes support community python only-->
+    <module name="intellij.python.community.plugin.minor"/> <!-- Python for Mini-IDEs-->
+    <module name="intellij.python.community.plugin.minor.rider"/> <!-- Python special support for Rider -->
+    <module name="intellij.python.community.impl.community_only"/> <!-- Community-specific code-->
   </content>
 
 </idea-plugin>
diff --git a/python/pluginJava/META-INF/python-community-plugin-java.xml b/python/pluginJava/intellij.python.community.plugin.java.xml
similarity index 86%
rename from python/pluginJava/META-INF/python-community-plugin-java.xml
rename to python/pluginJava/intellij.python.community.plugin.java.xml
index 82a38b97b8cd..52841e908546 100644
--- a/python/pluginJava/META-INF/python-community-plugin-java.xml
+++ b/python/pluginJava/intellij.python.community.plugin.java.xml
@@ -1,8 +1,10 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-  <!-- Components and extensions declared in this file work ONLY in the Python plugin,
-       both Community and Professional versions. -->
-
-  <xi:include href="/META-INF/python-community-plugin-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+<idea-plugin package="com.intellij.python.community.plugin.java">
+  <!--For IU or IC-->
+  <dependencies>
+    <!-- Supports Java -->
+    <plugin id="com.intellij.java"/>
+    <module name="intellij.python.community.impl"/>
+  </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
     <newProjectWizard.languageGenerator implementation="com.intellij.python.community.plugin.java.PythonNewProjectWizard"/>
diff --git a/python/pluginMinor/META-INF/python-plugin-datagrip.xml b/python/pluginMinor/META-INF/python-plugin-datagrip.xml
deleted file mode 100644
index cfd2f0eeebda..000000000000
--- a/python/pluginMinor/META-INF/python-plugin-datagrip.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
-  <xi:include href="/META-INF/python-community-plugin-minor.xml" xpointer="xpointer(/idea-plugin/*)"/>
-</idea-plugin>
diff --git a/python/pluginMinor/META-INF/python-plugin-goland.xml b/python/pluginMinor/META-INF/python-plugin-goland.xml
deleted file mode 100644
index 7a1dc30ea3b9..000000000000
--- a/python/pluginMinor/META-INF/python-plugin-goland.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
-  <xi:include href="/META-INF/python-community-plugin-minor.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-</idea-plugin>
diff --git a/python/pluginMinor/META-INF/python-plugin-rider.xml b/python/pluginMinor/META-INF/python-plugin-rider.xml
deleted file mode 100644
index 3f4cc08c9022..000000000000
--- a/python/pluginMinor/META-INF/python-plugin-rider.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
-  <xi:include href="/META-INF/python-community-plugin-minor.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <completion.contributor language="Python" implementationClass="com.intellij.codeInsight.completion.LegacyCompletionContributor" id="legacy"
-                            order="last"/>
-  </extensions>
-</idea-plugin>
diff --git a/python/pluginMinor/META-INF/python-plugin-rustrover.xml b/python/pluginMinor/META-INF/python-plugin-rustrover.xml
deleted file mode 100644
index cfd2f0eeebda..000000000000
--- a/python/pluginMinor/META-INF/python-plugin-rustrover.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
-  <xi:include href="/META-INF/python-community-plugin-minor.xml" xpointer="xpointer(/idea-plugin/*)"/>
-</idea-plugin>
diff --git a/python/pluginMinor/intellij.python.community.plugin.minor.rider/intellij.python.community.plugin.minor.rider.iml b/python/pluginMinor/intellij.python.community.plugin.minor.rider/intellij.python.community.plugin.minor.rider.iml
new file mode 100644
index 000000000000..c90834f2d607
--- /dev/null
+++ b/python/pluginMinor/intellij.python.community.plugin.minor.rider/intellij.python.community.plugin.minor.rider.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/python/pluginMinor/intellij.python.community.plugin.minor.rider/src/intellij.python.community.plugin.minor.rider.xml b/python/pluginMinor/intellij.python.community.plugin.minor.rider/src/intellij.python.community.plugin.minor.rider.xml
new file mode 100644
index 000000000000..75b92aad438d
--- /dev/null
+++ b/python/pluginMinor/intellij.python.community.plugin.minor.rider/src/intellij.python.community.plugin.minor.rider.xml
@@ -0,0 +1,21 @@
+<idea-plugin url="https://confluence.jetbrains.com/display/PYH/" package="com.intellij.python.community.plugin.minor.rider">
+  <dependencies>
+    <!--Any IDE but NOT PyCharm-->
+    <plugin id="com.intellij.modules.python-in-non-pycharm-ide-capable"/>
+    <!-- That is Mini-ide -->
+    <plugin id="com.intellij.modules.python-in-mini-ide-capable"/>
+    <!-- and compatible with Python Core -->
+    <plugin id="com.intellij.modules.python-core-capable"/>
+    <!-- and is Rider -->
+    <plugin id="com.intellij.modules.rider"/>
+    <module name="intellij.python.community.impl"/>
+    <!-- for library facet etc -->
+    <module name="intellij.python.community.plugin.impl"/>
+  </dependencies>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <completion.contributor language="Python" implementationClass="com.intellij.codeInsight.completion.LegacyCompletionContributor"
+                            id="legacy"
+                            order="last"/>
+  </extensions>
+</idea-plugin>
diff --git a/python/pluginMinor/META-INF/python-community-plugin-minor.xml b/python/pluginMinor/intellij.python.community.plugin.minor.xml
similarity index 54%
rename from python/pluginMinor/META-INF/python-community-plugin-minor.xml
rename to python/pluginMinor/intellij.python.community.plugin.minor.xml
index fcaf5832a6a2..ee3e999b3622 100644
--- a/python/pluginMinor/META-INF/python-community-plugin-minor.xml
+++ b/python/pluginMinor/intellij.python.community.plugin.minor.xml
@@ -1,7 +1,16 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
-  <!-- Components and extensions declared in this file work ONLY in the Python plugin for minor IDEs -->
+<idea-plugin package="com.intellij.python.community.plugin.minor" url="https://confluence.jetbrains.com/display/PYH/">
+  <dependencies>
+    <module name="intellij.python.community.impl"/>
+    <!--Any IDE but NOT PyCharm-->
+    <plugin id="com.intellij.modules.python-in-non-pycharm-ide-capable"/>
+    <!-- That is Mini-ide -->
+    <plugin id="com.intellij.modules.python-in-mini-ide-capable"/>
+    <!-- and compatible with Python -->
+    <plugin id="com.intellij.modules.python-core-capable"/>
 
-  <xi:include href="/META-INF/python-community-plugin-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+    <!-- for library facet etc -->
+    <module name="intellij.python.community.plugin.impl"/>
+  </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
     <projectConfigurable groupId="build"
diff --git a/python/python-copyright/resources/intellij.python.copyright.xml b/python/python-copyright/resources/intellij.python.copyright.xml
index 389699dc3a59..1e0133a204e3 100644
--- a/python/python-copyright/resources/intellij.python.copyright.xml
+++ b/python/python-copyright/resources/intellij.python.copyright.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.copyright">
   <dependencies>
     <plugin id="com.intellij.copyright"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij.copyright">
     <updater filetype="Python" implementationClass="com.intellij.python.copyright.PyUpdateCopyrightsProvider"/>
diff --git a/python/python-features-trainer/resources/intellij.python.featuresTrainer.xml b/python/python-features-trainer/resources/intellij.python.featuresTrainer.xml
index 5e4ce566dd03..e7df23368feb 100644
--- a/python/python-features-trainer/resources/intellij.python.featuresTrainer.xml
+++ b/python/python-features-trainer/resources/intellij.python.featuresTrainer.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.featuresTrainer">
   <dependencies>
     <plugin id="training"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="training">
     <ift.language.extension language="Python" defaultProductName="PyCharm"
diff --git a/python/python-grazie/resources/intellij.python.grazie.xml b/python/python-grazie/resources/intellij.python.grazie.xml
index cf6e75efba1f..90aa658a8380 100644
--- a/python/python-grazie/resources/intellij.python.grazie.xml
+++ b/python/python-grazie/resources/intellij.python.grazie.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.grazie">
 <dependencies>
   <plugin id="tanvd.grazi"/>
+  <module name="intellij.python.community.impl"/>
 </dependencies>
   <extensions defaultExtensionNs="com.intellij.grazie">
     <textExtractor language="Python" implementationClass="com.intellij.python.grazie.PythonTextExtractor"/>
diff --git a/python/python-markdown/resources/intellij.python.markdown.xml b/python/python-markdown/resources/intellij.python.markdown.xml
index 41917001d830..1b91ea610e21 100644
--- a/python/python-markdown/resources/intellij.python.markdown.xml
+++ b/python/python-markdown/resources/intellij.python.markdown.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.markdown">
   <dependencies>
     <plugin id="org.intellij.plugins.markdown"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="org.intellij.markdown">
     <fenceLanguageProvider implementation="com.intellij.python.markdown.PyCodeFenceLanguageProvider"/>
diff --git a/python/python-rest/resources/intellij.python.reStructuredText.xml b/python/python-rest/resources/intellij.python.reStructuredText.xml
index 0a2e68c0e9b1..336ed6f14277 100644
--- a/python/python-rest/resources/intellij.python.reStructuredText.xml
+++ b/python/python-rest/resources/intellij.python.reStructuredText.xml
@@ -2,19 +2,24 @@
   <dependencies>
     <plugin id="com.intellij.modules.lang"/>
     <plugin id="com.intellij.modules.python"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
 
-    <fileType name="ReST" language="ReST" extensions="rst" implementationClass="com.intellij.python.reStructuredText.RestFileType" fieldName="INSTANCE"/>
+    <fileType name="ReST" language="ReST" extensions="rst" implementationClass="com.intellij.python.reStructuredText.RestFileType"
+              fieldName="INSTANCE"/>
     <lang.syntaxHighlighterFactory language="ReST"
                                    implementationClass="com.intellij.python.reStructuredText.RestHighlighterFactory"/>
     <lang.parserDefinition language="ReST" implementationClass="com.intellij.python.reStructuredText.parsing.RestParserDefinition"/>
     <colorSettingsPage implementation="com.intellij.python.reStructuredText.RestColorsPage"/>
 
-    <completion.contributor language="ReST" implementationClass="com.intellij.python.reStructuredText.completion.DirectiveCompletionContributor"/>
-    <completion.contributor language="ReST" implementationClass="com.intellij.python.reStructuredText.completion.OptionCompletionContributor"/>
-    <completion.contributor language="ReST" implementationClass="com.intellij.python.reStructuredText.completion.ReferenceCompletionContributor"/>
+    <completion.contributor language="ReST"
+                            implementationClass="com.intellij.python.reStructuredText.completion.DirectiveCompletionContributor"/>
+    <completion.contributor language="ReST"
+                            implementationClass="com.intellij.python.reStructuredText.completion.OptionCompletionContributor"/>
+    <completion.contributor language="ReST"
+                            implementationClass="com.intellij.python.reStructuredText.completion.ReferenceCompletionContributor"/>
     <gotoDeclarationHandler implementation="com.intellij.python.reStructuredText.RestGotoProvider" order="FIRST"/>
     <lang.psiStructureViewFactory language="ReST"
                                   implementationClass="com.intellij.python.reStructuredText.structureView.RestStructureViewFactory"/>
@@ -51,7 +56,8 @@
     <lang.substitutor language="TEXT" implementationClass="com.intellij.python.reStructuredText.RestLanguageSubstitutor"/>
 
     <languageInjector implementation="com.intellij.python.reStructuredText.PyRestDocstringLanguageInjector"/>
-    <completion.contributor language="ReST" implementationClass="com.intellij.python.reStructuredText.completion.SphinxDirectiveCompletionContributor"/>
+    <completion.contributor language="ReST"
+                            implementationClass="com.intellij.python.reStructuredText.completion.SphinxDirectiveCompletionContributor"/>
   </extensions>
 
   <actions resource-bundle="messages.RestBundle">
diff --git a/python/python-terminal/resources/intellij.python.terminal.xml b/python/python-terminal/resources/intellij.python.terminal.xml
index f0bf26015bc5..175e83f2f384 100644
--- a/python/python-terminal/resources/intellij.python.terminal.xml
+++ b/python/python-terminal/resources/intellij.python.terminal.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.terminal">
   <dependencies>
     <plugin id="org.jetbrains.plugins.terminal"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="org.jetbrains.plugins.terminal">
     <localTerminalCustomizer implementation="com.intellij.python.terminal.PyVirtualEnvTerminalCustomizer"/>
diff --git a/python/src/META-INF/python-core-community.xml b/python/src/META-INF/python-core-community.xml
deleted file mode 100644
index a0cc28d9e967..000000000000
--- a/python/src/META-INF/python-core-community.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<idea-plugin>
-  <!--Community only, never professional -->
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceInterface="com.jetbrains.python.console.PythonConsoleRunnerFactory"
-                        serviceImplementation="com.jetbrains.python.community.CommunityPydevConsoleRunnerFactory"/>
-  </extensions>
-</idea-plugin>
diff --git a/python/src/META-INF/python-v2-core-plugin-include.xml b/python/src/META-INF/python-v2-core-plugin-include.xml
new file mode 100644
index 000000000000..4fbd7316cb17
--- /dev/null
+++ b/python/src/META-INF/python-v2-core-plugin-include.xml
@@ -0,0 +1,27 @@
+<idea-plugin>
+  <!--This is not a module, but a part of `plugin.xml` to be included-->
+
+  <dependencies>
+    <plugin id="com.intellij.modules.platform"/>
+    <plugin id="com.intellij.modules.lang"/>
+  </dependencies>
+
+  <!-- Declare that we support python -->
+  <module value="com.intellij.modules.python"/>
+
+  <!--These modules are used both in Python Community and Prof-->
+  <content>
+    <module name="intellij.commandInterface"/> <!-- used by Django in Prof, by some plugins in community -->
+    <module name="intellij.python.community.impl"/> <!-- The whole open-source part of Python support -->
+    <module name="intellij.python.community.impl/poetry"/>
+    <module name="intellij.python.community.plugin.impl"/><!--Python for any IDE except PyCharm -->
+    <module name="intellij.python.community.plugin.java"/><!-- Python for Java IDE -->
+    <module name="intellij.python.copyright"/>
+    <module name="intellij.python.featuresTrainer"/>
+    <module name="intellij.python.grazie"/>
+    <module name="intellij.python.langInjection"/>
+    <module name="intellij.python.markdown"/>
+    <module name="intellij.python.reStructuredText"/>
+    <module name="intellij.python.terminal"/>
+  </content>
+</idea-plugin>
\ No newline at end of file
diff --git a/python/src/META-INF/PyPoetryInclude.xml b/python/src/intellij.python.community.impl.poetry.xml
similarity index 82%
rename from python/src/META-INF/PyPoetryInclude.xml
rename to python/src/intellij.python.community.impl.poetry.xml
index 4f01c77d4cab..1811000cacab 100644
--- a/python/src/META-INF/PyPoetryInclude.xml
+++ b/python/src/intellij.python.community.impl.poetry.xml
@@ -1,6 +1,7 @@
-<idea-plugin>
+<idea-plugin package="com.jetbrains.python.poetry">
   <dependencies>
     <plugin id="org.toml.lang"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <localInspection language="TOML" enabledByDefault="true" implementationClass="com.jetbrains.python.poetry.PoetryPackageVersionsInspection" key="INSP.poetry.package.versions.display.name" bundle="messages.PyBundle" groupKey="INSP.GROUP.python" suppressId="PoetryPackageVersions" shortName="PoetryPackageVersionsInspection"/>
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/intellij.python.community.impl.xml
similarity index 99%
rename from python/src/META-INF/python-core-common.xml
rename to python/src/intellij.python.community.impl.xml
index 6680aa65122f..2f1f65c35a2b 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/intellij.python.community.impl.xml
@@ -1,18 +1,19 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" package="com.jetbrains.python">
   <!--Part of both: community and prof -->
 
+  <dependencies>
+    <plugin id="com.intellij.modules.platform"/>
+    <plugin id="com.intellij.modules.lang"/>
+  </dependencies>
 
   <resource-bundle>messages.PyBundle</resource-bundle>
 
-  <module value="com.intellij.modules.python"/>
 
   <xi:include href="/META-INF/PythonParser.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/PythonPsi.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/PythonPsiImpl.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/PythonSdk.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
-  <!-- Enable command-line language. Not used by community itself, but by some plugins -->
-  <xi:include href="/META-INF/command-line-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <extensions defaultExtensionNs="com.intellij">
 
@@ -44,8 +45,6 @@
                     overrides="true"/>
   </extensions>
 
-  <!-- Poetry. Can't extract module due to circular dependency between it and community.impl--> -->
-  <depends optional="true" config-file="PyPoetryInclude.xml">org.toml.lang</depends>
 
   <projectListeners>
     <listener
@@ -169,6 +168,7 @@
     <xdebugger.settings implementation="com.jetbrains.python.debugger.settings.PyDebuggerSettings"/>
     <xdebugger.attachDebuggerProvider implementation="com.jetbrains.python.debugger.attach.PyLocalAttachDebuggerProvider"/>
 
+    <codeInsight.containerProvider implementation="com.jetbrains.python.codeInsight.PyContainerProvider"/>
     <registryKey key="python.debugger.use.dispatcher" defaultValue="false" description="Use dispatcher in Python debugger"/>
     <registryKey key="flask.new.run.config" defaultValue="true" description="Flask Server Run configurations new UI"/>
 
diff --git a/python/testSrc/META-INF/PyCharmCorePlugin.xml b/python/testSrc/META-INF/PyCharmCorePlugin.xml
deleted file mode 100644
index 840ee66cafdc..000000000000
--- a/python/testSrc/META-INF/PyCharmCorePlugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="/META-INF/PlatformLangXmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-core-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-core-community.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <content>
-    <module name="intellij.python.copyright"/>
-    <module name="intellij.python.markdown"/>
-    <module name="intellij.python.grazie"/>
-    <module name="intellij.python.langInjection"/>
-    <module name="intellij.python.reStructuredText"/>
-  </content>
-</idea-plugin>