diff --git a/.idea/modules.xml b/.idea/modules.xml
index 2457564a393f..2e3204bf611c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -627,6 +627,7 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" filepath="$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/testcontainers/intellij.libraries.testcontainers.iml" filepath="$PROJECT_DIR$/libraries/testcontainers/intellij.libraries.testcontainers.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" filepath="$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/xerces/intellij.libraries.xerces.iml" filepath="$PROJECT_DIR$/libraries/xerces/intellij.libraries.xerces.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" filepath="$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" filepath="$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/markdown/core/intellij.markdown.iml" filepath="$PROJECT_DIR$/plugins/markdown/core/intellij.markdown.iml" />
diff --git a/java/ide-resources/resources/META-INF/JavaIdePlugin.xml b/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
index d0f1f7fad5b7..f8b1633d5c57 100644
--- a/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
+++ b/java/ide-resources/resources/META-INF/JavaIdePlugin.xml
@@ -25,7 +25,6 @@
     <xi:fallback/>
   </xi:include>
 
-  <xi:include href="/META-INF/XmlPlugin.xml"/>
   <xi:include href="/META-INF/RegExpPlugin.xml">
     <xi:fallback/>
   </xi:include>
diff --git a/libraries/xerces/BUILD.bazel b/libraries/xerces/BUILD.bazel
new file mode 100644
index 000000000000..d07d14f18cce
--- /dev/null
+++ b/libraries/xerces/BUILD.bazel
@@ -0,0 +1,20 @@
+### auto-generated section `build intellij.libraries.xerces` start
+load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_jvm//:jvm.bzl", "jvm_resources")
+
+jvm_resources(
+  name = "xerces_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+java_library(
+  name = "xerces",
+  visibility = ["//visibility:public"],
+  exports = ["@lib//:xerces"],
+  runtime_deps = [
+    ":xerces_resources",
+    "@lib//:xerces",
+  ]
+)
+### auto-generated section `build intellij.libraries.xerces` end
\ No newline at end of file
diff --git a/libraries/xerces/intellij.libraries.xerces.iml b/libraries/xerces/intellij.libraries.xerces.iml
new file mode 100644
index 000000000000..48f9c48ba373
--- /dev/null
+++ b/libraries/xerces/intellij.libraries.xerces.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="Xerces" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/libraries/xerces/resources/intellij.libraries.xerces.xml b/libraries/xerces/resources/intellij.libraries.xerces.xml
new file mode 100644
index 000000000000..6fb76a66265d
--- /dev/null
+++ b/libraries/xerces/resources/intellij.libraries.xerces.xml
@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>
\ No newline at end of file
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt
index 9a0c52517de8..b51380390730 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt
@@ -31,4 +31,5 @@ private val LIBRARY_MODULE_NAMES: Set<String> = setOf(
   "intellij.libraries.skiko",
   "intellij.libraries.testng",
   "intellij.libraries.dokka",
+  "intellij.libraries.xerces",
 )
diff --git a/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
index 8e3e09ff5b89..9bb31dba4e9a 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
@@ -1,6 +1,5 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="/META-INF/PlatformLangPlugin.xml"/>
-  <xi:include href="/META-INF/XmlPlugin.xml"/>
   <xi:include href="/META-INF/RegExpPlugin.xml">
     <xi:fallback/>
   </xi:include>
diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
deleted file mode 100644
index 5a5fb9e80457..000000000000
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--suppress PluginXmlRegistrationCheck -->
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-  <module value="com.intellij.modules.xml"/>
-
-  <xi:include href="/META-INF/XmlImpl.xml"/>
-
-  <xi:include href="/META-INF/XmlAnalysisImpl.xml"/>
-
-  <extensionPoints>
-    <extensionPoint name="xml.xmlTagRuleProvider" interface="com.intellij.xml.XmlTagRuleProvider" dynamic="true"/>
-    <extensionPoint name="embeddedTokenTypesProvider" interface="com.intellij.lexer.EmbeddedTokenTypesProvider" dynamic="true"/>
-    <extensionPoint name="embeddedTokenHighlighter" interface="com.intellij.ide.highlighter.EmbeddedTokenHighlighter" dynamic="true"/>
-
-
-    <extensionPoint name="html.scriptContentProvider"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.lang.HtmlScriptContentProvider"/>
-    </extensionPoint>
-
-    <extensionPoint name="html.embeddedContentSupport"
-                    interface="com.intellij.html.embedding.HtmlEmbeddedContentSupport"
-                    dynamic="true"/>
-  </extensionPoints>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <fileType name="HTML" implementationClass="com.intellij.ide.highlighter.HtmlFileType" fieldName="INSTANCE" language="HTML" extensions="htm;html;sht;shtm;shtml"/>
-    <fileType name="XHTML" implementationClass="com.intellij.ide.highlighter.XHtmlFileType" fieldName="INSTANCE" language="XHTML" extensions="xhtml"/>
-    <fileType name="DTD" implementationClass="com.intellij.ide.highlighter.DTDFileType" fieldName="INSTANCE" language="DTD" extensions="dtd;elt;ent;mod"/>
-    <fileType name="XML" implementationClass="com.intellij.ide.highlighter.XmlFileType" fieldName="INSTANCE" language="XML" extensions="ant;fxml;jhm;jnlp;jrxml;rng;tld;wsdl;xml;xsd;xsl;xslt;xul"/>
-
-    <lang.syntaxHighlighterFactory language="XML" implementationClass="com.intellij.lang.xml.XmlSyntaxHighlighterFactory"/>
-    <lang.syntaxHighlighterFactory language="HTML" implementationClass="com.intellij.lang.html.HtmlSyntaxHighlighterFactory"/>
-    <lang.syntaxHighlighterFactory language="XHTML" implementationClass="com.intellij.lang.xhtml.XhtmlSyntaxHighlighterFactory"/>
-    <lang.syntaxHighlighterFactory language="DTD" implementationClass="com.intellij.lang.dtd.DtdSyntaxHighlighterFactory"/>
-
-    <applicationService serviceImplementation="com.intellij.application.options.editor.WebEditorOptions"/>
-
-    <virtualFileCustomDataProvider implementation="com.intellij.xml.HtmlCodeStyleSettingsCustomDataSynchronizer"/>
-
-    <lang.parserDefinition language="DTD" implementationClass="com.intellij.lang.dtd.DTDParserDefinition"/>
-    <lang.parserDefinition language="XML" implementationClass="com.intellij.lang.xml.XMLParserDefinition"/>
-    <lang.parserDefinition language="HTML" implementationClass="com.intellij.lang.html.HTMLParserDefinition"/>
-    <lang.parserDefinition language="XHTML" implementationClass="com.intellij.lang.xhtml.XHTMLParserDefinition"/>
-
-    <syntax.elementTypeConverter language="XML" implementationClass="com.intellij.psi.xml.XmlElementTypeConverterExtension"/>
-
-    <syntaxHighlighter key="IDEA_PROJECT" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
-    <syntaxHighlighter key="IDEA_MODULE" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
-    <syntaxHighlighter key="IDEA_WORKSPACE" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
-
-    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.XMLColorsPage"/>
-    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.HTMLColorsPage"/>
-  </extensions>
-</idea-plugin>
diff --git a/platform/platform-resources/src/META-INF/xml-modules.xml b/platform/platform-resources/src/META-INF/xml-modules.xml
index fada6088ff96..979cc459fda0 100644
--- a/platform/platform-resources/src/META-INF/xml-modules.xml
+++ b/platform/platform-resources/src/META-INF/xml-modules.xml
@@ -1,4 +1,6 @@
 <idea-plugin>
+  <module value="com.intellij.modules.xml"/>
+
   <content>
     <module name="intellij.xml.dom" loading="embedded"/>
     <module name="intellij.xml.dom.impl" loading="embedded"/>
@@ -8,6 +10,10 @@
     <module name="intellij.xml.psi.impl" loading="embedded"/>
     <module name="intellij.xml.analysis" loading="embedded"/>
     <module name="intellij.xml.frontback.impl" loading="embedded"/>
+    <module name="intellij.xml.parser" loading="embedded"/>
     <module name="intellij.relaxng"/>
