diff --git a/resources/src/META-INF/JavaIdePlugin.xml b/resources/src/META-INF/JavaIdePlugin.xml
index a46c334e0de5..71b6e2d04d07 100644
--- a/resources/src/META-INF/JavaIdePlugin.xml
+++ b/resources/src/META-INF/JavaIdePlugin.xml
@@ -26,7 +26,9 @@
   <module value="com.intellij.modules.xdebugger"/>
   <module value="com.intellij.modules.externalSystem"/>
 
-  <xi:include href="/componentSets/IdeaComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/componentSets/PlatformLangComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/componentSets/ExternalSystemComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/componentSets/Compiler.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <extensionPoints>
     <xi:include href="/META-INF/PlatformExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
@@ -207,6 +209,9 @@
   </xi:include>
 
   <application-components>
+    <component>
+      <implementation-class>com.intellij.internal.statistic.updater.StatisticsJobsScheduler</implementation-class>
+    </component>
     <component>
       <implementation-class>com.intellij.openapi.projectRoots.impl.DefaultJdkConfigurator</implementation-class>
       <headless-implementation-class/>
@@ -214,6 +219,9 @@
   </application-components>
 
   <project-components>
+    <component>
+      <implementation-class>com.intellij.openapi.vcs.impl.ModuleVcsDetector</implementation-class>
+    </component>
     <component>
       <implementation-class>com.intellij.framework.detection.impl.FrameworkDetectionManager</implementation-class>
     </component>
diff --git a/resources/src/componentSets/IdeaComponents.xml b/resources/src/componentSets/IdeaComponents.xml
deleted file mode 100644
index f6dbe1aaed48..000000000000
--- a/resources/src/componentSets/IdeaComponents.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://www.w3.org/2001/XInclude
-   http://www.w3.org/2001/XInclude.xsd">
-
-  <application-components>
-    <component>
-      <implementation-class>com.intellij.openapi.util.registry.RegistryState</implementation-class>
-    </component>
-    <component>
-      <implementation-class>com.intellij.internal.statistic.updater.StatisticsJobsScheduler</implementation-class>
-    </component>
-    <component>
-      <interface-class>com.intellij.openapi.project.impl.ProjectStoreClassProvider</interface-class>
-      <implementation-class>com.intellij.configurationStore.PlatformLangProjectStoreClassProvider</implementation-class>
-    </component>
-  </application-components>
-
-  <xi:include href="/componentSets/Platform.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/componentSets/UICore.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/componentSets/WindowManagement.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/componentSets/Lang.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/componentSets/ProjectView.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/componentSets/Editor.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/componentSets/ExternalSystemComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="Compiler.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/componentSets/Execution.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/componentSets/VCS.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <application-components>
-    <component>
-      <implementation-class>com.intellij.platform.PlatformProjectStarter</implementation-class>
-    </component>
-  </application-components>
-
-  <project-components>
-    <component>
-      <implementation-class>com.intellij.openapi.vcs.impl.ModuleVcsDetector</implementation-class>
-    </component>
-
-    <component>
-      <interface-class>com.intellij.profile.codeInspection.ProjectInspectionProfileManager</interface-class>
-      <implementation-class>com.intellij.profile.codeInspection.ProjectInspectionProfileManager</implementation-class>
-      <loadForDefaultProject/>
-    </component>
-  </project-components>
-
-</idea-plugin>
-