diff --git a/.idea/modules.xml b/.idea/modules.xml
index 5fce0842d25b..7421e587adaa 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -39,7 +39,7 @@
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/apkparser/binary-resources/binary-resources.iml" filepath="$PROJECT_DIR$/android/tools-base/apkparser/binary-resources/binary-resources.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/boot/boot.iml" filepath="$PROJECT_DIR$/platform/boot/boot.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" group="platform" />
-      <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
+      <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" group="build" />
       <module fileurl="file://$PROJECT_DIR$/android/build-common/build-common.iml" filepath="$PROJECT_DIR$/android/build-common/build-common.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/python/build/build-debug-binaries/build-debug-binaries.iml" filepath="$PROJECT_DIR$/python/build/build-debug-binaries/build-debug-binaries.iml" group="plugins/python" />
       <module fileurl="file://$PROJECT_DIR$/platform/build-scripts/testFramework/buildScripts-testFramework.iml" filepath="$PROJECT_DIR$/platform/build-scripts/testFramework/buildScripts-testFramework.iml" group="platform" />
@@ -79,7 +79,7 @@
       <module fileurl="file://$PROJECT_DIR$/java/debugger/debugger-agent-storage/debugger-agent-storage.iml" filepath="$PROJECT_DIR$/java/debugger/debugger-agent-storage/debugger-agent-storage.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/debugger/impl/debugger-impl.iml" filepath="$PROJECT_DIR$/java/debugger/impl/debugger-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/debugger/openapi/debugger-openapi.iml" filepath="$PROJECT_DIR$/java/debugger/openapi/debugger-openapi.iml" group="java" />
-      <module fileurl="file://$PROJECT_DIR$/build/dependencies/dependencies.iml" filepath="$PROJECT_DIR$/build/dependencies/dependencies.iml" />
+      <module fileurl="file://$PROJECT_DIR$/build/dependencies/dependencies.iml" filepath="$PROJECT_DIR$/build/dependencies/dependencies.iml" group="build" />
       <module fileurl="file://$PROJECT_DIR$/android/designer/designer.iml" filepath="$PROJECT_DIR$/android/designer/designer.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/android/designer/designer-tests.iml" filepath="$PROJECT_DIR$/android/designer/designer-tests.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit.iml" group="plugins" />
@@ -118,7 +118,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$/build/dependencies/gradle-api-deps/gradle-api-deps.iml" filepath="$PROJECT_DIR$/build/dependencies/gradle-api-deps/gradle-api-deps.iml" group="build" />
       <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" />