diff --git a/.idea/modules.xml b/.idea/modules.xml
index e6d2248dbebb..0e824e3880a6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -435,8 +435,9 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/jps-plugin/intellij.eclipse.jps.iml" filepath="$PROJECT_DIR$/plugins/eclipse/jps-plugin/intellij.eclipse.jps.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/editorconfig/intellij.editorconfig.iml" filepath="$PROJECT_DIR$/plugins/editorconfig/intellij.editorconfig.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/intellij.gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/intellij.gradle.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/intellij.java.gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/intellij.java.gradle.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/intellij.java.gradle.tests.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/intellij.java.gradle.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/intellij.gradle.common.iml" filepath="$PROJECT_DIR$/plugins/gradle/intellij.gradle.common.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.tests.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/jps-plugin/intellij.gradle.jps.iml" filepath="$PROJECT_DIR$/plugins/gradle/jps-plugin/intellij.gradle.jps.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/intellij.gradle.tests.iml" filepath="$PROJECT_DIR$/plugins/gradle/intellij.gradle.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-api/intellij.gradle.toolingExtension.iml" />
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index ecb8a4909f30..ec6981d33096 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -84,7 +84,7 @@
     <orderEntry type="module" module-name="intellij.vcs.github" />
     <orderEntry type="module" module-name="intellij.vcs.hg" />
     <orderEntry type="module" module-name="intellij.relaxng" />
