diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0713b77690ab..d83b46018087 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -106,6 +106,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" group="plugins/GAE" />
       <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" group="plugins/GAE" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle.iml" group="plugins/gradle" />
+      <module fileurl="file://$PROJECT_DIR$/build/dependencies/gradle-api-deps/gradle-api-deps.iml" filepath="$PROJECT_DIR$/build/dependencies/gradle-api-deps/gradle-api-deps.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/jps-plugin/gradle-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/gradle/jps-plugin/gradle-jps-plugin.iml" group="plugins/gradle" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle-tests.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle-tests.iml" group="plugins/gradle" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" group="plugins/gradle" />
diff --git a/build/dependencies/build.gradle b/build/dependencies/build.gradle
index fa4725090d7b..39bc92fc2624 100644
--- a/build/dependencies/build.gradle
+++ b/build/dependencies/build.gradle
@@ -24,9 +24,6 @@ buildscript {
     classpath "de.undercouch:gradle-download-task:3.2.0"
   }
 }
-plugins {
-  id "com.jfrog.bintray" version "1.7.3" apply false
-}
 
 apply plugin: 'idea'
 idea {
@@ -102,7 +99,6 @@ apply from: 'setupKotlin.gradle'
 apply from: 'setupJetSign.gradle'
 apply from: 'setupAndroidSdk.gradle'
 apply from: 'setupBuildScriptsDeps.gradle'
-apply from: 'setupGradleApiDeps.gradle'
 
 task setupDependencies(dependsOn: ['setupJdks', 'setupJbre', 'setupKotlinPlugin', 'setupJetSign'], group: 'dependencies')
 clean.dependsOn('cleanSetupJdks', 'cleanSetupJbre', 'cleanSetupKotlinPlugin', 'cleanSetupJetSign')
diff --git a/build/dependencies/setupGradleApiDeps.gradle b/build/dependencies/gradle-api-deps/build.gradle
similarity index 98%
rename from build/dependencies/setupGradleApiDeps.gradle
rename to build/dependencies/gradle-api-deps/build.gradle
index 5a255bdfc672..1b1d32bb5248 100644
--- a/build/dependencies/setupGradleApiDeps.gradle
+++ b/build/dependencies/gradle-api-deps/build.gradle
@@ -1,5 +1,11 @@
 import org.gradle.tooling.GradleConnector
 
+plugins {
+  id "base"
+  id "maven-publish"
+  id "com.jfrog.bintray" version "1.7.3"
+}
+
 def intelliJDepsGroupId = 'org.jetbrains.intellij.deps'
 def gradleApiArtifactId = 'gradle-api'
 def gradleApiImplDepArtifactId = 'gradle-api-impldep'
@@ -88,9 +94,6 @@ task gradleApiImplDepJar(type: Zip, dependsOn: expandGradleApiJar) {
   include 'org/gradle/internal/impldep/**'
 }
 
-apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
-
 publishing {
   publications {
     gradleApi(MavenPublication) {
diff --git a/build/dependencies/gradle-api-deps/gradle-api-deps.iml b/build/dependencies/gradle-api-deps/gradle-api-deps.iml
new file mode 100644
index 000000000000..d110b7d959ca
--- /dev/null
+++ b/build/dependencies/gradle-api-deps/gradle-api-deps.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/out/production/classes" />
+    <output-test url="file://$MODULE_DIR$/out/test/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/build/dependencies/settings.gradle b/build/dependencies/settings.gradle
index 155a87622cc3..3ff8c83f72a6 100644
--- a/build/dependencies/settings.gradle
+++ b/build/dependencies/settings.gradle
@@ -13,4 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-rootProject.name = 'dependencies'
\ No newline at end of file
+rootProject.name = 'dependencies'
+//include 'gradle-api-deps'
\ No newline at end of file