From 543ca840b73189329e0236f04cd2fe236dec83be Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Sat, 9 Nov 2019 01:37:23 +0300
Subject: [PATCH] Extracted "impl" modules from Python Community and PyCharm
 Community Customization to use them in other Python plugins for builds and
 runs

The non-impl modules for these plugins now contain more or less just their plugin.xml files
that declare corresponding dependencies.

GitOrigin-RevId: 84fc4761a595912d676cff1e2ab58fba03a8cd22
---
 .idea/modules.xml                             |  2 ++
 .../PythonCommunityPluginModules.groovy       |  9 ++++++---
 .../pycharm/PyCharmCommunityProperties.groovy |  1 +
 ...j.pycharm.community.customization.impl.iml | 19 +++++++++++++++++++
 .../pycharm-community-customization.xml       |  0
 .../python/PlatformPythonModuleType.java      |  0
 .../python/PyCharmCorePluginConfigurator.java |  0
 .../python/PyCharmProfessionalAdvertiser.java |  0
 ...PyCharmProfessionalAdvertiserSettings.java |  0
 .../python/PyDirectoryIndexExcludePolicy.java |  0
 .../python/PyIdeCommonOptionsForm.form        |  0
 .../python/PyIdeCommonOptionsForm.java        |  0
 .../python/PyIdeCommonOptionsFormFactory.java |  0
 .../jetbrains/python/PyModuleListener.java    |  0
 .../python/PyOptionsApplicabilityFilter.java  |  0
 .../python/PythonModuleTypeManager.java       |  0
 .../jetbrains/python/PythonSdkConfigurator.kt |  0
 .../python/PythonSourceRootConfigurator.java  |  0
 .../python/buildout/BuildoutConfigurable.form |  0
 .../python/buildout/BuildoutConfigurable.java |  0
 .../buildout/BuildoutFacetConfigurator.java   |  0
 .../buildout/BuildoutModulesConfigurable.java |  0
 .../PyConfigureInterpretersLinkPanel.java     |  0
 .../PyContentEntriesModuleConfigurable.java   |  0
 .../PyDependenciesConfigurable.java           |  0
 .../PyDependenciesConfigurableProvider.java   |  0
 .../configuration/PyDiffPreviewProvider.java  |  0
 .../PyModuleDependenciesConfigurable.form     |  0
 .../PyModuleDependenciesConfigurable.java     |  0
 .../python/configuration/PySdkStatusBar.kt    |  0
 .../PythonContentEntriesConfigurable.java     |  0
 ...honContentEntriesConfigurableProvider.java |  0
 .../newProject/PyCharmNewProjectAction.java   |  0
 .../newProject/PyCharmNewProjectDialog.java   |  0
 .../steps/PyCharmNewProjectStep.java          |  0
 .../steps/PythonBaseProjectGenerator.java     |  0
 .../steps/PythonGenerateProjectCallback.java  |  0
 .../{src => resources}/META-INF/plugin.xml    |  0
 ...tellij.pycharm.community.customization.iml | 10 ++--------
 .../intellij.python.community.plugin.impl.iml | 16 ++++++++++++++++
 .../META-INF/python-community-plugin-core.xml |  0
 .../python/facet/PythonFacetUtil.java         |  0
 .../python/facet/PythonSdkTableListener.java  |  0
 .../packaging/PyManagePackagesAction.java     |  0
 .../packaging/PyManagePackagesDialog.java     |  0
 .../python/run/PyPluginCommonOptionsForm.form |  0
 .../python/run/PyPluginCommonOptionsForm.java |  0
 .../run/PyPluginCommonOptionsFormFactory.java |  0
 .../intellij.python.community.plugin.iml      |  6 +-----
 .../{ => resources}/META-INF/plugin.xml       |  0
 .../{ => resources}/META-INF/pluginIcon.svg   |  0
 .../intellij.python.community.plugin.java.iml |  2 +-
 ...intellij.python.community.plugin.minor.iml |  2 +-
 53 files changed, 49 insertions(+), 18 deletions(-)
 create mode 100644 python/ide/impl/intellij.pycharm.community.customization.impl.iml
 rename python/ide/{src => impl/resources}/META-INF/pycharm-community-customization.xml (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PlatformPythonModuleType.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyCharmCorePluginConfigurator.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyCharmProfessionalAdvertiserSettings.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyDirectoryIndexExcludePolicy.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyIdeCommonOptionsForm.form (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyIdeCommonOptionsForm.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyIdeCommonOptionsFormFactory.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyModuleListener.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PyOptionsApplicabilityFilter.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PythonModuleTypeManager.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PythonSdkConfigurator.kt (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/PythonSourceRootConfigurator.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/buildout/BuildoutConfigurable.form (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/buildout/BuildoutConfigurable.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/buildout/BuildoutFacetConfigurator.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PySdkStatusBar.kt (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/newProject/PyCharmNewProjectAction.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java (100%)
 rename python/ide/{ => impl}/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java (100%)
 rename python/ide/{src => resources}/META-INF/plugin.xml (100%)
 create mode 100644 python/pluginCore/impl/intellij.python.community.plugin.impl.iml
 rename python/pluginCore/{ => impl/resources}/META-INF/python-community-plugin-core.xml (100%)
 rename python/pluginCore/{ => impl/src}/com/jetbrains/python/facet/PythonFacetUtil.java (100%)
 rename python/pluginCore/{ => impl/src}/com/jetbrains/python/facet/PythonSdkTableListener.java (100%)
 rename python/pluginCore/{ => impl/src}/com/jetbrains/python/packaging/PyManagePackagesAction.java (100%)
 rename python/pluginCore/{ => impl/src}/com/jetbrains/python/packaging/PyManagePackagesDialog.java (100%)
 rename python/pluginCore/{ => impl/src}/com/jetbrains/python/run/PyPluginCommonOptionsForm.form (100%)
 rename python/pluginCore/{ => impl/src}/com/jetbrains/python/run/PyPluginCommonOptionsForm.java (100%)
 rename python/pluginCore/{ => impl/src}/com/jetbrains/python/run/PyPluginCommonOptionsFormFactory.java (100%)
 rename python/pluginCore/{ => resources}/META-INF/plugin.xml (100%)
 rename python/pluginCore/{ => resources}/META-INF/pluginIcon.svg (100%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4ea7d51fd37e..bb1ba6ad2d39 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -698,11 +698,13 @@
       <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/build/dependencies/intellij.pycharm.community.build.dependencies.iml" filepath="$PROJECT_DIR$/python/build/dependencies/intellij.pycharm.community.build.dependencies.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.customization.impl.iml" filepath="$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.customization.impl.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-community-ide-resources/intellij.pycharm.community.resources.iml" filepath="$PROJECT_DIR$/python/python-community-ide-resources/intellij.pycharm.community.resources.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/intellij.python.community.impl.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.impl.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" />
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
index 598434f95692..01ea561055bd 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
@@ -11,9 +11,8 @@ import org.jetbrains.intellij.build.impl.PluginLayout
 class PythonCommunityPluginModules {
   static List<String> COMMUNITY_MODULES = [
     "intellij.python.community",
-    "intellij.python.community.plugin",
+    "intellij.python.community.plugin.impl",
     "intellij.python.community.plugin.java",
-    "intellij.python.community.plugin.minor",
     "intellij.python.psi",
     "intellij.python.psi.impl",
     "intellij.python.pydev",
@@ -24,7 +23,11 @@ class PythonCommunityPluginModules {
     "intellij.python.reStructuredText",
   ]
   static PluginLayout pythonCommunityPluginLayout(@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) {
-    pythonPlugin("intellij.python.community.plugin", "python-ce", COMMUNITY_MODULES) {
+    def communityOnlyModules = [
+      "intellij.python.community.plugin",
+      "intellij.python.community.plugin.minor",
+    ]
+    pythonPlugin("intellij.python.community.plugin", "python-ce", COMMUNITY_MODULES + communityOnlyModules) {
       body.delegate = delegate
       body()
     }
diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
index f950c968948b..45b37890a47f 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
@@ -47,6 +47,7 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
       plugin("intellij.pycharm.community.customization") {
         directoryName = "pythonIDE"
         mainJarName = "python-ide.jar"
+        withModule("intellij.pycharm.community.customization.impl", mainJarName)
       }
     ]
   }
diff --git a/python/ide/impl/intellij.pycharm.community.customization.impl.iml b/python/ide/impl/intellij.pycharm.community.customization.impl.iml
new file mode 100644
index 000000000000..7c97511ad85f
--- /dev/null
+++ b/python/ide/impl/intellij.pycharm.community.customization.impl.iml
@@ -0,0 +1,19 @@
+<?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" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.python.community.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="RUNTIME" />
+    <orderEntry type="library" name="Guava" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/python/ide/src/META-INF/pycharm-community-customization.xml b/python/ide/impl/resources/META-INF/pycharm-community-customization.xml
similarity index 100%
rename from python/ide/src/META-INF/pycharm-community-customization.xml
rename to python/ide/impl/resources/META-INF/pycharm-community-customization.xml
diff --git a/python/ide/src/com/jetbrains/python/PlatformPythonModuleType.java b/python/ide/impl/src/com/jetbrains/python/PlatformPythonModuleType.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PlatformPythonModuleType.java
rename to python/ide/impl/src/com/jetbrains/python/PlatformPythonModuleType.java
diff --git a/python/ide/src/com/jetbrains/python/PyCharmCorePluginConfigurator.java b/python/ide/impl/src/com/jetbrains/python/PyCharmCorePluginConfigurator.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyCharmCorePluginConfigurator.java
rename to python/ide/impl/src/com/jetbrains/python/PyCharmCorePluginConfigurator.java
diff --git a/python/ide/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java b/python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java
rename to python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiser.java
diff --git a/python/ide/src/com/jetbrains/python/PyCharmProfessionalAdvertiserSettings.java b/python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiserSettings.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyCharmProfessionalAdvertiserSettings.java
rename to python/ide/impl/src/com/jetbrains/python/PyCharmProfessionalAdvertiserSettings.java
diff --git a/python/ide/src/com/jetbrains/python/PyDirectoryIndexExcludePolicy.java b/python/ide/impl/src/com/jetbrains/python/PyDirectoryIndexExcludePolicy.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyDirectoryIndexExcludePolicy.java
rename to python/ide/impl/src/com/jetbrains/python/PyDirectoryIndexExcludePolicy.java
diff --git a/python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.form b/python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsForm.form
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.form
rename to python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsForm.form
diff --git a/python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.java b/python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsForm.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.java
rename to python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsForm.java
diff --git a/python/ide/src/com/jetbrains/python/PyIdeCommonOptionsFormFactory.java b/python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsFormFactory.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyIdeCommonOptionsFormFactory.java
rename to python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsFormFactory.java
diff --git a/python/ide/src/com/jetbrains/python/PyModuleListener.java b/python/ide/impl/src/com/jetbrains/python/PyModuleListener.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyModuleListener.java
rename to python/ide/impl/src/com/jetbrains/python/PyModuleListener.java
diff --git a/python/ide/src/com/jetbrains/python/PyOptionsApplicabilityFilter.java b/python/ide/impl/src/com/jetbrains/python/PyOptionsApplicabilityFilter.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PyOptionsApplicabilityFilter.java
rename to python/ide/impl/src/com/jetbrains/python/PyOptionsApplicabilityFilter.java
diff --git a/python/ide/src/com/jetbrains/python/PythonModuleTypeManager.java b/python/ide/impl/src/com/jetbrains/python/PythonModuleTypeManager.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PythonModuleTypeManager.java
rename to python/ide/impl/src/com/jetbrains/python/PythonModuleTypeManager.java
diff --git a/python/ide/src/com/jetbrains/python/PythonSdkConfigurator.kt b/python/ide/impl/src/com/jetbrains/python/PythonSdkConfigurator.kt
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PythonSdkConfigurator.kt
rename to python/ide/impl/src/com/jetbrains/python/PythonSdkConfigurator.kt
diff --git a/python/ide/src/com/jetbrains/python/PythonSourceRootConfigurator.java b/python/ide/impl/src/com/jetbrains/python/PythonSourceRootConfigurator.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/PythonSourceRootConfigurator.java
rename to python/ide/impl/src/com/jetbrains/python/PythonSourceRootConfigurator.java
diff --git a/python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.form b/python/ide/impl/src/com/jetbrains/python/buildout/BuildoutConfigurable.form
similarity index 100%
rename from python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.form
rename to python/ide/impl/src/com/jetbrains/python/buildout/BuildoutConfigurable.form
diff --git a/python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.java b/python/ide/impl/src/com/jetbrains/python/buildout/BuildoutConfigurable.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/buildout/BuildoutConfigurable.java
rename to python/ide/impl/src/com/jetbrains/python/buildout/BuildoutConfigurable.java
diff --git a/python/ide/src/com/jetbrains/python/buildout/BuildoutFacetConfigurator.java b/python/ide/impl/src/com/jetbrains/python/buildout/BuildoutFacetConfigurator.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/buildout/BuildoutFacetConfigurator.java
rename to python/ide/impl/src/com/jetbrains/python/buildout/BuildoutFacetConfigurator.java
diff --git a/python/ide/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java b/python/ide/impl/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java
rename to python/ide/impl/src/com/jetbrains/python/buildout/BuildoutModulesConfigurable.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java b/python/ide/impl/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
rename to python/ide/impl/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java b/python/ide/impl/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
rename to python/ide/impl/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java b/python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
rename to python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java b/python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
rename to python/ide/impl/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java b/python/ide/impl/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
rename to python/ide/impl/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form b/python/ide/impl/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
rename to python/ide/impl/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java b/python/ide/impl/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
rename to python/ide/impl/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PySdkStatusBar.kt b/python/ide/impl/src/com/jetbrains/python/configuration/PySdkStatusBar.kt
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PySdkStatusBar.kt
rename to python/ide/impl/src/com/jetbrains/python/configuration/PySdkStatusBar.kt
diff --git a/python/ide/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java b/python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
rename to python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java b/python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
rename to python/ide/impl/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
diff --git a/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectAction.java b/python/ide/impl/src/com/jetbrains/python/newProject/PyCharmNewProjectAction.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectAction.java
rename to python/ide/impl/src/com/jetbrains/python/newProject/PyCharmNewProjectAction.java
diff --git a/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java b/python/ide/impl/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java
rename to python/ide/impl/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java
diff --git a/python/ide/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java b/python/ide/impl/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java
rename to python/ide/impl/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java
diff --git a/python/ide/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java b/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java
rename to python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java
diff --git a/python/ide/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java b/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java
similarity index 100%
rename from python/ide/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java
rename to python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java
diff --git a/python/ide/src/META-INF/plugin.xml b/python/ide/resources/META-INF/plugin.xml
similarity index 100%
rename from python/ide/src/META-INF/plugin.xml
rename to python/ide/resources/META-INF/plugin.xml
diff --git a/python/intellij.pycharm.community.customization.iml b/python/intellij.pycharm.community.customization.iml
index 988c26d46477..c7d6726684c2 100644
--- a/python/intellij.pycharm.community.customization.iml
+++ b/python/intellij.pycharm.community.customization.iml
@@ -3,16 +3,10 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/ide">
-      <sourceFolder url="file://$MODULE_DIR$/ide/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/ide/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="module" module-name="intellij.python.community.impl" />
-    <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="module" module-name="intellij.platform.diff" />
-    <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="RUNTIME" />
-    <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="intellij.pycharm.community.customization.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
new file mode 100644
index 000000000000..ad6ac9a7cba6
--- /dev/null
+++ b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
@@ -0,0 +1,16 @@
+<?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" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.python.community.impl" />
+    <orderEntry type="library" name="Guava" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/python/pluginCore/META-INF/python-community-plugin-core.xml b/python/pluginCore/impl/resources/META-INF/python-community-plugin-core.xml
similarity index 100%
rename from python/pluginCore/META-INF/python-community-plugin-core.xml
rename to python/pluginCore/impl/resources/META-INF/python-community-plugin-core.xml
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonFacetUtil.java b/python/pluginCore/impl/src/com/jetbrains/python/facet/PythonFacetUtil.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonFacetUtil.java
rename to python/pluginCore/impl/src/com/jetbrains/python/facet/PythonFacetUtil.java
diff --git a/python/pluginCore/com/jetbrains/python/facet/PythonSdkTableListener.java b/python/pluginCore/impl/src/com/jetbrains/python/facet/PythonSdkTableListener.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/facet/PythonSdkTableListener.java
rename to python/pluginCore/impl/src/com/jetbrains/python/facet/PythonSdkTableListener.java
diff --git a/python/pluginCore/com/jetbrains/python/packaging/PyManagePackagesAction.java b/python/pluginCore/impl/src/com/jetbrains/python/packaging/PyManagePackagesAction.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/packaging/PyManagePackagesAction.java
rename to python/pluginCore/impl/src/com/jetbrains/python/packaging/PyManagePackagesAction.java
diff --git a/python/pluginCore/com/jetbrains/python/packaging/PyManagePackagesDialog.java b/python/pluginCore/impl/src/com/jetbrains/python/packaging/PyManagePackagesDialog.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/packaging/PyManagePackagesDialog.java
rename to python/pluginCore/impl/src/com/jetbrains/python/packaging/PyManagePackagesDialog.java
diff --git a/python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsForm.form b/python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsForm.form
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsForm.form
rename to python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsForm.form
diff --git a/python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsForm.java b/python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
rename to python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsForm.java
diff --git a/python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsFormFactory.java b/python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsFormFactory.java
similarity index 100%
rename from python/pluginCore/com/jetbrains/python/run/PyPluginCommonOptionsFormFactory.java
rename to python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsFormFactory.java
diff --git a/python/pluginCore/intellij.python.community.plugin.iml b/python/pluginCore/intellij.python.community.plugin.iml
index 289ee6713f3a..510e3ffb6679 100644
--- a/python/pluginCore/intellij.python.community.plugin.iml
+++ b/python/pluginCore/intellij.python.community.plugin.iml
@@ -3,13 +3,9 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="module" module-name="intellij.python.community.impl" />
-    <orderEntry type="library" name="Guava" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/pluginCore/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml
similarity index 100%
rename from python/pluginCore/META-INF/plugin.xml
rename to python/pluginCore/resources/META-INF/plugin.xml
diff --git a/python/pluginCore/META-INF/pluginIcon.svg b/python/pluginCore/resources/META-INF/pluginIcon.svg
similarity index 100%
rename from python/pluginCore/META-INF/pluginIcon.svg
rename to python/pluginCore/resources/META-INF/pluginIcon.svg
diff --git a/python/pluginJava/intellij.python.community.plugin.java.iml b/python/pluginJava/intellij.python.community.plugin.java.iml
index bc2b753a7d07..70fb8b3f8c3f 100644
--- a/python/pluginJava/intellij.python.community.plugin.java.iml
+++ b/python/pluginJava/intellij.python.community.plugin.java.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="module" module-name="intellij.java.ui" />
-    <orderEntry type="module" module-name="intellij.python.community.plugin" />
+    <orderEntry type="module" module-name="intellij.python.community.plugin.impl" />
     <orderEntry type="module" module-name="intellij.python.psi.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/pluginMinor/intellij.python.community.plugin.minor.iml b/python/pluginMinor/intellij.python.community.plugin.minor.iml
index c88416f8afa3..0474c4966d84 100644
--- a/python/pluginMinor/intellij.python.community.plugin.minor.iml
+++ b/python/pluginMinor/intellij.python.community.plugin.minor.iml
@@ -10,6 +10,6 @@
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.python.community.impl" />
-    <orderEntry type="module" module-name="intellij.python.community.plugin" />
+    <orderEntry type="module" module-name="intellij.python.community.plugin.impl" />
   </component>
 </module>
\ No newline at end of file