diff --git a/.idea/modules.xml b/.idea/modules.xml
index 52afc37dafca..4a666f90dfe4 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1136,13 +1136,13 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" filepath="$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/sh/intellij.sh.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/backend/intellij.sh.backend.iml" filepath="$PROJECT_DIR$/plugins/sh/backend/intellij.sh.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.tests.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/core/intellij.sh.core.iml" filepath="$PROJECT_DIR$/plugins/sh/core/intellij.sh.core.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/sh/intellij.sh.main.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/markdown/intellij.sh.markdown.iml" filepath="$PROJECT_DIR$/plugins/sh/markdown/intellij.sh.markdown.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/sh/plugin/intellij.sh.plugin.iml" filepath="$PROJECT_DIR$/plugins/sh/plugin/intellij.sh.plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/sh/plugin/intellij.sh.plugin.main.iml" filepath="$PROJECT_DIR$/plugins/sh/plugin/intellij.sh.plugin.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/python/intellij.sh.python.iml" filepath="$PROJECT_DIR$/plugins/sh/python/intellij.sh.python.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/terminal/intellij.sh.terminal.iml" filepath="$PROJECT_DIR$/plugins/sh/terminal/intellij.sh.terminal.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/core/intellij.sh.tests.iml" filepath="$PROJECT_DIR$/plugins/sh/core/intellij.sh.tests.iml" />
diff --git a/BUILD.bazel b/BUILD.bazel
index 05aec91ce013..1b3566410841 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -198,7 +198,7 @@ jvm_library(
     "//plugins/stream-debugger:java-debugger-streams",
     "@lib//:jgoodies-common",
     "//plugins/editorconfig:editorconfig-plugin-main",
-    "//plugins/sh:sh-main",
+    "//plugins/sh/plugin:plugin-main",
     "//plugins/terminal/sh",
     "//plugins/gradle-maven:gradle-java-maven",
     "//plugins/markdown/core:markdown",
@@ -476,7 +476,7 @@ jvm_library(
     "//plugins/stream-debugger:java-debugger-streams",
     "@lib//:jgoodies-common",
     "//plugins/editorconfig:editorconfig-plugin-main",
-    "//plugins/sh:sh-main",
+    "//plugins/sh/plugin:plugin-main",
     "//plugins/terminal/sh",
     "//plugins/gradle-maven:gradle-java-maven",
     "//plugins/markdown/core:markdown",
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 70ba35f639e5..7ddc9663e241 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -1222,11 +1222,11 @@ plugins/search-everywhere-ml/ranking/yaml
 plugins/search-everywhere-ml/typos
 plugins/settings-repository
 plugins/settings-sync/jba
-plugins/sh
 plugins/sh/backend
 plugins/sh/copyright
 plugins/sh/core
 plugins/sh/markdown
+plugins/sh/plugin
 plugins/sh/python
 plugins/sh/terminal
 plugins/space/jps-plugin
diff --git a/docs/plugin-graph/plugin-graph.json b/docs/plugin-graph/plugin-graph.json
index cd68ccc04f22..51a1f6b5bbd6 100644
--- a/docs/plugin-graph/plugin-graph.json
+++ b/docs/plugin-graph/plugin-graph.json
@@ -2752,10 +2752,10 @@
   "group": "nodes",
   "data": {
     "id": "v41",
-    "name": "intellij.sh",
+    "name": "intellij.sh.plugin",
     "n": "i.sh",
-    "package": "com.intellij.sh",
-    "sourceModule": "intellij.sh",
+    "package": "com.intellij.sh.plugin",
+    "sourceModule": "intellij.sh.plugin",
     "descriptor": "community/plugins/sh/resources/META-INF/plugin.xml",
     "pluginId": "com.jetbrains.sh",
     "parent": "cv41",
@@ -2768,7 +2768,7 @@
     "name": "intellij.sh/terminal",
     "n": "i.sh/terminal",
     "package": "com.intellij.sh.run.terminal",
-    "sourceModule": "intellij.sh",
+    "sourceModule": "intellij.sh.plugin",
     "descriptor": "community/plugins/sh/resources/intellij.sh.terminal.xml",
     "parent": "cv41",
     "type": 0
@@ -2780,7 +2780,7 @@
     "name": "intellij.sh/copyright",
     "n": "i.sh/copyright",
     "package": "com.intellij.sh.copyright",
-    "sourceModule": "intellij.sh",
+    "sourceModule": "intellij.sh.plugin",
     "descriptor": "community/plugins/sh/resources/intellij.sh.copyright.xml",
     "parent": "cv41",
     "type": 0
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 7fca17ce7146..27213f321a6a 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -144,7 +144,7 @@
     <orderEntry type="module" module-name="intellij.editorconfig.plugin.main" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps.tests" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.sh.main" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.sh.plugin.main" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.terminal.sh" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.gradle.java.maven" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.markdown" scope="RUNTIME" />
diff --git a/jps/jps-builders/testData/cacheLoader/caseFive.json b/jps/jps-builders/testData/cacheLoader/caseFive.json
index 8fdff7c57891..bddf10e6cb05 100644
--- a/jps/jps-builders/testData/cacheLoader/caseFive.json
+++ b/jps/jps-builders/testData/cacheLoader/caseFive.json
@@ -22,9 +22,9 @@
       "h": 8764333034314,
       "relativePath": "$BUILD_DIR$/production/intellij.cidr.externalSystem"
     },
-    "intellij.sh": {
+    "intellij.sh.plugin": {
       "h": 8764333034314,
-      "relativePath": "$BUILD_DIR$/production/intellij.sh"
+      "relativePath": "$BUILD_DIR$/production/intellij.sh.plugin"
     }
   }
 }
\ No newline at end of file
diff --git a/jps/jps-builders/testData/cacheLoader/caseSix.json b/jps/jps-builders/testData/cacheLoader/caseSix.json
index f444389f8c59..2e824e8e3ec2 100644
--- a/jps/jps-builders/testData/cacheLoader/caseSix.json
+++ b/jps/jps-builders/testData/cacheLoader/caseSix.json
@@ -22,9 +22,9 @@
       "h": 8764333034314,
       "relativePath": "$BUILD_DIR$/production/intellij.cidr.externalSystem"
     },
