diff --git a/.idea/modules.xml b/.idea/modules.xml
index 11674307a13a..ac4543b732d9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -753,6 +753,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/lvcs-impl/intellij.platform.lvcs.impl.iml" filepath="$PROJECT_DIR$/platform/lvcs-impl/intellij.platform.lvcs.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/macro/intellij.platform.macro.iml" filepath="$PROJECT_DIR$/platform/macro/intellij.platform.macro.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-main/intellij.platform.main.iml" filepath="$PROJECT_DIR$/platform/platform-main/intellij.platform.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/markdown-utils/intellij.platform.markdown.utils.iml" filepath="$PROJECT_DIR$/platform/markdown-utils/intellij.platform.markdown.utils.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/ml-impl/intellij.platform.ml.impl.iml" filepath="$PROJECT_DIR$/platform/ml-impl/intellij.platform.ml.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.annotations.iml" filepath="$PROJECT_DIR$/platform/object-serializer/intellij.platform.objectSerializer.annotations.iml" />
diff --git a/platform/markdown-utils/intellij.platform.markdown.utils.iml b/platform/markdown-utils/intellij.platform.markdown.utils.iml
new file mode 100644
index 000000000000..97594957e143
--- /dev/null
+++ b/platform/markdown-utils/intellij.platform.markdown.utils.iml
@@ -0,0 +1,18 @@
+<?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$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="intellij-markdown" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/markdown/CodeFenceSyntaxHighlighterGeneratingProvider.kt b/platform/markdown-utils/src/com/intellij/markdown/utils/CodeFenceSyntaxHighlighterGeneratingProvider.kt
similarity index 90%
rename from platform/collaboration-tools/src/com/intellij/collaboration/markdown/CodeFenceSyntaxHighlighterGeneratingProvider.kt
rename to platform/markdown-utils/src/com/intellij/markdown/utils/CodeFenceSyntaxHighlighterGeneratingProvider.kt
index ab3baa559664..56bb5e75d65e 100644
--- a/platform/collaboration-tools/src/com/intellij/collaboration/markdown/CodeFenceSyntaxHighlighterGeneratingProvider.kt
+++ b/platform/markdown-utils/src/com/intellij/markdown/utils/CodeFenceSyntaxHighlighterGeneratingProvider.kt
@@ -1,7 +1,7 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.collaboration.markdown
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.markdown.utils
 
-import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
+import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
 import com.intellij.openapi.util.text.HtmlBuilder
 import com.intellij.openapi.util.text.HtmlChunk
 import org.intellij.markdown.MarkdownTokenTypes
diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/markdown/MarkdownToHtmlConverter.kt b/platform/markdown-utils/src/com/intellij/markdown/utils/MarkdownToHtmlConverter.kt
similarity index 85%
rename from platform/collaboration-tools/src/com/intellij/collaboration/markdown/MarkdownToHtmlConverter.kt
rename to platform/markdown-utils/src/com/intellij/markdown/utils/MarkdownToHtmlConverter.kt
index 2a9abe4d14c5..525ff3fe6518 100644
--- a/platform/collaboration-tools/src/com/intellij/collaboration/markdown/MarkdownToHtmlConverter.kt
+++ b/platform/markdown-utils/src/com/intellij/markdown/utils/MarkdownToHtmlConverter.kt
@@ -1,13 +1,15 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.collaboration.markdown
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.markdown.utils
 
 import com.intellij.openapi.util.NlsSafe
 import org.intellij.markdown.flavours.MarkdownFlavourDescriptor
 import org.intellij.markdown.html.HtmlGenerator
 import org.intellij.markdown.parser.LinkMap
 import org.intellij.markdown.parser.MarkdownParser
+import org.jetbrains.annotations.ApiStatus
 import java.net.URI
 
