diff --git a/python/pluginJava/intellij.python.community.plugin.java.iml b/python/pluginJava/intellij.python.community.plugin.java.iml
index 935de45a1e76..26a1d6ad5a8e 100644
--- a/python/pluginJava/intellij.python.community.plugin.java.iml
+++ b/python/pluginJava/intellij.python.community.plugin.java.iml
@@ -3,7 +3,8 @@
   <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" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/python/pluginJava/intellij.python.community.plugin.java.xml b/python/pluginJava/resources/intellij.python.community.plugin.java.xml
similarity index 100%
rename from python/pluginJava/intellij.python.community.plugin.java.xml
rename to python/pluginJava/resources/intellij.python.community.plugin.java.xml
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/PythonNewProjectWizard.kt b/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonNewProjectWizard.kt
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/PythonNewProjectWizard.kt
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/PythonNewProjectWizard.kt
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/PythonSdkEditorAdditionalOptionsProvider.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacet.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/JavaPythonFacet.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacet.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/JavaPythonFacet.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetConfiguration.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/JavaPythonFacetConfiguration.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetConfiguration.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/JavaPythonFacetConfiguration.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetType.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/JavaPythonFacetType.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/JavaPythonFacetType.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/JavaPythonFacetType.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PyProjectStructureDetector.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PyProjectStructureDetector.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PyProjectStructureDetector.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PyProjectStructureDetector.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonFrameworkSupportConfigurable.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonFrameworkSupportConfigurable.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonFrameworkSupportConfigurable.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonFrameworkSupportConfigurable.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonFrameworkSupportProvider.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonFrameworkSupportProvider.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonFrameworkSupportProvider.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonFrameworkSupportProvider.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonModuleBuilder.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonModuleBuilder.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonModuleBuilder.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonModuleBuilder.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonModuleConfigurationEditorProvider.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonModuleConfigurationEditorProvider.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonModuleConfigurationEditorProvider.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonModuleConfigurationEditorProvider.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonModuleType.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonModuleType.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonModuleType.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonModuleType.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkComboBox.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonSdkComboBox.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkComboBox.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonSdkComboBox.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.form b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.form
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.form
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.form
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/facet/PythonSdkEditorTab.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/inspections/PythonPluginCommandLineInspectionProjectConfigurator.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyConstructorArgumentCompletionContributor.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyConstructorArgumentCompletionContributor.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyConstructorArgumentCompletionContributor.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyConstructorArgumentCompletionContributor.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaClassType.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaClassType.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaClassType.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaClassType.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportCandidateProvider.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportCandidateProvider.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportCandidateProvider.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportCandidateProvider.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportResolver.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportResolver.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportResolver.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaImportResolver.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaMethodType.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaMethodType.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaMethodType.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaMethodType.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaPackageType.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaPackageType.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaPackageType.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaPackageType.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaSuperMethodsSearchExecutor.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaSuperMethodsSearchExecutor.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaSuperMethodsSearchExecutor.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaSuperMethodsSearchExecutor.java
diff --git a/python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaTypeProvider.java b/python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaTypeProvider.java
similarity index 100%
rename from python/pluginJava/com/intellij/python/community/plugin/java/psi/impl/PyJavaTypeProvider.java
rename to python/pluginJava/src/com/intellij/python/community/plugin/java/psi/impl/PyJavaTypeProvider.java