diff --git a/.idea/libraries/Gradle.xml b/.idea/libraries/Gradle.xml
new file mode 100644
index 000000000000..5edf4faa43f1
--- /dev/null
+++ b/.idea/libraries/Gradle.xml
@@ -0,0 +1,31 @@
+<component name="libraryTable">
+  <library name="Gradle">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-native-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-2.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/tooling-api/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/core/src/main/groovy" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-core/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-groovy/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/messaging/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/wrapper/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services-groovy/src/main/groovy" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/native/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/resources/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/cli/src/main/java" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/plugins/gradle/gradle.iml b/plugins/gradle/gradle.iml
index befdf8f0e913..a513d5e77768 100644
--- a/plugins/gradle/gradle.iml
+++ b/plugins/gradle/gradle.iml
@@ -26,37 +26,7 @@
     <orderEntry type="module" module-name="junit" />
     <orderEntry type="library" name="swingx" level="project" />
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/gradle-tooling-api-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-core-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-messaging-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-model-core-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-model-groovy-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-wrapper-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-groovy-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-native-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-resources-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-cli-2.13.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-core/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-groovy/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/native/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/resources/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/cli/src/main/java" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="library" exported="" name="Gradle" level="project" />
     <orderEntry type="module-library" exported="">
       <library name="GradleGuava">
         <CLASSES>
diff --git a/plugins/gradle/jps-plugin/gradle-jps-plugin.iml b/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
index cc1ceddb77d4..2b6b830ce0f5 100644
--- a/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
+++ b/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
@@ -12,35 +12,7 @@
     <orderEntry type="module" module-name="jps-model-impl" />
     <orderEntry type="module" module-name="jps-model-api" />
     <orderEntry type="module" module-name="jps-model-serialization" />
-    <orderEntry type="module-library">
-      <library name="Gradle">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-core-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-groovy-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-resources-2.13.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-core/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-groovy/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/native/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/resources/src/main/java" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="Gradle" level="project" />
     <orderEntry type="library" exported="" name="Ant" level="project" />
     <orderEntry type="library" name="gson" level="project" />
   </component>
diff --git a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
index 97feb592226d..60c13a9e2f3e 100644
--- a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
+++ b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
@@ -12,29 +12,7 @@
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
-    <orderEntry type="module-library" exported="">
-      <library name="Gradle">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.13.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/native/src/main/java" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="library" exported="" name="Gradle" level="project" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="GradleGuava">
         <CLASSES>
diff --git a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
index 6746f99fa425..6fa4f7c53e8d 100644
--- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
+++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
@@ -10,35 +10,6 @@
     <orderEntry type="module" module-name="annotations" />
     <orderEntry type="module" module-name="external-system-rt" />
     <orderEntry type="module" module-name="gradle-tooling-extension-api" />
-    <orderEntry type="module-library">
-      <library name="Gradle">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-core-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-groovy-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.13.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/build-init/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/plugins/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/ide/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/ide/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/scala/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/reporting/src/main/groovy" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="GradleGuava">
         <CLASSES>
@@ -48,6 +19,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="Gradle" level="project" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module-library" scope="PROVIDED">