-    "intellij.sh": {
+    "intellij.sh.plugin": {
       "h": 8764333034314,
-      "relativePath": "$BUILD_DIR$/production/intellij.sh"
+      "relativePath": "$BUILD_DIR$/production/intellij.sh.plugin"
     }
   }
 }
\ No newline at end of file
diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt b/jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt
index 1399dcc8e94b..962107bb9b29 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt
+++ b/jps/jps-builders/testSrc/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoaderTest.kt
@@ -72,7 +72,7 @@ class JpsCompilationOutputLoaderTest : BasePlatformTestCase() {
     assertThat(affectedModules).hasSize(1)
     val affectedModule = affectedModules[0]
     assertEquals("resources-production", affectedModule!!.type)
-    assertEquals("intellij.sh", affectedModule.name)
+    assertEquals("intellij.sh.plugin", affectedModule.name)
   }
 
   fun testTargetFolderNotExist() {
@@ -82,7 +82,7 @@ class JpsCompilationOutputLoaderTest : BasePlatformTestCase() {
     val types = affectedModules.map { it.type }
     val names = affectedModules.map { it.name }
     UsefulTestCase.assertSameElements(types, "java-test", "production", "resources-test", "resources-production")
-    UsefulTestCase.assertSameElements(names, "intellij.cidr.externalSystem", "intellij.platform.ssh.integrationTests", "intellij.sh")
+    UsefulTestCase.assertSameElements(names, "intellij.cidr.externalSystem", "intellij.platform.ssh.integrationTests", "intellij.sh.plugin")
   }
 
   fun testChangedTest() {
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
index 9bca885e326a..b795435d9002 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
@@ -49,7 +49,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + seq
   "intellij.eclipse",
   "intellij.platform.langInjection.plugin",
   "intellij.java.debugger.streams",
-  "intellij.sh",
+  "intellij.sh.plugin",
   "intellij.markdown",
   "intellij.mcpserver",
   "intellij.webp",
diff --git a/plugins/sh/copyright/BUILD.bazel b/plugins/sh/copyright/BUILD.bazel
index 5123a3cee54e..76bc670bbcc8 100644
--- a/plugins/sh/copyright/BUILD.bazel
+++ b/plugins/sh/copyright/BUILD.bazel
@@ -36,7 +36,7 @@ jvm_library(
   deps = [
     "//platform/core-api:core",
     "//platform/projectModel-api:projectModel",
-    "//plugins/sh:sh-main",
+    "//plugins/sh/plugin:plugin-main",
     "//plugins/copyright",
     "//plugins/copyright:copyright_test_lib",
     "//platform/projectModel-impl",
diff --git a/plugins/sh/copyright/intellij.sh.copyright.tests.iml b/plugins/sh/copyright/intellij.sh.copyright.tests.iml
index d70f1ca43c92..ea8c7c31b3f5 100644
--- a/plugins/sh/copyright/intellij.sh.copyright.tests.iml
+++ b/plugins/sh/copyright/intellij.sh.copyright.tests.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.sh.main" />
+    <orderEntry type="module" module-name="intellij.sh.plugin.main" />
     <orderEntry type="module" module-name="intellij.copyright" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/plugins/sh/core/BUILD.bazel b/plugins/sh/core/BUILD.bazel
index c5b0e2069ca3..be16714a65a1 100644
--- a/plugins/sh/core/BUILD.bazel
+++ b/plugins/sh/core/BUILD.bazel
@@ -52,7 +52,7 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//plugins/sh/core",
     "//plugins/sh/backend",
-    "//plugins/sh:sh-main",
+    "//plugins/sh/plugin:plugin-main",
     "//spellchecker",
     "//spellchecker:spellchecker_test_lib",
     "//platform/testFramework",
diff --git a/plugins/sh/core/intellij.sh.tests.iml b/plugins/sh/core/intellij.sh.tests.iml
index 50a9aa76181b..68bf13386721 100644
--- a/plugins/sh/core/intellij.sh.tests.iml
+++ b/plugins/sh/core/intellij.sh.tests.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.sh.core" />
     <orderEntry type="module" module-name="intellij.sh.backend" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.sh.main" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.sh.plugin.main" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
diff --git a/plugins/sh/BUILD.bazel b/plugins/sh/plugin/BUILD.bazel
similarity index 62%
rename from plugins/sh/BUILD.bazel
rename to plugins/sh/plugin/BUILD.bazel
index ed7062028a53..b8fbfebe667a 100644
--- a/plugins/sh/BUILD.bazel
+++ b/plugins/sh/plugin/BUILD.bazel
@@ -1,28 +1,27 @@
-### auto-generated section `build intellij.sh` start
+### auto-generated section `build intellij.sh.plugin` start
 load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
 
 jvm_resources(
-  name = "sh_resources",
+  name = "plugin_resources",
   files = glob(["resources/**/*"]),
   strip_prefix = "resources"
 )
 
 jvm_library(
-  name = "sh",
+  name = "plugin",
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
-  runtime_deps = [":sh_resources"]
+  runtime_deps = [":plugin_resources"]
 )
-### auto-generated section `build intellij.sh` end
+### auto-generated section `build intellij.sh.plugin` end
 
-### auto-generated section `build intellij.sh.main` start
+### auto-generated section `build intellij.sh.plugin.main` start
 jvm_library(
-  name = "sh-main",
+  name = "plugin-main",
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   runtime_deps = [
-    "//platform/bootstrap/coroutine",
-    "//plugins/sh",
+    "//plugins/sh/plugin",
     "//plugins/sh/core",
     "//plugins/sh/backend",
     "//plugins/sh/terminal",
@@ -33,13 +32,12 @@ jvm_library(
 )
 
 jvm_library(
-  name = "sh-main_test_lib",
-  module_name = "intellij.sh.main",
+  name = "plugin-main_test_lib",
+  module_name = "intellij.sh.plugin.main",
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   deps = [
-    "//platform/bootstrap/coroutine",
-    "//plugins/sh",
+    "//plugins/sh/plugin",
     "//plugins/sh/core",
     "//plugins/sh/terminal",
     "//plugins/sh/copyright",
@@ -48,4 +46,4 @@ jvm_library(
   ],
   runtime_deps = ["//plugins/sh/backend"]
 )
-### auto-generated section `build intellij.sh.main` end
\ No newline at end of file
+### auto-generated section `build intellij.sh.plugin.main` end
\ No newline at end of file
diff --git a/plugins/sh/intellij.sh.iml b/plugins/sh/plugin/intellij.sh.plugin.iml
similarity index 100%
rename from plugins/sh/intellij.sh.iml
rename to plugins/sh/plugin/intellij.sh.plugin.iml
diff --git a/plugins/sh/intellij.sh.main.iml b/plugins/sh/plugin/intellij.sh.plugin.main.iml
similarity index 83%
rename from plugins/sh/intellij.sh.main.iml
rename to plugins/sh/plugin/intellij.sh.plugin.main.iml
index 4e30f1c60694..5680e05dce2a 100644
--- a/plugins/sh/intellij.sh.main.iml
+++ b/plugins/sh/plugin/intellij.sh.plugin.main.iml
@@ -4,8 +4,7 @@
     <exclude-output />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.bootstrap.coroutine" />
-    <orderEntry type="module" module-name="intellij.sh" />
+    <orderEntry type="module" module-name="intellij.sh.plugin" />
     <orderEntry type="module" module-name="intellij.sh.core" />
     <orderEntry type="module" module-name="intellij.sh.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.sh.terminal" />
diff --git a/plugins/sh/plugin-content.yaml b/plugins/sh/plugin/plugin-content.yaml
similarity index 87%
rename from plugins/sh/plugin-content.yaml
rename to plugins/sh/plugin/plugin-content.yaml
index 40af6cb3f5a8..5a669a8f7caa 100644
--- a/plugins/sh/plugin-content.yaml
+++ b/plugins/sh/plugin/plugin-content.yaml
@@ -4,9 +4,9 @@
 - name: lib/modules/intellij.sh.frontend.split.jar
   contentModules:
   - name: intellij.sh.frontend.split
-- name: lib/sh.jar
+- name: lib/sh-plugin.jar
   modules:
-  - name: intellij.sh
+  - name: intellij.sh.plugin
   contentModules:
   - name: intellij.sh.core
   - name: intellij.sh.terminal
diff --git a/plugins/sh/resources/META-INF/plugin.xml b/plugins/sh/plugin/resources/META-INF/plugin.xml
similarity index 100%
rename from plugins/sh/resources/META-INF/plugin.xml
rename to plugins/sh/plugin/resources/META-INF/plugin.xml
diff --git a/plugins/sh/resources/META-INF/pluginIcon.svg b/plugins/sh/plugin/resources/META-INF/pluginIcon.svg
similarity index 100%
rename from plugins/sh/resources/META-INF/pluginIcon.svg
rename to plugins/sh/plugin/resources/META-INF/pluginIcon.svg
diff --git a/plugins/sh/resources/META-INF/pluginIcon_dark.svg b/plugins/sh/plugin/resources/META-INF/pluginIcon_dark.svg
similarity index 100%
rename from plugins/sh/resources/META-INF/pluginIcon_dark.svg
rename to plugins/sh/plugin/resources/META-INF/pluginIcon_dark.svg
diff --git a/plugins/terminal/tests/BUILD.bazel b/plugins/terminal/tests/BUILD.bazel
index f2233cc4e151..cbba6cea8027 100644
--- a/plugins/terminal/tests/BUILD.bazel
+++ b/plugins/terminal/tests/BUILD.bazel
@@ -36,7 +36,7 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/util/coroutines",
     "//platform/platform-impl/internal",
-    "//plugins/sh",
+    "//plugins/sh/plugin",
     "//platform/code-style-api:codeStyle",
     "@lib//:assert_j",
     "@lib//:jediterm-core",
diff --git a/plugins/terminal/tests/intellij.terminal.tests.iml b/plugins/terminal/tests/intellij.terminal.tests.iml
index 3cf0a68a6f19..ae525ddfdf91 100644
--- a/plugins/terminal/tests/intellij.terminal.tests.iml
+++ b/plugins/terminal/tests/intellij.terminal.tests.iml
@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
     <orderEntry type="module" module-name="intellij.platform.ide.internal" />
-    <orderEntry type="module" module-name="intellij.sh" />
+    <orderEntry type="module" module-name="intellij.sh.plugin" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="library" name="assertJ" level="project" />
     <orderEntry type="library" name="jediterm-core" level="project" />
diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt
index c7ea39c8229d..ba791f2428b7 100644
--- a/python/build/plugin-list.txt
+++ b/python/build/plugin-list.txt
@@ -14,7 +14,7 @@ intellij.platform.langInjection.plugin
 intellij.properties
 intellij.restructuredtext
 intellij.searchEverywhereMl
-intellij.sh
+intellij.sh.plugin
 intellij.statsCollector
 intellij.tasks.core
 intellij.terminal
diff --git a/python/intellij.pycharm.community.main.iml b/python/intellij.pycharm.community.main.iml
index fb8add5da3b7..5b5faac3c916 100644
--- a/python/intellij.pycharm.community.main.iml
+++ b/python/intellij.pycharm.community.main.iml
@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.configurationScript" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.completionMlRanking" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.statsCollector" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.sh.main" />
+    <orderEntry type="module" module-name="intellij.sh.plugin.main" />
     <orderEntry type="module" module-name="intellij.terminal.sh" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.xml.langInjection" />
     <orderEntry type="module" module-name="intellij.textmate.plugin" scope="RUNTIME" />