-    <orderEntry type="module" module-name="intellij.java.gradle" />
+    <orderEntry type="module" module-name="intellij.gradle.java" />
     <orderEntry type="module" module-name="intellij.platform.remoteServers.impl" />
     <orderEntry type="module" module-name="intellij.xml.dom.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index 87792181a54b..457129433b76 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -168,6 +168,8 @@ class CommunityRepositoryModules {
       ])
     },
     plugin("intellij.gradle") {
+      withModule("intellij.gradle.common")
+      withModule("intellij.gradle.java")
       withModule("intellij.gradle.jps")
       withModule("intellij.gradle.toolingExtension")
       withModule("intellij.gradle.toolingExtension.impl")
diff --git a/plugins/devkit/intellij.devkit.iml b/plugins/devkit/intellij.devkit.iml
index db636d2a557a..2fc0f7971f80 100644
--- a/plugins/devkit/intellij.devkit.iml
+++ b/plugins/devkit/intellij.devkit.iml
@@ -41,7 +41,7 @@
     <orderEntry type="module" module-name="intellij.devkit.jps" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.images" />
     <orderEntry type="module" module-name="intellij.platform.uast" />
-    <orderEntry type="module" module-name="intellij.java.gradle" />
+    <orderEntry type="module" module-name="intellij.gradle.java" />
     <orderEntry type="module" module-name="intellij.java.ui" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
diff --git a/plugins/gradle/intellij.gradle.common.iml b/plugins/gradle/intellij.gradle.common.iml
new file mode 100644
index 000000000000..24264e4ba2bb
--- /dev/null
+++ b/plugins/gradle/intellij.gradle.common.iml
@@ -0,0 +1,25 @@
+<?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$/resources">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/src">
+          <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.gradle.toolingExtension" exported="" />
+    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="library" exported="" name="Slf4j" level="project" />
+    <orderEntry type="library" exported="" name="Gradle" level="project" />
+    <orderEntry type="library" name="Kryo" level="project" />
+    <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="library" name="gson" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/gradle/intellij.gradle.iml b/plugins/gradle/intellij.gradle.iml
index 64db2f2d3d3d..e4358e2c2343 100644
--- a/plugins/gradle/intellij.gradle.iml
+++ b/plugins/gradle/intellij.gradle.iml
@@ -3,21 +3,10 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugin-resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.externalSystem" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" exported="" />
-    <orderEntry type="module" module-name="intellij.gradle.toolingExtension" exported="" />
-    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
-    <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="library" exported="" name="Slf4j" level="project" />
-    <orderEntry type="library" exported="" name="Gradle" level="project" />
-    <orderEntry type="library" name="Kryo" level="project" />
-    <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.gradle.common" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml
index 140c5d4d18ae..8a30037b3e04 100644
--- a/plugins/gradle/intellij.gradle.tests.iml
+++ b/plugins/gradle/intellij.gradle.tests.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.gradle.common" scope="TEST" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension.tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
     <orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
diff --git a/plugins/gradle/java/intellij.java.gradle.iml b/plugins/gradle/java/intellij.gradle.java.iml
similarity index 91%
rename from plugins/gradle/java/intellij.java.gradle.iml
rename to plugins/gradle/java/intellij.gradle.java.iml
index 9ba8df7ca99f..645f9c1def37 100644
--- a/plugins/gradle/java/intellij.java.gradle.iml
+++ b/plugins/gradle/java/intellij.gradle.java.iml
@@ -4,11 +4,11 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="org.jetbrains.plugins.gradle" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.gradle" exported="" />
+    <orderEntry type="module" module-name="intellij.gradle" />
+    <orderEntry type="module" module-name="intellij.gradle.common" exported="" />
     <orderEntry type="module" module-name="intellij.java.coverage" />
     <orderEntry type="module" module-name="intellij.gradle.jps" />
     <orderEntry type="module" module-name="intellij.java.ui" />
diff --git a/plugins/gradle/java/intellij.java.gradle.tests.iml b/plugins/gradle/java/intellij.gradle.java.tests.iml
similarity index 95%
rename from plugins/gradle/java/intellij.java.gradle.tests.iml
rename to plugins/gradle/java/intellij.gradle.java.tests.iml
index addca9337a5e..be50dd42ee08 100644
--- a/plugins/gradle/java/intellij.java.gradle.tests.iml
+++ b/plugins/gradle/java/intellij.gradle.java.tests.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.java.gradle" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.gradle.java" scope="TEST" />
     <orderEntry type="module" module-name="intellij.gradle.tests" exported="" scope="TEST" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.compiler.impl" scope="TEST" />
diff --git a/plugins/gradle/java/resources/META-INF/gradle-coverage-integration.xml b/plugins/gradle/plugin-resources/META-INF/gradle-coverage-integration.xml
similarity index 100%
rename from plugins/gradle/java/resources/META-INF/gradle-coverage-integration.xml
rename to plugins/gradle/plugin-resources/META-INF/gradle-coverage-integration.xml
diff --git a/plugins/gradle/java/resources/META-INF/plugin.xml b/plugins/gradle/plugin-resources/META-INF/gradle-java-plugin.xml
similarity index 96%
rename from plugins/gradle/java/resources/META-INF/plugin.xml
rename to plugins/gradle/plugin-resources/META-INF/gradle-java-plugin.xml
index 5f87c8275aad..7ada37650277 100644
--- a/plugins/gradle/java/resources/META-INF/plugin.xml
+++ b/plugins/gradle/plugin-resources/META-INF/gradle-java-plugin.xml
@@ -15,12 +15,8 @@
   -->
 
 <idea-plugin url="https://confluence.jetbrains.com/display/IDEADEV/Gradle+integration">
-  <name>Gradle: JVM</name>
-  <id>org.jetbrains.plugins.gradle.java</id>
-  <vendor>JetBrains</vendor>
-  <description>
-    Supports the development of JVM-based applications with Gradle.
-  </description>
+
+  <module value="org.jetbrains.plugins.gradle.java"/>
 
   <depends>org.jetbrains.plugins.gradle</depends>
   <depends>org.intellij.groovy</depends>
@@ -64,6 +60,8 @@
     <applicationService serviceInterface="org.jetbrains.plugins.gradle.GradleIdeManager"
                         serviceImplementation="org.jetbrains.plugins.gradle.GradleJavaIdeManager"/>
 
+    <treeStructureProvider implementation="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider" order="last"/>
+
     <compileServer.plugin classpath="gradle-jps-plugin.jar"/>
     <postStartupActivity implementation="org.jetbrains.plugins.gradle.startup.GradleJvmStartupActivity"/>
     <projectTaskRunner implementation="org.jetbrains.plugins.gradle.execution.build.GradleProjectTaskRunner" id="gradle" order="first"/>
@@ -99,7 +97,7 @@
     <projectImportBuilder implementation="org.jetbrains.plugins.gradle.service.project.wizard.GradleProjectImportBuilder"/>
     <moduleBuilder builderClass="org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder"/>
     <projectImportProvider implementation="org.jetbrains.plugins.gradle.service.project.wizard.GradleProjectImportProvider"/>
-    <projectOpenProcessor implementation="org.jetbrains.plugins.gradle.service.project.wizard.GradleProjectOpenProcessor"/>
+    <projectOpenProcessor id="java" implementation="org.jetbrains.plugins.gradle.service.project.wizard.GradleJavaProjectOpenProcessor"/>
 
     <externalSystemExecutionConsoleManager
         implementation="org.jetbrains.plugins.gradle.execution.test.runner.GradleTestsExecutionConsoleManager" id="gradleTest" order="before gradle"/>
diff --git a/plugins/gradle/java/resources/META-INF/gradle-maven-integration.xml b/plugins/gradle/plugin-resources/META-INF/gradle-maven-integration.xml
similarity index 100%
rename from plugins/gradle/java/resources/META-INF/gradle-maven-integration.xml
rename to plugins/gradle/plugin-resources/META-INF/gradle-maven-integration.xml
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/plugin-resources/META-INF/plugin.xml
similarity index 96%
rename from plugins/gradle/src/META-INF/plugin.xml
rename to plugins/gradle/plugin-resources/META-INF/plugin.xml
index a3ace90ef263..e52f9398eed2 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/plugin-resources/META-INF/plugin.xml
@@ -15,7 +15,7 @@
   -->
 
 <idea-plugin url="https://confluence.jetbrains.com/display/IDEADEV/Gradle+integration">
-  <name>Gradle: Base support</name>
+  <name>Gradle</name>
   <id>org.jetbrains.plugins.gradle</id>
   <vendor>JetBrains</vendor>
   <description>
@@ -38,6 +38,7 @@
   </description>
 
   <depends>com.intellij.modules.lang</depends>
+  <depends optional="true" config-file="gradle-java-plugin.xml">com.intellij.modules.java</depends>
 
   <resource-bundle>i18n.GradleBundle</resource-bundle>
 
@@ -64,6 +65,9 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <postStartupActivity implementation="org.jetbrains.plugins.gradle.service.project.GradleStartupActivity"/>
+    <projectOpenProcessor id="default"
+                          implementation="org.jetbrains.plugins.gradle.service.project.GradleProjectOpenProcessor"
+                          order="last"/>
     <orderEnumerationHandlerFactory implementation="org.jetbrains.plugins.gradle.execution.GradleOrderEnumeratorHandler$FactoryImpl"/>
     <consoleFilterProvider implementation="org.jetbrains.plugins.gradle.execution.GradleConsoleFilterProvider"/>
     <stacktrace.fold substring="at org.gradle."/>
@@ -86,7 +90,6 @@
                     id="reference.settings.project.gradle.running" key="gradle.runner" bundle="i18n.GradleBundle"
                     nonDefaultProject="true"/>
     </projectConfigurable>
-    <treeStructureProvider implementation="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider" order="last"/>
     <editorTabTitleProvider implementation="org.jetbrains.plugins.gradle.util.GradleEditorTabTitleProvider"/>
     <configurationType implementation="org.jetbrains.plugins.gradle.service.execution.GradleExternalTaskConfigurationType"/>
 
diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
index 6a433c7f60c4..785ad754b7fe 100644
--- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
+++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml
@@ -11,7 +11,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
-    <orderEntry type="module" module-name="intellij.gradle" />
+    <orderEntry type="module" module-name="intellij.gradle.common" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file