+    <module name="intellij.xml.impl" loading="embedded"/>
+    <module name="intellij.xml.analysis.impl" loading="embedded"/>
+    <module name="intellij.libraries.xerces" loading="embedded"/>
   </content>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/devkit/devkit-core/BUILD.bazel b/plugins/devkit/devkit-core/BUILD.bazel
index b3712f72954c..7b10c586253b 100644
--- a/plugins/devkit/devkit-core/BUILD.bazel
+++ b/plugins/devkit/devkit-core/BUILD.bazel
@@ -46,7 +46,6 @@ jvm_library(
     "//xml/impl",
     "//java/openapi:java",
     "@lib//:guava",
-    "@lib//:xerces",
     "//platform/observable",
     "//spellchecker",
     "//plugins/properties/properties-psi-api:psi",
@@ -91,6 +90,7 @@ jvm_library(
     "//platform/markdown-utils",
     "@lib//:snakeyaml",
     "//platform/eel-provider",
+    "//libraries/xerces",
   ],
   runtime_deps = [":core_resources"]
 )
diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml
index 8c80c803f529..613b2f471274 100644
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -57,7 +57,6 @@
     <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="library" name="Xerces" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.properties.psi" />
@@ -102,5 +101,6 @@
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
     <orderEntry type="library" name="snakeyaml" level="project" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
+    <orderEntry type="module" module-name="intellij.libraries.xerces" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
index cf5651a51346..a661c07abacf 100644
--- a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
+++ b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
@@ -6,6 +6,7 @@
     <module name="intellij.json.backend"/>
     <module name="intellij.properties.backend"/>
     <module name="intellij.properties.backend.psi"/>
+    <module name="intellij.libraries.xerces"/>
   </dependencies>
 
   <resource-bundle>messages.DevKitBundle</resource-bundle>
diff --git a/plugins/htmltools/resources/META-INF/plugin.xml b/plugins/htmltools/resources/META-INF/plugin.xml
index b4788ca30312..8402b65ea2cb 100644
--- a/plugins/htmltools/resources/META-INF/plugin.xml
+++ b/plugins/htmltools/resources/META-INF/plugin.xml
@@ -5,10 +5,13 @@
   <description>Provides advanced features for HTML/CSS editing: inspections, quickfixes, smart navigation actions and more.</description>
 
   <category>HTML and XML</category>
-  <depends>com.intellij.modules.xml</depends>
   <vendor>JetBrains</vendor>
 
-  <depends>com.intellij.platform.images</depends>
+  <dependencies>
+    <plugin id="com.intellij.platform.images"/>
+    <module name="intellij.xml.impl"/>
+  </dependencies>
+
 
   <extensions defaultExtensionNs="com.intellij">
     <psi.referenceContributor implementation="com.intellij.htmltools.xml.util.HtmlReferenceContributor"/>
diff --git a/plugins/javaFX/resources/intellij.javaFX.xml b/plugins/javaFX/resources/intellij.javaFX.xml
index 68c7529f6a66..b9d52beacfd4 100644
--- a/plugins/javaFX/resources/intellij.javaFX.xml
+++ b/plugins/javaFX/resources/intellij.javaFX.xml
@@ -1,6 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.spellchecker"/>
+    <module name="intellij.xml.impl"/>
     <plugin id="com.intellij.java"/>
   </dependencies>
 
diff --git a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
index 1d6b4b587970..28770bfdc283 100644
--- a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
+++ b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt
@@ -27,7 +27,6 @@ open class PyCharmCommunityProperties(protected val communityHome: Path) : PyCha
       "intellij.platform.starter",
       "intellij.pycharm.community",
       "intellij.platform.whatsNew",
