diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.kt b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.kt
index f65afd41fe74..86da0f245710 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultKeymap.kt
@@ -69,8 +69,7 @@ open class DefaultKeymap {
         loadKeymap(getKeymapName(bean), object : SchemeDataHolder<KeymapImpl> {
           override fun read(): Element {
             val effectiveFile = getEffectiveFile(bean)
-            // java plugin defines keymap that located in a core plugin - so, we must check parents
-            val data = ResourceUtil.getResourceAsBytes(effectiveFile, pluginDescriptor.classLoader, true)
+            val data = ResourceUtil.getResourceAsBytes(effectiveFile, pluginDescriptor.classLoader)
             if (data == null) {
               throw PluginException("Cannot find $effectiveFile", pluginDescriptor.pluginId)
             }
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.kt
index 47416d7f4ae5..cbe5be6164c0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.kt
@@ -114,7 +114,7 @@ class KeymapManagerImpl : KeymapManagerEx(), PersistentStateComponent<Element> {
         //    schemeManager.findSchemeByName(KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP) == null) return
         val keymap = DefaultKeymap.getInstance().loadKeymap(keymapName, object : SchemeDataHolder<KeymapImpl> {
           override fun read(): Element {
-            return JDOMUtil.load(ResourceUtil.getResourceAsBytes(getEffectiveFile(ep), pluginDescriptor.classLoader, true))
+            return JDOMUtil.load(ResourceUtil.getResourceAsBytes(getEffectiveFile(ep), pluginDescriptor.classLoader))
           }
         }, pluginDescriptor)
         schemeManager.addScheme(keymap)
diff --git a/plugins/keymaps/eclipse-keymap/intellij.keymap.eclipse.iml b/plugins/keymaps/eclipse-keymap/intellij.keymap.eclipse.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/eclipse-keymap/intellij.keymap.eclipse.iml
+++ b/plugins/keymaps/eclipse-keymap/intellij.keymap.eclipse.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/Eclipse (Mac OS X).xml b/plugins/keymaps/eclipse-keymap/resources/keymaps/Eclipse (Mac OS X).xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Eclipse (Mac OS X).xml
rename to plugins/keymaps/eclipse-keymap/resources/keymaps/Eclipse (Mac OS X).xml
diff --git a/platform/platform-resources/src/keymaps/Eclipse.xml b/plugins/keymaps/eclipse-keymap/resources/keymaps/Eclipse.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Eclipse.xml
rename to plugins/keymaps/eclipse-keymap/resources/keymaps/Eclipse.xml
diff --git a/plugins/keymaps/netbeans5.6-keymap/intellij.keymap.netbeans.iml b/plugins/keymaps/netbeans5.6-keymap/intellij.keymap.netbeans.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/netbeans5.6-keymap/intellij.keymap.netbeans.iml
+++ b/plugins/keymaps/netbeans5.6-keymap/intellij.keymap.netbeans.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/NetBeans 6.5.xml b/plugins/keymaps/netbeans5.6-keymap/resources/keymaps/NetBeans 6.5.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/NetBeans 6.5.xml
rename to plugins/keymaps/netbeans5.6-keymap/resources/keymaps/NetBeans 6.5.xml
diff --git a/plugins/keymaps/qtcreator-keymap/intellij.keymap.qtcreator.iml b/plugins/keymaps/qtcreator-keymap/intellij.keymap.qtcreator.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/qtcreator-keymap/intellij.keymap.qtcreator.iml
+++ b/plugins/keymaps/qtcreator-keymap/intellij.keymap.qtcreator.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/QtCreator (Mac OS X).xml b/plugins/keymaps/qtcreator-keymap/resources/keymaps/QtCreator (Mac OS X).xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/QtCreator (Mac OS X).xml
rename to plugins/keymaps/qtcreator-keymap/resources/keymaps/QtCreator (Mac OS X).xml
diff --git a/platform/platform-resources/src/keymaps/QtCreator.xml b/plugins/keymaps/qtcreator-keymap/resources/keymaps/QtCreator.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/QtCreator.xml
rename to plugins/keymaps/qtcreator-keymap/resources/keymaps/QtCreator.xml
diff --git a/plugins/keymaps/resharper-keymap/intellij.keymap.resharper.iml b/plugins/keymaps/resharper-keymap/intellij.keymap.resharper.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/resharper-keymap/intellij.keymap.resharper.iml
+++ b/plugins/keymaps/resharper-keymap/intellij.keymap.resharper.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/ReSharper OSX.xml b/plugins/keymaps/resharper-keymap/resources/keymaps/ReSharper OSX.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/ReSharper OSX.xml
rename to plugins/keymaps/resharper-keymap/resources/keymaps/ReSharper OSX.xml
diff --git a/platform/platform-resources/src/keymaps/ReSharper.xml b/plugins/keymaps/resharper-keymap/resources/keymaps/ReSharper.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/ReSharper.xml
rename to plugins/keymaps/resharper-keymap/resources/keymaps/ReSharper.xml
diff --git a/plugins/keymaps/visual-assist-keymap/intellij.keymap.visualAssist.iml b/plugins/keymaps/visual-assist-keymap/intellij.keymap.visualAssist.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/visual-assist-keymap/intellij.keymap.visualAssist.iml
+++ b/plugins/keymaps/visual-assist-keymap/intellij.keymap.visualAssist.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/Visual Assist OSX.xml b/plugins/keymaps/visual-assist-keymap/resources/keymaps/Visual Assist OSX.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Visual Assist OSX.xml
rename to plugins/keymaps/visual-assist-keymap/resources/keymaps/Visual Assist OSX.xml
diff --git a/platform/platform-resources/src/keymaps/Visual Assist.xml b/plugins/keymaps/visual-assist-keymap/resources/keymaps/Visual Assist.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Visual Assist.xml
rename to plugins/keymaps/visual-assist-keymap/resources/keymaps/Visual Assist.xml
diff --git a/plugins/keymaps/visual-studio-for-mac-keymap/intellij.keymap.visualStudioForMac.iml b/plugins/keymaps/visual-studio-for-mac-keymap/intellij.keymap.visualStudioForMac.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/visual-studio-for-mac-keymap/intellij.keymap.visualStudioForMac.iml
+++ b/plugins/keymaps/visual-studio-for-mac-keymap/intellij.keymap.visualStudioForMac.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/Visual Studio for Mac.xml b/plugins/keymaps/visual-studio-for-mac-keymap/resources/keymaps/Visual Studio for Mac.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Visual Studio for Mac.xml
rename to plugins/keymaps/visual-studio-for-mac-keymap/resources/keymaps/Visual Studio for Mac.xml
diff --git a/plugins/keymaps/visual-studio-keymap/intellij.keymap.visualStudio.iml b/plugins/keymaps/visual-studio-keymap/intellij.keymap.visualStudio.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/visual-studio-keymap/intellij.keymap.visualStudio.iml
+++ b/plugins/keymaps/visual-studio-keymap/intellij.keymap.visualStudio.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/Visual Studio OSX.xml b/plugins/keymaps/visual-studio-keymap/resources/keymaps/Visual Studio OSX.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Visual Studio OSX.xml
rename to plugins/keymaps/visual-studio-keymap/resources/keymaps/Visual Studio OSX.xml
diff --git a/platform/platform-resources/src/keymaps/Visual Studio.xml b/plugins/keymaps/visual-studio-keymap/resources/keymaps/Visual Studio.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Visual Studio.xml
rename to plugins/keymaps/visual-studio-keymap/resources/keymaps/Visual Studio.xml
diff --git a/plugins/keymaps/visual-studio2022-keymap/intellij.keymap.visualStudio2022.iml b/plugins/keymaps/visual-studio2022-keymap/intellij.keymap.visualStudio2022.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/visual-studio2022-keymap/intellij.keymap.visualStudio2022.iml
+++ b/plugins/keymaps/visual-studio2022-keymap/intellij.keymap.visualStudio2022.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/Visual Studio 2022.xml b/plugins/keymaps/visual-studio2022-keymap/resources/keymaps/Visual Studio 2022.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Visual Studio 2022.xml
rename to plugins/keymaps/visual-studio2022-keymap/resources/keymaps/Visual Studio 2022.xml
diff --git a/plugins/keymaps/vscode-keymap/intellij.keymap.vscode.iml b/plugins/keymaps/vscode-keymap/intellij.keymap.vscode.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/vscode-keymap/intellij.keymap.vscode.iml
+++ b/plugins/keymaps/vscode-keymap/intellij.keymap.vscode.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/VSCode OSX.xml b/plugins/keymaps/vscode-keymap/resources/keymaps/VSCode OSX.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/VSCode OSX.xml
rename to plugins/keymaps/vscode-keymap/resources/keymaps/VSCode OSX.xml
diff --git a/platform/platform-resources/src/keymaps/VSCode.xml b/plugins/keymaps/vscode-keymap/resources/keymaps/VSCode.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/VSCode.xml
rename to plugins/keymaps/vscode-keymap/resources/keymaps/VSCode.xml
diff --git a/plugins/keymaps/xcode-keymap/intellij.keymap.xcode.iml b/plugins/keymaps/xcode-keymap/intellij.keymap.xcode.iml
index e7bd1f91989f..510e3ffb6679 100644
--- a/plugins/keymaps/xcode-keymap/intellij.keymap.xcode.iml
+++ b/plugins/keymaps/xcode-keymap/intellij.keymap.xcode.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/keymaps/Xcode.xml b/plugins/keymaps/xcode-keymap/resources/keymaps/Xcode.xml
similarity index 100%
rename from platform/platform-resources/src/keymaps/Xcode.xml
rename to plugins/keymaps/xcode-keymap/resources/keymaps/Xcode.xml