+@ApiStatus.Internal
 class MarkdownToHtmlConverter(
   private val flavourDescriptor: MarkdownFlavourDescriptor
 ) {
diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/lang/CodeBlockHtmlSyntaxHighlighter.kt b/platform/markdown-utils/src/com/intellij/markdown/utils/lang/CodeBlockHtmlSyntaxHighlighter.kt
similarity index 78%
rename from platform/collaboration-tools/src/com/intellij/collaboration/lang/CodeBlockHtmlSyntaxHighlighter.kt
rename to platform/markdown-utils/src/com/intellij/markdown/utils/lang/CodeBlockHtmlSyntaxHighlighter.kt
index 5b7662d48f87..ac6e9041c20d 100644
--- a/platform/collaboration-tools/src/com/intellij/collaboration/lang/CodeBlockHtmlSyntaxHighlighter.kt
+++ b/platform/markdown-utils/src/com/intellij/markdown/utils/lang/CodeBlockHtmlSyntaxHighlighter.kt
@@ -1,8 +1,8 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.collaboration.lang
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.markdown.utils.lang
 
-import com.intellij.collaboration.lang.HtmlSyntaxHighlighter.Companion.colorHtmlChunk
 import com.intellij.lang.Language
+import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter.Companion.colorHtmlChunk
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.NlsSafe
 import com.intellij.openapi.util.text.HtmlChunk
diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/lang/HtmlSyntaxHighlighter.kt b/platform/markdown-utils/src/com/intellij/markdown/utils/lang/HtmlSyntaxHighlighter.kt
similarity index 93%
rename from platform/collaboration-tools/src/com/intellij/collaboration/lang/HtmlSyntaxHighlighter.kt
rename to platform/markdown-utils/src/com/intellij/markdown/utils/lang/HtmlSyntaxHighlighter.kt
index 36ccaa68568d..dd772b9e4b99 100644
--- a/platform/collaboration-tools/src/com/intellij/collaboration/lang/HtmlSyntaxHighlighter.kt
+++ b/platform/markdown-utils/src/com/intellij/markdown/utils/lang/HtmlSyntaxHighlighter.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.collaboration.lang
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.markdown.utils.lang
 
 import com.intellij.lang.Language
 import com.intellij.openapi.editor.colors.EditorColorsManager
diff --git a/platform/collaboration-tools/test/com/intellij/collaboration/markdown/MarkdownToHtmlConverterTest.kt b/platform/markdown-utils/test/com/intellij/markdown/utils/MarkdownToHtmlConverterTest.kt
similarity index 93%
rename from platform/collaboration-tools/test/com/intellij/collaboration/markdown/MarkdownToHtmlConverterTest.kt
rename to platform/markdown-utils/test/com/intellij/markdown/utils/MarkdownToHtmlConverterTest.kt
index df4ebf7ea090..ffab5bb455bc 100644
--- a/platform/collaboration-tools/test/com/intellij/collaboration/markdown/MarkdownToHtmlConverterTest.kt
+++ b/platform/markdown-utils/test/com/intellij/markdown/utils/MarkdownToHtmlConverterTest.kt
@@ -1,7 +1,7 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.collaboration.markdown
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.markdown.utils
 
-import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
+import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
 import com.intellij.openapi.util.text.HtmlChunk
 import org.intellij.markdown.IElementType
 import org.intellij.markdown.MarkdownElementTypes
diff --git a/plugins/github/intellij.vcs.github.iml b/plugins/github/intellij.vcs.github.iml
index 9d094b08e2f7..c31789b1a9c1 100644
--- a/plugins/github/intellij.vcs.github.iml
+++ b/plugins/github/intellij.vcs.github.iml
@@ -48,6 +48,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="library" name="caffeine" level="project" />
     <orderEntry type="module" module-name="intellij.platform.collaborationTools.auth" />
+    <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
     <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
     <orderEntry type="library" name="intellij-markdown" level="project" />
   </component>
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/GHMarkdownToHtmlConverter.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/GHMarkdownToHtmlConverter.kt
index 76b1dbc3eafe..dc649003bdc2 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/GHMarkdownToHtmlConverter.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/GHMarkdownToHtmlConverter.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.github.pullrequest.comment
 
-import com.intellij.collaboration.lang.CodeBlockHtmlSyntaxHighlighter
-import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
-import com.intellij.collaboration.markdown.CodeFenceSyntaxHighlighterGeneratingProvider
-import com.intellij.collaboration.markdown.MarkdownToHtmlConverter
+import com.intellij.markdown.utils.CodeFenceSyntaxHighlighterGeneratingProvider
+import com.intellij.markdown.utils.MarkdownToHtmlConverter
+import com.intellij.markdown.utils.lang.CodeBlockHtmlSyntaxHighlighter
+import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.NlsSafe
 import org.intellij.markdown.IElementType
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/GHSuggestionHtmlSyntaxHighlighter.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/GHSuggestionHtmlSyntaxHighlighter.kt
index 7d4133d5bcf6..2a859bf8e5c0 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/GHSuggestionHtmlSyntaxHighlighter.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/comment/GHSuggestionHtmlSyntaxHighlighter.kt
@@ -1,9 +1,9 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.github.pullrequest.comment
 
-import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
-import com.intellij.collaboration.lang.HtmlSyntaxHighlighter.Companion.colorHtmlChunk
 import com.intellij.lang.Language
+import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
+import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter.Companion.colorHtmlChunk
 import com.intellij.openapi.diff.DiffColors
 import com.intellij.openapi.diff.impl.patch.PatchHunk
 import com.intellij.openapi.diff.impl.patch.PatchLine
diff --git a/plugins/markdown/intellij.markdown.iml b/plugins/markdown/intellij.markdown.iml
index d08e33c46029..f4a86e4406f3 100644
--- a/plugins/markdown/intellij.markdown.iml
+++ b/plugins/markdown/intellij.markdown.iml
@@ -34,6 +34,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.collaborationTools" />
+    <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="jackson-databind" level="project" />
     <orderEntry type="library" name="jackson-module-kotlin" level="project" />
diff --git a/plugins/markdown/src/org/intellij/plugins/markdown/extensions/common/highlighter/MarkdownCodeFencePreviewHighlighter.kt b/plugins/markdown/src/org/intellij/plugins/markdown/extensions/common/highlighter/MarkdownCodeFencePreviewHighlighter.kt
index 3e9364279c02..b15842aa2214 100644
--- a/plugins/markdown/src/org/intellij/plugins/markdown/extensions/common/highlighter/MarkdownCodeFencePreviewHighlighter.kt
+++ b/plugins/markdown/src/org/intellij/plugins/markdown/extensions/common/highlighter/MarkdownCodeFencePreviewHighlighter.kt
@@ -1,8 +1,8 @@
 // Copyright 2000-2020 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.
 package org.intellij.plugins.markdown.extensions.common.highlighter
 
-import com.intellij.collaboration.lang.HtmlSyntaxHighlighter
 import com.intellij.lang.Language
+import com.intellij.markdown.utils.lang.HtmlSyntaxHighlighter
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.ColorUtil
 import org.intellij.markdown.MarkdownTokenTypes