-      "intellij.xml.impl",
     )
     productLayout.bundledPluginModules +=
       sequenceOf(
diff --git a/xml/dom-impl/resources/intellij.xml.dom.impl.xml b/xml/dom-impl/resources/intellij.xml.dom.impl.xml
index 444bf1ff7c77..594a8d80b325 100644
--- a/xml/dom-impl/resources/intellij.xml.dom.impl.xml
+++ b/xml/dom-impl/resources/intellij.xml.dom.impl.xml
@@ -1,6 +1,10 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.xml.dom"/>
+    <module name="intellij.xml.impl"/>
+    <module name="intellij.xml.psi"/>
+    <module name="intellij.xml.structureView"/>
+    <module name="intellij.xml.parser"/>
     <module name="intellij.platform.backend"/>
   </dependencies>
 
diff --git a/xml/dom-openapi/resources/intellij.xml.dom.xml b/xml/dom-openapi/resources/intellij.xml.dom.xml
index f3a450d609e2..8f53f702ec9a 100644
--- a/xml/dom-openapi/resources/intellij.xml.dom.xml
+++ b/xml/dom-openapi/resources/intellij.xml.dom.xml
@@ -1,6 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.platform.backend"/>
+    <module name="intellij.xml.psi"/>
   </dependencies>
 
   <extensionPoints>
diff --git a/xml/impl/BUILD.bazel b/xml/impl/BUILD.bazel
index 9add30dd224c..75b2fadb633f 100644
--- a/xml/impl/BUILD.bazel
+++ b/xml/impl/BUILD.bazel
@@ -22,7 +22,6 @@ jvm_library(
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
     "//xml/openapi:xml",
-    "@lib//:xerces",
     "//platform/platform-impl:ide-impl",
     "//platform/lang-impl",
     "//platform/execution-impl",
@@ -53,6 +52,7 @@ jvm_library(
     "//platform/util/jdom",
     "@lib//:aalto-xml",
     "//platform/polySymbols/backend",
+    "//libraries/xerces",
   ],
   exports = [
     "//xml/openapi:xml",
diff --git a/xml/impl/intellij.xml.impl.iml b/xml/impl/intellij.xml.impl.iml
index 60d11fd777e0..8f0e07211833 100644
--- a/xml/impl/intellij.xml.impl.iml
+++ b/xml/impl/intellij.xml.impl.iml
@@ -16,7 +16,6 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.xml" exported="" />
-    <orderEntry type="library" name="Xerces" level="project" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
@@ -49,6 +48,7 @@
     <orderEntry type="library" name="aalto-xml" level="project" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.polySymbols.backend" />
+    <orderEntry type="module" module-name="intellij.libraries.xerces" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/xml/impl/resources/META-INF/XmlImpl.xml b/xml/impl/resources/intellij.xml.impl.xml
similarity index 97%
rename from xml/impl/resources/META-INF/XmlImpl.xml
rename to xml/impl/resources/intellij.xml.impl.xml
index 5facb9e15bce..5eb556f7f6d8 100644
--- a/xml/impl/resources/META-INF/XmlImpl.xml
+++ b/xml/impl/resources/intellij.xml.impl.xml
@@ -1,4 +1,16 @@
-<idea-plugin>>
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.xml.analysis.impl"/>
+    <module name="intellij.xml.structureView.impl"/>/>
+    <module name="intellij.xml.parser"/>
+    <module name="intellij.xml.frontback.impl"/>
+    <module name="intellij.xml.psi"/>
+    <module name="intellij.xml.psi.impl"/>
+    <module name="intellij.platform.backend"/>
+    <module name="intellij.libraries.xerces"/>
+    <module name="intellij.xml.dom"/>
+  </dependencies>
+
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.html.compatibleLanguage"
                     beanClass="com.intellij.lang.html.HtmlCompatibleMetaLanguage$HtmlCompatibleLanguageEP"
@@ -400,7 +412,7 @@
     <renameInputValidator implementation="com.intellij.lang.xml.XmlElementRenameValidator"/>
     <renameInputValidator implementation="com.intellij.lang.xml.XmlAttributeValueRenameValidator"/>
 
-    <xml.attributeDescriptorsProvider implementation="com.intellij.html.impl.Html5CustomAttributeDescriptorsProvider"/>
+    <xml.attributeDescriptorsProvider order="before html-default" implementation="com.intellij.html.impl.Html5CustomAttributeDescriptorsProvider"/>
 
     <breadcrumbsPresentationProvider implementation="com.intellij.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeBreadcrumbsPresentationProvider"/>
 
@@ -430,5 +442,7 @@
                                        toolShortName="HtmlUnknownAttribute"/>
     <polySymbols.inspectionToolMapping symbolNamespace="html" symbolKind="elements" problemKind="UnknownSymbol"
                                        toolShortName="HtmlUnknownTag"/>
+
+    <virtualFileCustomDataProvider implementation="com.intellij.xml.HtmlCodeStyleSettingsCustomDataSynchronizer"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/xml/relaxng/resources/intellij.relaxng.xml b/xml/relaxng/resources/intellij.relaxng.xml
index d689231b88d8..fda222a9847e 100644
--- a/xml/relaxng/resources/intellij.relaxng.xml
+++ b/xml/relaxng/resources/intellij.relaxng.xml
@@ -1,7 +1,10 @@
 <idea-plugin>
   <module value="com.intellij.modules.relaxng"/>
   <dependencies>
-    <module name="intellij.xml.dom.impl"/>
+    <module name="intellij.xml.impl"/>
+    <module name="intellij.xml.dom"/>
+    <module name="intellij.xml.parser"/>
+    <module name="intellij.xml.psi"/>
     <module name="intellij.platform.backend"/>
   </dependencies>
 
diff --git a/xml/xml-analysis-api/resources/intellij.xml.analysis.xml b/xml/xml-analysis-api/resources/intellij.xml.analysis.xml
index 6e71bd7d917a..a89977aba709 100644
--- a/xml/xml-analysis-api/resources/intellij.xml.analysis.xml
+++ b/xml/xml-analysis-api/resources/intellij.xml.analysis.xml
@@ -1,9 +1,11 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.platform.backend"/>
+    <module name="intellij.xml.psi"/>
   </dependencies>
 
   <extensionPoints>
+    <extensionPoint name="xml.xmlTagRuleProvider" interface="com.intellij.xml.XmlTagRuleProvider" dynamic="true"/>
     <extensionPoint name="xml.xmlSuppressionProvider" interface="com.intellij.codeInspection.XmlSuppressionProvider" dynamic="true"/>
   </extensionPoints>
 
diff --git a/xml/xml-analysis-impl/BUILD.bazel b/xml/xml-analysis-impl/BUILD.bazel
index a1c515780435..81ef2fb425a1 100644
--- a/xml/xml-analysis-impl/BUILD.bazel
+++ b/xml/xml-analysis-impl/BUILD.bazel
@@ -27,11 +27,11 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/editor-ui-ex:editor-ex",
     "//platform/lang-impl",
-    "@lib//:xerces",
     "//platform/util/nanoxml",
     "//platform/indexing-impl",
     "//platform/indexing-api:indexing",
     "//platform/polySymbols/backend",
+    "//libraries/xerces",
   ],
   exports = ["//xml/xml-analysis-api:analysis"],
   runtime_deps = [
diff --git a/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml b/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml
index e9723d5dbf09..82d8a2548404 100644
--- a/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml
+++ b/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml
@@ -22,11 +22,11 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="library" name="Xerces" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.polySymbols.backend" />
+    <orderEntry type="module" module-name="intellij.libraries.xerces" />
   </component>
 </module>
\ No newline at end of file
diff --git a/xml/xml-analysis-impl/resources/META-INF/XmlAnalysisImpl.xml b/xml/xml-analysis-impl/resources/intellij.xml.analysis.impl.xml
similarity index 97%
rename from xml/xml-analysis-impl/resources/META-INF/XmlAnalysisImpl.xml
rename to xml/xml-analysis-impl/resources/intellij.xml.analysis.impl.xml
index 257f86de0b5f..b0bc7d84b8b8 100644
--- a/xml/xml-analysis-impl/resources/META-INF/XmlAnalysisImpl.xml
+++ b/xml/xml-analysis-impl/resources/intellij.xml.analysis.impl.xml
@@ -1,4 +1,13 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.xml.analysis"/>
+    <module name="intellij.xml.psi.impl"/>
+    <module name="intellij.xml.psi"/>
+    <module name="intellij.xml.parser"/>
+    <module name="intellij.platform.backend"/>
+    <module name="intellij.libraries.xerces"/>
+  </dependencies>
+
   <extensionPoints>
     <extensionPoint name="xml.nsColorProvider"
                     interface="com.intellij.codeInsight.daemon.impl.analysis.XmlNSColorProvider"
diff --git a/xml/xml-frontback-impl/resources/intellij.xml.frontback.impl.xml b/xml/xml-frontback-impl/resources/intellij.xml.frontback.impl.xml
index 4cd03538ad7a..8b6c6ae225cf 100644
--- a/xml/xml-frontback-impl/resources/intellij.xml.frontback.impl.xml
+++ b/xml/xml-frontback-impl/resources/intellij.xml.frontback.impl.xml
@@ -1,15 +1,48 @@
 <!--suppress PluginXmlValidity -->
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.xml.parser"/>
+    <module name="intellij.xml.psi"/>
+  </dependencies>
+
   <extensionPoints>
+    <extensionPoint name="embeddedTokenHighlighter" interface="com.intellij.ide.highlighter.EmbeddedTokenHighlighter" dynamic="true"/>
+
     <extensionPoint name="html.codestyle.panel" interface="com.intellij.application.options.HtmlCodeStylePanelExtension" dynamic="true"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
+    <fileType name="HTML" implementationClass="com.intellij.ide.highlighter.HtmlFileType" fieldName="INSTANCE" language="HTML" extensions="htm;html;sht;shtm;shtml"/>
+    <fileType name="XHTML" implementationClass="com.intellij.ide.highlighter.XHtmlFileType" fieldName="INSTANCE" language="XHTML" extensions="xhtml"/>
+    <fileType name="DTD" implementationClass="com.intellij.ide.highlighter.DTDFileType" fieldName="INSTANCE" language="DTD" extensions="dtd;elt;ent;mod"/>
+    <fileType name="XML" implementationClass="com.intellij.ide.highlighter.XmlFileType" fieldName="INSTANCE" language="XML" extensions="ant;fxml;jhm;jnlp;jrxml;rng;tld;wsdl;xml;xsd;xsl;xslt;xul"/>
+
+    <lang.syntaxHighlighterFactory language="XML" implementationClass="com.intellij.lang.xml.XmlSyntaxHighlighterFactory"/>
+    <lang.syntaxHighlighterFactory language="HTML" implementationClass="com.intellij.lang.html.HtmlSyntaxHighlighterFactory"/>
+    <lang.syntaxHighlighterFactory language="XHTML" implementationClass="com.intellij.lang.xhtml.XhtmlSyntaxHighlighterFactory"/>
+    <lang.syntaxHighlighterFactory language="DTD" implementationClass="com.intellij.lang.dtd.DtdSyntaxHighlighterFactory"/>
+
+    <lang.parserDefinition language="DTD" implementationClass="com.intellij.lang.dtd.DTDParserDefinition"/>
+    <lang.parserDefinition language="XML" implementationClass="com.intellij.lang.xml.XMLParserDefinition"/>
+    <lang.parserDefinition language="HTML" implementationClass="com.intellij.lang.html.HTMLParserDefinition"/>
+    <lang.parserDefinition language="XHTML" implementationClass="com.intellij.lang.xhtml.XHTMLParserDefinition"/>
+
+    <syntaxHighlighter key="IDEA_PROJECT" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
+    <syntaxHighlighter key="IDEA_MODULE" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
+    <syntaxHighlighter key="IDEA_WORKSPACE" implementationClass="com.intellij.ide.highlighter.XmlFileHighlighter"/>
+
+    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.XMLColorsPage"/>
+    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.HTMLColorsPage"/>
+
+    <applicationService serviceImplementation="com.intellij.application.options.editor.WebEditorOptions"/>
+
     <langCodeStyleSettingsProvider implementation="com.intellij.application.options.HtmlLanguageCodeStyleSettingsProvider"/>
 
     <langCodeStyleSettingsProvider implementation="com.intellij.application.options.XmlLanguageCodeStyleSettingsProvider"/>
 
     <lang.rearranger language="XML" implementationClass="com.intellij.xml.arrangement.XmlRearranger"/>
     <lang.rearranger language="HTML" implementationClass="com.intellij.xml.arrangement.HtmlRearranger"/>
+
+    <virtualFileCustomDataConsumer implementation="com.intellij.xml.HtmlCodeStyleSettingsCustomDataSynchronizer"/>
   </extensions>
 </idea-plugin>
diff --git a/xml/xml-frontend-split/resources/intellij.xml.frontend.split.xml b/xml/xml-frontend-split/resources/intellij.xml.frontend.split.xml
index ff343bd90e40..0dd021122f46 100644
--- a/xml/xml-frontend-split/resources/intellij.xml.frontend.split.xml
+++ b/xml/xml-frontend-split/resources/intellij.xml.frontend.split.xml
@@ -1,60 +1,16 @@
 <idea-plugin>
-  <extensionPoints>
-    <extensionPoint qualifiedName="com.intellij.embeddedTokenTypesProvider"
-                    interface="com.intellij.lexer.EmbeddedTokenTypesProvider"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.embeddedTokenHighlighter"
-                    interface="com.intellij.ide.highlighter.EmbeddedTokenHighlighter"
-                    dynamic="true"/>
-  </extensionPoints>
+  <dependencies>
+    <module name="intellij.platform.frontend.split"/>
+    <module name="intellij.xml.frontback.impl"/>
+    <module name="intellij.xml.parser"/>
+  </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
-    <fileType name="XML"
-              language="XML"
-              extensions="ant;fxml;jhm;jnlp;jrxml;rng;tld;wsdl;xml;xsd;xsl;xslt;xul"
-              implementationClass="com.intellij.ide.highlighter.XmlFileType"
-              fieldName="INSTANCE"/>
-    <fileType name="DTD"
-              language="DTD"
-              extensions="dtd;elt;ent;mod"
-              implementationClass="com.intellij.ide.highlighter.DTDFileType"
-              fieldName="INSTANCE"/>
-    <fileType name="HTML"
-              language="HTML"
-              extensions="htm;html;sht;shtm;shtml"
-              implementationClass="com.intellij.ide.highlighter.HtmlFileType"
-              fieldName="INSTANCE"/>
-    <fileType name="XHTML"
-              language="XHTML"
-              extensions="xhtml"
-              implementationClass="com.intellij.ide.highlighter.XHtmlFileType"
-              fieldName="INSTANCE"/>
-
     <applicationService serviceInterface="com.intellij.lang.xml.BasicXmlElementFactory"
                         serviceImplementation="com.intellij.xml.frontend.split.editor.FrontendXmlElementFactory"/>
     <applicationService serviceInterface="com.intellij.lang.html.BasicHtmlElementFactory"
                         serviceImplementation="com.intellij.xml.frontend.split.editor.FrontendHtmlElementFactory"/>
     <applicationService serviceInterface="com.intellij.html.embedding.BasicHtmlRawTextElementFactory"
                         serviceImplementation="com.intellij.xml.frontend.split.editor.FrontendHtmlElementFactory"/>
-
-    <lang.parserDefinition language="XML"
-                           implementationClass="com.intellij.lang.xml.XMLParserDefinition"/>
-    <lang.parserDefinition language="DTD"
-                           implementationClass="com.intellij.lang.dtd.DTDParserDefinition"/>
-    <lang.parserDefinition language="HTML"
-                           implementationClass="com.intellij.lang.html.HTMLParserDefinition"/>
-    <lang.parserDefinition language="XHTML"
-                           implementationClass="com.intellij.lang.xhtml.XHTMLParserDefinition"/>
-
-    <lang.syntaxHighlighterFactory language="XML"
-                                   implementationClass="com.intellij.lang.xml.XmlSyntaxHighlighterFactory"/>
-    <lang.syntaxHighlighterFactory language="DTD"
-                                   implementationClass="com.intellij.lang.dtd.DtdSyntaxHighlighterFactory"/>
-    <lang.syntaxHighlighterFactory language="HTML"
-                                   implementationClass="com.intellij.lang.html.HtmlSyntaxHighlighterFactory"/>
-    <lang.syntaxHighlighterFactory language="XHTML"
-                                   implementationClass="com.intellij.lang.xhtml.XhtmlSyntaxHighlighterFactory"/>
-
-    <virtualFileCustomDataConsumer implementation="com.intellij.xml.HtmlCodeStyleSettingsCustomDataSynchronizer"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/xml/xml-parser/resources/intellij.xml.parser.xml b/xml/xml-parser/resources/intellij.xml.parser.xml
new file mode 100644
index 000000000000..401e3e67af93
--- /dev/null
+++ b/xml/xml-parser/resources/intellij.xml.parser.xml
@@ -0,0 +1,18 @@
+<idea-plugin>
+  <extensionPoints>
+    <extensionPoint name="embeddedTokenTypesProvider" interface="com.intellij.lexer.EmbeddedTokenTypesProvider" dynamic="true"/>
+
+    <extensionPoint name="html.scriptContentProvider"
+                    beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.lang.HtmlScriptContentProvider"/>
+    </extensionPoint>
+
+    <extensionPoint name="html.embeddedContentSupport"
+                    interface="com.intellij.html.embedding.HtmlEmbeddedContentSupport"
+                    dynamic="true"/>
+  </extensionPoints>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <syntax.elementTypeConverter language="XML" implementationClass="com.intellij.psi.xml.XmlElementTypeConverterExtension"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/xml/xml-psi-api/resources/intellij.xml.psi.xml b/xml/xml-psi-api/resources/intellij.xml.psi.xml
index 9fc32926eddf..3ee37340d137 100644
--- a/xml/xml-psi-api/resources/intellij.xml.psi.xml
+++ b/xml/xml-psi-api/resources/intellij.xml.psi.xml
@@ -1,4 +1,8 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.xml.parser"/>
+  </dependencies>
+
   <extensionPoints>
     <extensionPoint name="xml.schemaProvider" interface="com.intellij.xml.XmlSchemaProvider" dynamic="true"/>
     <extensionPoint name="xml.xmlTypedHandlersAdditionalSupport" interface="com.intellij.openapi.editor.XmlTypedHandlersAdditionalSupport" dynamic="true"/>
diff --git a/xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml b/xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml
index c755b7770af4..7c26c333eaaf 100644
--- a/xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml
+++ b/xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml
@@ -2,6 +2,8 @@
   <dependencies>
     <module name="intellij.platform.backend"/>
     <module name="intellij.xml.psi"/>
+    <module name="intellij.xml.parser"/>
+    <module name="intellij.xml.frontback.impl"/>
   </dependencies>
 
   <projectListeners>
@@ -109,7 +111,7 @@
     <polySymbols.codeCompletionItemCustomizer
       id="html"
       implementation="com.intellij.html.polySymbols.HtmlSymbolQueryScopeContributor$HtmlCodeCompletionItemCustomizer"/>
-    <xml.attributeDescriptorsProvider
+    <xml.attributeDescriptorsProvider id="html-default"
       implementation="com.intellij.html.polySymbols.attributes.HtmlAttributeSymbolDescriptorsProvider"/>
     <xml.elementDescriptorProvider
       implementation="com.intellij.html.polySymbols.elements.HtmlElementSymbolDescriptorsProvider"/>
diff --git a/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml b/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml
index 5a8f902fbe35..7e242827e927 100644
--- a/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml
+++ b/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml
@@ -2,6 +2,7 @@
   <dependencies>
     <module name="intellij.xml.structureView"/>
     <module name="intellij.xml.psi.impl"/>
+    <module name="intellij.xml.parser"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/xml/xmlbeans/resources/intellij.xml.xmlbeans.xml b/xml/xmlbeans/resources/intellij.xml.xmlbeans.xml
index 74ce6c51d534..9588539aed83 100644
--- a/xml/xmlbeans/resources/intellij.xml.xmlbeans.xml
+++ b/xml/xmlbeans/resources/intellij.xml.xmlbeans.xml
@@ -1,6 +1,9 @@
 <idea-plugin package="com.intellij.xml.tools">
   <dependencies>
     <plugin id="com.intellij.modules.xml"/>
+    <module name="intellij.xml.parser"/>
+    <module name="intellij.xml.psi"/>
+    <module name="intellij.xml.impl"/>
   </dependencies>
 
   <actions>