diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel
index 7d0724d1f9b4..9703b5747648 100644
--- a/java/compiler/impl/BUILD.bazel
+++ b/java/compiler/impl/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lvcs-api:lvcs",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml
index 9eddf2253fc7..452eb0c3290f 100644
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
diff --git a/java/idea-ui/BUILD.bazel b/java/idea-ui/BUILD.bazel
index 26202bee6d4c..3e9d87f09be8 100644
--- a/java/idea-ui/BUILD.bazel
+++ b/java/idea-ui/BUILD.bazel
@@ -25,6 +25,7 @@ jvm_library(
     "//java/java-impl-refactorings:impl-refactorings",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
     "//platform/util/diff",
@@ -91,6 +92,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/platform-tests:tests_test_lib",
     "//platform/core-ui",
diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml
index 374f73987fa5..ed108859b712 100644
--- a/java/idea-ui/intellij.java.ui.iml
+++ b/java/idea-ui/intellij.java.ui.iml
@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.util.diff" />
diff --git a/java/idea-ui/intellij.java.ui.tests.iml b/java/idea-ui/intellij.java.ui.tests.iml
index 4370e3ee0cd4..187ff6cd9240 100644
--- a/java/idea-ui/intellij.java.ui.tests.iml
+++ b/java/idea-ui/intellij.java.ui.tests.iml
@@ -18,6 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
diff --git a/java/java-impl/BUILD.bazel b/java/java-impl/BUILD.bazel
index 231f61513397..7ee862e9c9ba 100644
--- a/java/java-impl/BUILD.bazel
+++ b/java/java-impl/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
     "//platform/foldings",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lvcs-api:lvcs",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index ea5821e507f3..c8725378bace 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.foldings" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel
index d62d3ee67357..f85bfb95e3f6 100644
--- a/java/java-tests/BUILD.bazel
+++ b/java/java-tests/BUILD.bazel
@@ -26,6 +26,7 @@ jvm_library(
     "//platform/foldings",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lvcs-api:lvcs",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index d948f01dc183..e8da23e5b89b 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.foldings" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel
index a8cf704a448e..d780189ecd5b 100644
--- a/jps/jps-builders/BUILD.bazel
+++ b/jps/jps-builders/BUILD.bazel
@@ -84,6 +84,7 @@ jvm_library(
     "@rules_jvm//dependency-graph",
     "//java/testFramework",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//jps/model-impl:model-tests_test_lib",
     "//jps/model-serialization:model-serialization-tests_test_lib",
     "//platform/testFramework",
diff --git a/jps/jps-builders/intellij.platform.jps.build.tests.iml b/jps/jps-builders/intellij.platform.jps.build.tests.iml
index 8b12f9a2a0ad..cf88162cc1bd 100644
--- a/jps/jps-builders/intellij.platform.jps.build.tests.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.tests.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.build.dependencyGraph" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/platform/analysis-impl/BUILD.bazel b/platform/analysis-impl/BUILD.bazel
index fbea66fb2a74..697ba4d5d836 100644
--- a/platform/analysis-impl/BUILD.bazel
+++ b/platform/analysis-impl/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-impl",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/util",
     "//platform/editor-ui-api:editor-ui",
diff --git a/platform/analysis-impl/intellij.platform.analysis.impl.iml b/platform/analysis-impl/intellij.platform.analysis.impl.iml
index 3207a9eb5158..7edc315d45cb 100644
--- a/platform/analysis-impl/intellij.platform.analysis.impl.iml
+++ b/platform/analysis-impl/intellij.platform.analysis.impl.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
diff --git a/platform/configuration-store-impl/BUILD.bazel b/platform/configuration-store-impl/BUILD.bazel
index fefa2a61ff7e..75be2fa594e9 100644
--- a/platform/configuration-store-impl/BUILD.bazel
+++ b/platform/configuration-store-impl/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/util",
     "//platform/core-api:core",
@@ -79,6 +80,7 @@ jvm_library(
     "//platform/ide-core/plugins",
     "@lib//:assert_j",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/testFramework/extensions:testExtensions",
     "//platform/testFramework",
diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
index 2a1b8256bd3f..b8b2a2b2563a 100644
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.core" />
diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
index 7c2c55a8c8ac..75eb47c57267 100644
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
@@ -38,6 +38,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/platform/credential-store-impl/BUILD.bazel b/platform/credential-store-impl/BUILD.bazel
index 9b22580b0bd0..3112a03ebeee 100644
--- a/platform/credential-store-impl/BUILD.bazel
+++ b/platform/credential-store-impl/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "//platform/credential-store",
     "//platform/ide-core",
     "//platform/ide-core-impl",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/util/jdom",
     "//platform/projectModel-impl",
@@ -51,6 +52,7 @@ jvm_library(
     "//platform/credential-store",
     "//platform/ide-core",
     "//platform/ide-core-impl",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/util/jdom",
     "//platform/projectModel-impl",
diff --git a/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml b/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml
index 0f39e2183a3c..4dad9b372eef 100644
--- a/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml
+++ b/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.credentialStore" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
diff --git a/platform/execution-impl/BUILD.bazel b/platform/execution-impl/BUILD.bazel
index 2f74813fcdac..f66ee00ed917 100644
--- a/platform/execution-impl/BUILD.bazel
+++ b/platform/execution-impl/BUILD.bazel
@@ -21,6 +21,7 @@ jvm_library(
     "//platform/platform-api:ide",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-api:lang",
     "//platform/editor-ui-ex:editor-ex",
     "//platform/projectModel-api:projectModel",
diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml
index 621d93f19a1b..17873b520b40 100644
--- a/platform/execution-impl/intellij.platform.execution.impl.iml
+++ b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -42,6 +42,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel
index 4b2e8908ee71..641d04b7e7e3 100644
--- a/platform/lang-impl/BUILD.bazel
+++ b/platform/lang-impl/BUILD.bazel
@@ -30,6 +30,7 @@ jvm_library(
     "//platform/diff-api:diff",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-api:lang",
     "@lib//:oro_matcher",
     "@lib//:velocity",
@@ -153,6 +154,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-api:lang",
     "//platform/projectModel-api:projectModel",
     "//platform/usageView-impl",
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 0c445a8e08ae..01e61803c6c5 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -36,6 +36,7 @@
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" name="Velocity" level="project" />
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index 6c48f4cbb956..cedbf751ff70 100644
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" scope="TEST" />
diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel
index dca1b12e8c15..dabf904d7ef4 100644
--- a/platform/platform-impl/BUILD.bazel
+++ b/platform/platform-impl/BUILD.bazel
@@ -39,6 +39,7 @@ jvm_library(
     "//platform/platform-api:ide",
     "@lib//:oro_matcher",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-api:lang",
     "@lib//:jna",
     "@lib//:winp",
@@ -191,6 +192,7 @@ jvm_library(
     "//platform/platform-api:ide",
     "@lib//:oro_matcher",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-api:lang",
     "@lib//:jna",
     "@lib//:winp",
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index d7fdf090ba51..020ac8a14043 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -39,6 +39,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" name="winp" level="project" />
diff --git a/platform/platform-impl/internal/BUILD.bazel b/platform/platform-impl/internal/BUILD.bazel
index df0ec7a0edfe..ea0557710738 100644
--- a/platform/platform-impl/internal/BUILD.bazel
+++ b/platform/platform-impl/internal/BUILD.bazel
@@ -19,6 +19,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/ui.jcef",
     "//platform/platform-impl/bootstrap",
diff --git a/platform/platform-impl/internal/intellij.platform.ide.internal.iml b/platform/platform-impl/internal/intellij.platform.ide.internal.iml
index 8f966eb0509e..4927b62ee1eb 100644
--- a/platform/platform-impl/internal/intellij.platform.ide.internal.iml
+++ b/platform/platform-impl/internal/intellij.platform.ide.internal.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.ui.jcef" />
     <orderEntry type="module" module-name="intellij.platform.ide.bootstrap" />
diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel
index 696e60cb05ff..3adb2917a07a 100644
--- a/platform/platform-tests/BUILD.bazel
+++ b/platform/platform-tests/BUILD.bazel
@@ -28,6 +28,7 @@ jvm_library(
     "//platform/foldings",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-impl",
     "@lib//:junit4",
     "@lib//:jmock",
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index f53f21200c7e..3b45251cfd8a 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.foldings" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="jmock" level="project" />
diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel
index 71bc74f248ab..b8a4f8540f04 100644
--- a/platform/testFramework/BUILD.bazel
+++ b/platform/testFramework/BUILD.bazel
@@ -66,6 +66,7 @@ jvm_library(
     "//platform/indexing-api:indexing",
     "//platform/indexing-impl",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-api:lang",
     "//platform/lang-impl",
     "//platform/lvcs-api:lvcs",
@@ -159,6 +160,7 @@ jvm_library(
     "//platform/indexing-api:indexing",
     "//platform/indexing-impl",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/lang-api:lang",
     "//platform/lang-impl",
     "//platform/lvcs-api:lvcs",
diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index 4788a1c11b3f..8120591921d0 100644
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -52,6 +52,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" />
diff --git a/platform/workspace/jps/tests/BUILD.bazel b/platform/workspace/jps/tests/BUILD.bazel
index 183ea463688f..8b9d5d74ee3e 100644
--- a/platform/workspace/jps/tests/BUILD.bazel
+++ b/platform/workspace/jps/tests/BUILD.bazel
@@ -22,6 +22,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/workspace/storage",
     "//platform/smRunner",
diff --git a/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml b/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml
index c633e7709c1d..e74280a1289a 100644
--- a/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml
+++ b/platform/workspace/jps/tests/intellij.platform.workspace.jps.tests.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
diff --git a/platform/xdebugger-impl/BUILD.bazel b/platform/xdebugger-impl/BUILD.bazel
index 229463173cc6..451c5bb7d3d1 100644
--- a/platform/xdebugger-impl/BUILD.bazel
+++ b/platform/xdebugger-impl/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/foldings",
     "//platform/observable",
+    "//jps/model-serialization",
     "//platform/lang-impl",
     "//platform/execution-impl",
     "//platform/diff-api:diff",
@@ -70,6 +71,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/foldings",
     "//platform/observable",
+    "//jps/model-serialization",
     "//platform/lang-impl",
     "//platform/execution-impl",
     "//platform/diff-api:diff",
diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
index ecf39cd5d4e5..5f876852d5b2 100644
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -42,6 +42,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.foldings" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
diff --git a/plugins/devkit/devkit-core/BUILD.bazel b/plugins/devkit/devkit-core/BUILD.bazel
index b1d415707b3a..158a79b83914 100644
--- a/plugins/devkit/devkit-core/BUILD.bazel
+++ b/plugins/devkit/devkit-core/BUILD.bazel
@@ -27,6 +27,7 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
     "//platform/structure-view-impl:structureView-impl",
diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml
index bf2f7a50577c..f49d909c80c8 100644
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -38,6 +38,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
diff --git a/plugins/eclipse/BUILD.bazel b/plugins/eclipse/BUILD.bazel
index 56c3f1c98a74..e3f30d932c68 100644
--- a/plugins/eclipse/BUILD.bazel
+++ b/plugins/eclipse/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/util/jdom",
     "//java/openapi:java",
@@ -53,6 +54,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/util/jdom",
     "//java/openapi:java",
diff --git a/plugins/eclipse/intellij.eclipse.iml b/plugins/eclipse/intellij.eclipse.iml
index 51a478c1075c..d1a72cfd533e 100644
--- a/plugins/eclipse/intellij.eclipse.iml
+++ b/plugins/eclipse/intellij.eclipse.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.java" />
diff --git a/plugins/evaluation-plugin/languages/java/BUILD.bazel b/plugins/evaluation-plugin/languages/java/BUILD.bazel
index a0791c8ded48..0af17d5d7769 100644
--- a/plugins/evaluation-plugin/languages/java/BUILD.bazel
+++ b/plugins/evaluation-plugin/languages/java/BUILD.bazel
@@ -25,6 +25,7 @@ jvm_library(
     "//plugins/evaluation-plugin/core",
     "//plugins/gradle:gradle-common",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
   ],
@@ -49,6 +50,7 @@ jvm_library(
     "//plugins/evaluation-plugin/core",
     "//plugins/gradle:gradle-common",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
     "//platform/testFramework",
diff --git a/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml b/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml
index b0ab45023013..9505fada63df 100644
--- a/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml
+++ b/plugins/evaluation-plugin/languages/java/intellij.evaluationPlugin.languages.java.iml
@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="intellij.evaluationPlugin.core" />
     <orderEntry type="module" module-name="intellij.gradle.common" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/plugins/kotlin/base/facet/BUILD.bazel b/plugins/kotlin/base/facet/BUILD.bazel
index 7a4e454f7b1c..0a6db3795410 100644
--- a/plugins/kotlin/base/facet/BUILD.bazel
+++ b/plugins/kotlin/base/facet/BUILD.bazel
@@ -19,6 +19,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/workspace/storage",
     "//plugins/kotlin/base/frontend-agnostic",
     "//plugins/kotlin/base/util",
diff --git a/plugins/kotlin/base/facet/kotlin.base.facet.iml b/plugins/kotlin/base/facet/kotlin.base.facet.iml
index 3e30d942d4d5..ec1045b46ff2 100644
--- a/plugins/kotlin/base/facet/kotlin.base.facet.iml
+++ b/plugins/kotlin/base/facet/kotlin.base.facet.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
     <orderEntry type="module" module-name="kotlin.base.util" />
diff --git a/plugins/kotlin/base/project-structure/BUILD.bazel b/plugins/kotlin/base/project-structure/BUILD.bazel
index a703f7ad0a49..60ae6e703676 100644
--- a/plugins/kotlin/base/project-structure/BUILD.bazel
+++ b/plugins/kotlin/base/project-structure/BUILD.bazel
@@ -37,6 +37,7 @@ jvm_library(
     "@lib//:kotlinc-analysis-api-platform-interface",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/workspace/storage",
     "//plugins/kotlin/base/frontend-agnostic",
@@ -85,6 +86,7 @@ jvm_library(
     "@lib//:kotlinc-analysis-api-platform-interface",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/workspace/storage",
     "//plugins/kotlin/base/frontend-agnostic",
diff --git a/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml b/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
index 69bbc0bdc4e5..e28ce9869f0d 100644
--- a/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
+++ b/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
@@ -38,6 +38,7 @@
     <orderEntry type="library" name="kotlinc.analysis-api-platform-interface" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
diff --git a/python/python-sdk/BUILD.bazel b/python/python-sdk/BUILD.bazel
index db16bd36f2d8..6b5198cdca42 100644
--- a/python/python-sdk/BUILD.bazel
+++ b/python/python-sdk/BUILD.bazel
@@ -21,6 +21,7 @@ jvm_library(
     "//platform/analysis-impl",
     "//platform/core-api:core",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/util",
     "//platform/platform-util-io:ide-util-io",
@@ -62,6 +63,7 @@ jvm_library(
     "//platform/analysis-impl",
     "//platform/core-api:core",
     "//jps/model-api:model",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//platform/util",
     "//platform/platform-util-io:ide-util-io",
diff --git a/python/python-sdk/intellij.python.sdk.iml b/python/python-sdk/intellij.python.sdk.iml
index caeeeaa4b4f3..4444e3a00bea 100644
--- a/python/python-sdk/intellij.python.sdk.iml
+++ b/python/python-sdk/intellij.python.sdk.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
diff --git a/xml/xml-psi-impl/BUILD.bazel b/xml/xml-psi-impl/BUILD.bazel
index 2ce2fac0579f..c3a57a860701 100644
--- a/xml/xml-psi-impl/BUILD.bazel
+++ b/xml/xml-psi-impl/BUILD.bazel
@@ -23,6 +23,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/editor-ui-api:editor-ui",
     "//platform/indexing-api:indexing",
+    "//jps/model-serialization",
     "//platform/projectModel-api:projectModel",
     "//xml/xml-frontback-impl:frontback-impl",
     "//xml/xml-psi-api:psi",
diff --git a/xml/xml-psi-impl/intellij.xml.psi.impl.iml b/xml/xml-psi-impl/intellij.xml.psi.impl.iml
index 0e32cd10cee6..0586e8116613 100644
--- a/xml/xml-psi-impl/intellij.xml.psi.impl.iml
+++ b/xml/xml-psi-impl/intellij.xml.psi.impl.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.xml.frontback.impl" exported="" />
     <orderEntry type="module" module-name="intellij.xml.psi" />