diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index c512c89c0f90..6f71e0f13940 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="library" scope="PROVIDED" name="Mac" level="project" />
     <orderEntry type="inheritedJdk" />
diff --git a/platform/platform-impl/src/META-INF/resources/webjars/js-beautify/1.6.12/js/lib/beautify.js b/platform/platform-impl/resources/META-INF/resources/webjars/js-beautify/1.6.12/js/lib/beautify.js
similarity index 100%
rename from platform/platform-impl/src/META-INF/resources/webjars/js-beautify/1.6.12/js/lib/beautify.js
rename to platform/platform-impl/resources/META-INF/resources/webjars/js-beautify/1.6.12/js/lib/beautify.js
diff --git a/platform/platform-impl/resources/META-INF/services/org.jetbrains.jps.plugin.JpsPluginManager b/platform/platform-impl/resources/META-INF/services/org.jetbrains.jps.plugin.JpsPluginManager
new file mode 100644
index 000000000000..5add5d7d00d0
--- /dev/null
+++ b/platform/platform-impl/resources/META-INF/services/org.jetbrains.jps.plugin.JpsPluginManager
@@ -0,0 +1,2 @@
+# Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+com.intellij.jps.impl.JpsIdePluginManagerImpl
diff --git a/platform/platform-impl/src/icons/plugins/Android.png b/platform/platform-impl/resources/icons/plugins/Android.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/Android.png
rename to platform/platform-impl/resources/icons/plugins/Android.png
diff --git a/platform/platform-impl/src/icons/plugins/Android@2x.png b/platform/platform-impl/resources/icons/plugins/Android@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/Android@2x.png
rename to platform/platform-impl/resources/icons/plugins/Android@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/ApplicationServers.png b/platform/platform-impl/resources/icons/plugins/ApplicationServers.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/ApplicationServers.png
rename to platform/platform-impl/resources/icons/plugins/ApplicationServers.png
diff --git a/platform/platform-impl/src/icons/plugins/ApplicationServers@2x.png b/platform/platform-impl/resources/icons/plugins/ApplicationServers@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/ApplicationServers@2x.png
rename to platform/platform-impl/resources/icons/plugins/ApplicationServers@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/BuildTools.png b/platform/platform-impl/resources/icons/plugins/BuildTools.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/BuildTools.png
rename to platform/platform-impl/resources/icons/plugins/BuildTools.png
diff --git a/platform/platform-impl/src/icons/plugins/BuildTools@2x.png b/platform/platform-impl/resources/icons/plugins/BuildTools@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/BuildTools@2x.png
rename to platform/platform-impl/resources/icons/plugins/BuildTools@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/Clouds.png b/platform/platform-impl/resources/icons/plugins/Clouds.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/Clouds.png
rename to platform/platform-impl/resources/icons/plugins/Clouds.png
diff --git a/platform/platform-impl/src/icons/plugins/Clouds@2x.png b/platform/platform-impl/resources/icons/plugins/Clouds@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/Clouds@2x.png
rename to platform/platform-impl/resources/icons/plugins/Clouds@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/DatabaseTools.png b/platform/platform-impl/resources/icons/plugins/DatabaseTools.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/DatabaseTools.png
rename to platform/platform-impl/resources/icons/plugins/DatabaseTools.png
diff --git a/platform/platform-impl/src/icons/plugins/DatabaseTools@2x.png b/platform/platform-impl/resources/icons/plugins/DatabaseTools@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/DatabaseTools@2x.png
rename to platform/platform-impl/resources/icons/plugins/DatabaseTools@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/JavaFrameworks.png b/platform/platform-impl/resources/icons/plugins/JavaFrameworks.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/JavaFrameworks.png
rename to platform/platform-impl/resources/icons/plugins/JavaFrameworks.png
diff --git a/platform/platform-impl/src/icons/plugins/JavaFrameworks@2x.png b/platform/platform-impl/resources/icons/plugins/JavaFrameworks@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/JavaFrameworks@2x.png
rename to platform/platform-impl/resources/icons/plugins/JavaFrameworks@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/OtherTools.png b/platform/platform-impl/resources/icons/plugins/OtherTools.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/OtherTools.png
rename to platform/platform-impl/resources/icons/plugins/OtherTools.png
diff --git a/platform/platform-impl/src/icons/plugins/OtherTools@2x.png b/platform/platform-impl/resources/icons/plugins/OtherTools@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/OtherTools@2x.png
rename to platform/platform-impl/resources/icons/plugins/OtherTools@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/PluginDevelopment.png b/platform/platform-impl/resources/icons/plugins/PluginDevelopment.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/PluginDevelopment.png
rename to platform/platform-impl/resources/icons/plugins/PluginDevelopment.png
diff --git a/platform/platform-impl/src/icons/plugins/PluginDevelopment@2x.png b/platform/platform-impl/resources/icons/plugins/PluginDevelopment@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/PluginDevelopment@2x.png
rename to platform/platform-impl/resources/icons/plugins/PluginDevelopment@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/Swing.png b/platform/platform-impl/resources/icons/plugins/Swing.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/Swing.png
rename to platform/platform-impl/resources/icons/plugins/Swing.png
diff --git a/platform/platform-impl/src/icons/plugins/Swing@2x.png b/platform/platform-impl/resources/icons/plugins/Swing@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/Swing@2x.png
rename to platform/platform-impl/resources/icons/plugins/Swing@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/TestTools.png b/platform/platform-impl/resources/icons/plugins/TestTools.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/TestTools.png
rename to platform/platform-impl/resources/icons/plugins/TestTools.png
diff --git a/platform/platform-impl/src/icons/plugins/TestTools@2x.png b/platform/platform-impl/resources/icons/plugins/TestTools@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/TestTools@2x.png
rename to platform/platform-impl/resources/icons/plugins/TestTools@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/VersionControls.png b/platform/platform-impl/resources/icons/plugins/VersionControls.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/VersionControls.png
rename to platform/platform-impl/resources/icons/plugins/VersionControls.png
diff --git a/platform/platform-impl/src/icons/plugins/VersionControls@2x.png b/platform/platform-impl/resources/icons/plugins/VersionControls@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/VersionControls@2x.png
rename to platform/platform-impl/resources/icons/plugins/VersionControls@2x.png
diff --git a/platform/platform-impl/src/icons/plugins/WebDevelopment.png b/platform/platform-impl/resources/icons/plugins/WebDevelopment.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/WebDevelopment.png
rename to platform/platform-impl/resources/icons/plugins/WebDevelopment.png
diff --git a/platform/platform-impl/src/icons/plugins/WebDevelopment@2x.png b/platform/platform-impl/resources/icons/plugins/WebDevelopment@2x.png
similarity index 100%
rename from platform/platform-impl/src/icons/plugins/WebDevelopment@2x.png
rename to platform/platform-impl/resources/icons/plugins/WebDevelopment@2x.png
diff --git a/platform/platform-impl/src/META-INF/services/org.jetbrains.jps.plugin.JpsPluginManager b/platform/platform-impl/src/META-INF/services/org.jetbrains.jps.plugin.JpsPluginManager
deleted file mode 100644
index fc337eeb1b0a..000000000000
--- a/platform/platform-impl/src/META-INF/services/org.jetbrains.jps.plugin.JpsPluginManager
+++ /dev/null
@@ -1 +0,0 @@
-com.intellij.jps.impl.JpsIdePluginManagerImpl