diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3eae80f81376..c5a17b1fd70a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -369,8 +369,8 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.modules/intellij.devkit.modules.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.modules/intellij.devkit.modules.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.main.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin/noKotlin/intellij.devkit.plugin.main.noKotlin.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin/noKotlin/intellij.devkit.plugin.main.noKotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin.main.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin.main.noKotlin.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.plugin.main.noKotlin.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/runtimeModuleRepository/jps/intellij.devkit.runtimeModuleRepository.jps.iml" filepath="$PROJECT_DIR$/plugins/devkit/runtimeModuleRepository/jps/intellij.devkit.runtimeModuleRepository.jps.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.scaffolding/intellij.devkit.scaffolding.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.scaffolding/intellij.devkit.scaffolding.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.smartupdate/intellij.devkit.smartupdate.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.smartupdate/intellij.devkit.smartupdate.iml" />
diff --git a/plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.main.iml b/plugins/devkit/intellij.devkit.plugin.main.iml
similarity index 100%
rename from plugins/devkit/intellij.devkit.plugin/intellij.devkit.plugin.main.iml
rename to plugins/devkit/intellij.devkit.plugin.main.iml
diff --git a/plugins/devkit/intellij.devkit.plugin/noKotlin/intellij.devkit.plugin.main.noKotlin.iml b/plugins/devkit/intellij.devkit.plugin.main.noKotlin.iml
similarity index 100%
rename from plugins/devkit/intellij.devkit.plugin/noKotlin/intellij.devkit.plugin.main.noKotlin.iml
rename to plugins/devkit/intellij.devkit.plugin.main.noKotlin.iml
diff --git a/plugins/devkit/intellij.devkit.plugin/BUILD.bazel b/plugins/devkit/intellij.devkit.plugin/BUILD.bazel
deleted file mode 100644
index 7f6d12db5b3d..000000000000
--- a/plugins/devkit/intellij.devkit.plugin/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-### auto-generated section `build intellij.devkit.plugin.main` start
-load("@rules_java//java:defs.bzl", "java_library")
-
-java_library(
-  name = "plugin-main",
-  visibility = ["//visibility:public"],
-  runtime_deps = [
-    "//plugins/devkit/intellij.devkit.plugin/noKotlin:devkit-plugin-main-noKotlin",
-    "//plugins/devkit/intellij.kotlin.devkit:kotlin-devkit",
-    "//plugins/devkit/intellij.kotlin.devkit/k1:kotlin-devkit-k1",
-    "//plugins/devkit/intellij.kotlin.devkit/k2:kotlin-devkit-k2",
-    "//plugins/devkit/intellij.devkit.workspaceModel:workspaceModel",
-  ]
-)
-### auto-generated section `build intellij.devkit.plugin.main` end
\ No newline at end of file
diff --git a/plugins/devkit/intellij.devkit.plugin/README.md b/plugins/devkit/intellij.devkit.plugin/README.md
deleted file mode 100644
index b75e37b681b3..000000000000
--- a/plugins/devkit/intellij.devkit.plugin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The sole purpose of these modules is to aggregate other modules into a single dependency for `intellij.idea.community.main` and such.
diff --git a/plugins/devkit/intellij.devkit.plugin/noKotlin/BUILD.bazel b/plugins/devkit/intellij.devkit.plugin/noKotlin/BUILD.bazel
deleted file mode 100644
index 6ec535c1b0bc..000000000000
--- a/plugins/devkit/intellij.devkit.plugin/noKotlin/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-### auto-generated section `build intellij.devkit.plugin.main.noKotlin` start
-load("@rules_java//java:defs.bzl", "java_library")
-
-java_library(
-  name = "devkit-plugin-main-noKotlin",
-  visibility = ["//visibility:public"],
-  runtime_deps = [
-    "//plugins/devkit/intellij.devkit:devkit",
-    "//plugins/devkit/devkit-core:core",
-    "//plugins/devkit/intellij.devkit.debugger:debugger",
-    "//plugins/devkit/intellij.devkit.git:git",
-    "//plugins/devkit/intellij.devkit.gradle:gradle",
-    "//plugins/devkit/intellij.devkit.i18n:i18n",
-    "//plugins/devkit/intellij.devkit.images:images",
-    "//plugins/devkit/intellij.devkit.intelliLang:intelliLang",
-    "//plugins/devkit/intellij.devkit.themes:themes",
-    "//plugins/devkit/intellij.devkit.uiDesigner:uiDesigner",
-    "//plugins/devkit/jps-plugin:jps",
-    "//plugins/devkit/runtimeModuleRepository/jps:devkit-runtimeModuleRepository-jps",
-    "//plugins/devkit/intellij.devkit.stacktrace:stacktrace",
-    "//plugins/devkit/api-dump:apiDump",
-    "//plugins/devkit/api-dump-lang:apiDump-lang",
-  ]
-)
-### auto-generated section `build intellij.devkit.plugin.main.noKotlin` end
\ No newline at end of file