diff --git a/plugins/javaFX/javaFX-CE/intellij.javaFX.community.iml b/plugins/javaFX/javaFX-CE/intellij.javaFX.community.iml
index 85e397f67389..60653ba6a1e8 100644
--- a/plugins/javaFX/javaFX-CE/intellij.javaFX.community.iml
+++ b/plugins/javaFX/javaFX-CE/intellij.javaFX.community.iml
@@ -3,8 +3,8 @@
   <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$/testSrc" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/javaFX/javaFX-CE/src/META-INF/plugin.xml b/plugins/javaFX/javaFX-CE/resources/META-INF/plugin.xml
similarity index 100%
rename from plugins/javaFX/javaFX-CE/src/META-INF/plugin.xml
rename to plugins/javaFX/javaFX-CE/resources/META-INF/plugin.xml
diff --git a/python/intellij.pycharm.community.iml b/python/intellij.pycharm.community.iml
index 8bfd70edd5fb..3a9ac63e4727 100644
--- a/python/intellij.pycharm.community.iml
+++ b/python/intellij.pycharm.community.iml
@@ -3,7 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/ideCoreSrc">
-      <sourceFolder url="file://$MODULE_DIR$/ideCoreSrc" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/ideCoreSrc" type="java-resource" />
     </content>
     <content url="file://$MODULE_DIR$/resources">
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
diff --git a/resources-en/intellij.java.resources.en.iml b/resources-en/intellij.java.resources.en.iml
index 511ae57581f8..ced5c3564ff3 100644
--- a/resources-en/intellij.java.resources.en.iml
+++ b/resources-en/intellij.java.resources.en.iml
@@ -3,7 +3,7 @@
   <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" />
diff --git a/resources-en/src/search/searchableOptions.xml b/resources-en/resources/search/searchableOptions.xml
similarity index 100%
rename from resources-en/src/search/searchableOptions.xml
rename to resources-en/resources/search/searchableOptions.xml
diff --git a/resources/intellij.java.resources.iml b/resources/intellij.java.resources.iml
index 17548ead1435..ff984b6cbfb2 100644
--- a/resources/intellij.java.resources.iml
+++ b/resources/intellij.java.resources.iml
@@ -3,7 +3,7 @@
   <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$/src" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />