diff --git a/.idea/artifacts/ideaPlugin.xml b/.idea/artifacts/ideaPlugin.xml
index 8c409f47bec..9848a4e1cb0 100644
--- a/.idea/artifacts/ideaPlugin.xml
+++ b/.idea/artifacts/ideaPlugin.xml
@@ -11,93 +11,93 @@
           <element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/markdown/0.1.25/f22b57c632b83433112102c9da9a0f8edf946091/markdown-0.1.25.jar" />
           <element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.javaslang/javaslang-match/2.0.6/d57a666939103b659813de52102d3ff0baa8ad5f/javaslang-match-2.0.6.jar" />
           <element id="archive" name="allopen-ide-plugin.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.allopen-ide-plugin.main" />
+            <element id="module-output" name="kotlin.allopen-ide-plugin.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/allopen/allopen-ide/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="android-lint.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.lint.main" />
-            <element id="module-output" name="org.jetbrains.kotlin.uast-kotlin.main" />
-            <element id="module-output" name="org.jetbrains.kotlin.uast-kotlin-idea.main" />
+            <element id="module-output" name="kotlin.plugins.lint.main" />
+            <element id="module-output" name="kotlin.plugins.uast-kotlin.main" />
+            <element id="module-output" name="kotlin.plugins.uast-kotlin-idea.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/prepare/android-lint/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="android-ide.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.idea-android.main" />
+            <element id="module-output" name="kotlin.idea.idea-android.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/idea/idea-android/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="android-output-parser-ide.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.idea-android-output-parser.main" />
+            <element id="module-output" name="kotlin.idea.idea-android-output-parser.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="idea-git.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.idea-git.main" />
+            <element id="module-output" name="kotlin.idea.idea-git.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/idea/idea-git/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="jps-common-ide.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.idea-jps-common.main" />
+            <element id="module-output" name="kotlin.idea.idea-jps-common.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/idea/idea-jps-common/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="jvm-ide.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.idea-jvm.main" />
+            <element id="module-output" name="kotlin.idea.idea-jvm.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/idea/idea-jvm/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="maven-ide.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.idea-maven.main" />
+            <element id="module-output" name="kotlin.idea.idea-maven.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/idea/idea-maven/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-gradle-tooling.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-gradle-tooling.main" />
+            <element id="module-output" name="kotlin.idea.kotlin-gradle-tooling.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/idea/kotlin-gradle-tooling/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="j2k.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.j2k.main" />
+            <element id="module-output" name="kotlin.j2k.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/j2k/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-allopen-compiler-plugin.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-allopen-compiler-plugin.main" />
+            <element id="module-output" name="kotlin.kotlin-allopen-compiler-plugin.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/allopen/allopen-cli/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-noarg-compiler-plugin.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-noarg-compiler-plugin.main" />
+            <element id="module-output" name="kotlin.kotlin-noarg-compiler-plugin.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/noarg/noarg-cli/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-sam-with-receiver-compiler-plugin.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-sam-with-receiver-compiler-plugin.main" />
+            <element id="module-output" name="kotlin.kotlin-sam-with-receiver-compiler-plugin.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-script-util.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-script-util.main" />
+            <element id="module-output" name="kotlin.kotlin-script-util.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/libraries/tools/kotlin-script-util/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-scripting-common.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-common.main" />
+            <element id="module-output" name="kotlin.kotlin-scripting-common.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/libraries/scripting/common/build/tmp/jar/MANIFEST.MF" />
             </element>
@@ -112,25 +112,25 @@
             </element>
           </element>
           <element id="archive" name="kotlin-scripting-compiler.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-compiler.main" />
+            <element id="module-output" name="kotlin.kotlin-scripting-compiler.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/scripting/scripting-cli/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-scripting-idea.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-idea.main" />
+            <element id="module-output" name="kotlin.kotlin-scripting-idea.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/scripting/scripting-idea/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-scripting-intellij.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-intellij.main" />
+            <element id="module-output" name="kotlin.kotlin-scripting-intellij.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/libraries/scripting/intellij/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-scripting-jvm.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-jvm.main" />
+            <element id="module-output" name="kotlin.kotlin-scripting-jvm.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/libraries/scripting/jvm/build/tmp/jar/MANIFEST.MF" />
             </element>
@@ -145,50 +145,50 @@
             </element>
           </element>
           <element id="archive" name="kotlinx-serialization-compiler-plugin.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlinx-serialization-compiler-plugin.main" />
+            <element id="module-output" name="kotlin.kotlinx-serialization-compiler-plugin.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/kotlin-serialization/kotlin-serialization-compiler/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlinx-serialization-ide-plugin.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlinx-serialization-ide-plugin.main" />
+            <element id="module-output" name="kotlin.kotlinx-serialization-ide-plugin.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/kotlin-serialization/kotlin-serialization-ide/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="noarg-ide-plugin.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.noarg-ide-plugin.main" />
+            <element id="module-output" name="kotlin.noarg-ide-plugin.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/noarg/noarg-ide/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="android-extensions-compiler.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.android-extensions-compiler.main" />
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-android-extensions-runtime.main" />
+            <element id="module-output" name="kotlin.plugins.android-extensions-compiler.main" />
+            <element id="module-output" name="kotlin.kotlin-android-extensions-runtime.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="android-extensions-ide.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.android-extensions-ide.main" />
+            <element id="module-output" name="kotlin.plugins.android-extensions-ide.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/android-extensions/android-extensions-idea/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kapt3-idea.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kapt3-idea.main" />
+            <element id="module-output" name="kotlin.plugins.kapt3-idea.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/kapt3/kapt3-idea/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="kotlin-script-runtime.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.kotlin-script-runtime.main" />
+            <element id="module-output" name="kotlin.kotlin-script-runtime.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/libraries/tools/script-runtime/build/tmp/jar/MANIFEST.MF" />
             </element>
           </element>
           <element id="archive" name="sam-with-receiver-ide-plugin.jar">
-            <element id="module-output" name="org.jetbrains.kotlin.sam-with-receiver-ide-plugin.main" />
+            <element id="module-output" name="kotlin.sam-with-receiver-ide-plugin.main" />
             <element id="directory" name="META-INF">
               <element id="file-copy" path="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/build/tmp/jar/MANIFEST.MF" />
             </element>
@@ -205,12 +205,6 @@
           <element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.30-dev-1419/1edc4fbedf02e815e3d277c47640c9c79b5df72e/kotlin-stdlib-common-1.3.30-dev-1419.jar" output-file-name="kotlin-stdlib-common.jar" />
           <element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
           <element id="artifact" artifact-name="kotlin-daemon-client.jar" />
-          <element id="archive" name="usage-statistics.jar">
-            <element id="directory" name="META-INF">
-              <element id="file-copy" path="$PROJECT_DIR$/usage-statistics/build/tmp/jar/MANIFEST.MF" />
-            </element>
-            <element id="module-output" name="org.jetbrains.kotlin.usage-statistics.main" />
-          </element>
         </element>
         <element id="directory" name="kotlinc">
           <element id="artifact" artifact-name="kotlinc" />
diff --git a/.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml b/.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml
index b26bd7632b3..0282d7e2fb7 100644
--- a/.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml
+++ b/.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml
@@ -20,10 +20,10 @@
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-osx-i386/0.14/fd86b7eedbf5a0df003cf946f0b0c80c06c103ee/native-platform-osx-i386-0.14.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-windows-amd64/0.14/bdf519fab10700fadc9953526a07e8104fad1d07/native-platform-windows-amd64-0.14.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-windows-i386/0.14/65b00e123554f42ecd0da054a747033be5da608d/native-platform-windows-i386-0.14.jar" path-in-jar="/" />
-      <element id="module-output" name="org.jetbrains.kotlin.cli-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.daemon-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-compiler-client-embeddable.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-daemon-client.main" />
+      <element id="module-output" name="kotlin.compiler.cli-common.main" />
+      <element id="module-output" name="kotlin.compiler.daemon-common.main" />
+      <element id="module-output" name="kotlin.kotlin-compiler-client-embeddable.main" />
+      <element id="module-output" name="kotlin.kotlin-daemon-client.main" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/kotlin_compiler_jar.xml b/.idea/artifacts/kotlin_compiler_jar.xml
index 4bdd0bc2bbc..bd317edc56a 100644
--- a/.idea/artifacts/kotlin_compiler_jar.xml
+++ b/.idea/artifacts/kotlin_compiler_jar.xml
@@ -30,43 +30,43 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/buildSrc/prepare-deps/intellij-sdk/build/repo/kotlin.build.custom.deps/183.5153.4/intellij/lib/picocontainer-1.2.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/protobuf-relocated/2.6.1/9a9536949348fae596f4878243dffd0ed351993d/protobuf-relocated-2.6.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/buildSrc/prepare-deps/intellij-sdk/build/repo/kotlin.build.custom.deps/183.5153.4/intellij/lib/streamex-0.6.7.jar" path-in-jar="/" />
-      <element id="module-output" name="org.jetbrains.kotlin.backend-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.backend.js.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.backend.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.backend.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.cli-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.cli.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.compiler.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.container.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.daemon-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.daemon.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.deserialization.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.frontend.java.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.frontend.script.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.frontend.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.incremental-compilation-impl.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.ir.backend.common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.ir.psi2ir.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.ir.tree.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.ast.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.dce.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.frontend.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.parser.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.serializer.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.translator.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-build-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.light-classes.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.metadata.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.metadata.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.plugin-api.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.psi.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.resolution.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.serialization.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.util.runtime.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.util.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.frontend.common.main" />
+      <element id="module-output" name="kotlin.compiler.backend-common.main" />
+      <element id="module-output" name="kotlin.compiler.backend.js.main" />
+      <element id="module-output" name="kotlin.compiler.backend.jvm.main" />
+      <element id="module-output" name="kotlin.compiler.backend.main" />
+      <element id="module-output" name="kotlin.compiler.cli-common.main" />
+      <element id="module-output" name="kotlin.compiler.cli.main" />
+      <element id="module-output" name="kotlin.compiler.main" />
+      <element id="module-output" name="kotlin.compiler.container.main" />
+      <element id="module-output" name="kotlin.compiler.daemon-common.main" />
+      <element id="module-output" name="kotlin.compiler.daemon.main" />
+      <element id="module-output" name="kotlin.core.descriptors.jvm.main" />
+      <element id="module-output" name="kotlin.core.descriptors.main" />
+      <element id="module-output" name="kotlin.core.deserialization.main" />
+      <element id="module-output" name="kotlin.compiler.frontend.java.main" />
+      <element id="module-output" name="kotlin.compiler.frontend.script.main" />
+      <element id="module-output" name="kotlin.compiler.frontend.main" />
+      <element id="module-output" name="kotlin.compiler.incremental-compilation-impl.main" />
+      <element id="module-output" name="kotlin.compiler.ir.backend.common.main" />
+      <element id="module-output" name="kotlin.compiler.ir.psi2ir.main" />
+      <element id="module-output" name="kotlin.compiler.ir.tree.main" />
+      <element id="module-output" name="kotlin.js.js.ast.main" />
+      <element id="module-output" name="kotlin.js.js.dce.main" />
+      <element id="module-output" name="kotlin.js.js.frontend.main" />
+      <element id="module-output" name="kotlin.js.js.parser.main" />
+      <element id="module-output" name="kotlin.js.js.serializer.main" />
+      <element id="module-output" name="kotlin.js.js.translator.main" />
+      <element id="module-output" name="kotlin.kotlin-build-common.main" />
+      <element id="module-output" name="kotlin.compiler.light-classes.main" />
+      <element id="module-output" name="kotlin.core.metadata.jvm.main" />
+      <element id="module-output" name="kotlin.core.metadata.main" />
+      <element id="module-output" name="kotlin.compiler.plugin-api.main" />
+      <element id="module-output" name="kotlin.compiler.psi.main" />
+      <element id="module-output" name="kotlin.compiler.resolution.main" />
+      <element id="module-output" name="kotlin.compiler.serialization.main" />
+      <element id="module-output" name="kotlin.core.util.runtime.main" />
+      <element id="module-output" name="kotlin.compiler.util.main" />
+      <element id="module-output" name="kotlin.compiler.frontend.common.main" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/kotlin_daemon_client_jar.xml b/.idea/artifacts/kotlin_daemon_client_jar.xml
index 4c46a93f46e..899ff3e378e 100644
--- a/.idea/artifacts/kotlin_daemon_client_jar.xml
+++ b/.idea/artifacts/kotlin_daemon_client_jar.xml
@@ -17,8 +17,8 @@
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-osx-i386/0.14/fd86b7eedbf5a0df003cf946f0b0c80c06c103ee/native-platform-osx-i386-0.14.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-windows-amd64/0.14/bdf519fab10700fadc9953526a07e8104fad1d07/native-platform-windows-amd64-0.14.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-windows-i386/0.14/65b00e123554f42ecd0da054a747033be5da608d/native-platform-windows-i386-0.14.jar" path-in-jar="/" />
-      <element id="module-output" name="org.jetbrains.kotlin.daemon-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-daemon-client.main" />
+      <element id="module-output" name="kotlin.compiler.daemon-common.main" />
+      <element id="module-output" name="kotlin.kotlin-daemon-client.main" />
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/compiler/daemon/daemon-client/build/tmp/shadowJar/MANIFEST.MF" />
       </element>
diff --git a/.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml b/.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
index 3779fe6d7b0..81b3fb43e35 100644
--- a/.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
+++ b/.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
@@ -6,7 +6,7 @@
         <element id="file-copy" path="$PROJECT_DIR$/plugins/imports-dumper/build/tmp/jar/MANIFEST.MF" />
       </element>
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-serialization-runtime/0.4.2/e343c68c9fa77a190225484c1e03b1485fbb5f1f/kotlinx-serialization-runtime-0.4.2.jar" path-in-jar="/" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-imports-dumper-compiler-plugin.main" />
+      <element id="module-output" name="kotlin.kotlin-imports-dumper-compiler-plugin.main" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/kotlin_jps_plugin_jar.xml b/.idea/artifacts/kotlin_jps_plugin_jar.xml
index d7bb55e7cd2..98ac336b457 100644
--- a/.idea/artifacts/kotlin_jps_plugin_jar.xml
+++ b/.idea/artifacts/kotlin_jps_plugin_jar.xml
@@ -20,18 +20,18 @@
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-osx-i386/0.14/fd86b7eedbf5a0df003cf946f0b0c80c06c103ee/native-platform-osx-i386-0.14.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-windows-amd64/0.14/bdf519fab10700fadc9953526a07e8104fad1d07/native-platform-windows-amd64-0.14.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.rubygrapefruit/native-platform-windows-i386/0.14/65b00e123554f42ecd0da054a747033be5da608d/native-platform-windows-i386-0.14.jar" path-in-jar="/" />
-      <element id="module-output" name="org.jetbrains.kotlin.cli-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.daemon-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.idea-jps-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.jps-plugin.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-build-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-compiler-runner.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-daemon-client.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-preloader.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.util.runtime.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.util.main" />
+      <element id="module-output" name="kotlin.compiler.cli-common.main" />
+      <element id="module-output" name="kotlin.compiler.daemon-common.main" />
+      <element id="module-output" name="kotlin.core.descriptors.jvm.main" />
+      <element id="module-output" name="kotlin.core.descriptors.main" />
+      <element id="module-output" name="kotlin.idea.idea-jps-common.main" />
+      <element id="module-output" name="kotlin.jps-plugin.main" />
+      <element id="module-output" name="kotlin.kotlin-build-common.main" />
+      <element id="module-output" name="kotlin.kotlin-compiler-runner.main" />
+      <element id="module-output" name="kotlin.kotlin-daemon-client.main" />
+      <element id="module-output" name="kotlin.kotlin-preloader.main" />
+      <element id="module-output" name="kotlin.core.util.runtime.main" />
+      <element id="module-output" name="kotlin.compiler.util.main" />
       <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
     </root>
   </artifact>
diff --git a/.idea/artifacts/kotlin_main_kts_jar.xml b/.idea/artifacts/kotlin_main_kts_jar.xml
index 8d7520b0abe..251c8f830f9 100644
--- a/.idea/artifacts/kotlin_main_kts_jar.xml
+++ b/.idea/artifacts/kotlin_main_kts_jar.xml
@@ -7,11 +7,11 @@
       </element>
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ivy/ivy/2.4.0/5abe4c24bbe992a9ac07ca563d5bd3e8d569e9ed/ivy-2.4.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.1/f33e8dab753f33d1bbb07cca664fd6f13d993d7e/kotlinx-coroutines-core-1.0.1.jar" path-in-jar="/" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-main-kts.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-script-runtime.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-script-util.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-jvm.main" />
+      <element id="module-output" name="kotlin.kotlin-main-kts.main" />
+      <element id="module-output" name="kotlin.kotlin-script-runtime.main" />
+      <element id="module-output" name="kotlin.kotlin-script-util.main" />
+      <element id="module-output" name="kotlin.kotlin-scripting-common.main" />
+      <element id="module-output" name="kotlin.kotlin-scripting-jvm.main" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/kotlin_plugin_jar.xml b/.idea/artifacts/kotlin_plugin_jar.xml
index 0a8247fecb5..f91bc15123e 100644
--- a/.idea/artifacts/kotlin_plugin_jar.xml
+++ b/.idea/artifacts/kotlin_plugin_jar.xml
@@ -7,51 +7,51 @@
       </element>
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/builtins/1.3.30-dev-1419/d204f62db9ed29f42e939e0e62c4ee933863e05b/builtins-1.3.30-dev-1419.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/protobuf-relocated/2.6.1/9a9536949348fae596f4878243dffd0ed351993d/protobuf-relocated-2.6.1.jar" path-in-jar="/" />
-      <element id="module-output" name="org.jetbrains.kotlin.annotation-based-compiler-plugins-ide-support.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.backend-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.backend.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.backend.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.cli-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.container.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.daemon-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.deserialization.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.eval4j.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.fir-view.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.frontend.java.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.frontend.script.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.frontend.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.ide-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.idea-core.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.formatter.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.idea-gradle-native.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.idea-gradle.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.idea-native.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.idea.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.ir.backend.common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.ir.psi2ir.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.ir.tree.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.ast.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.frontend.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.parser.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.serializer.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.js.translator.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-build-common.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-native-library-reader.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-native-utils.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-preloader.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.light-classes.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.metadata.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.metadata.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.plugin-api.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.psi.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.resolution.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.serialization.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.util.runtime.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.util.main" />
+      <element id="module-output" name="kotlin.plugins.annotation-based-compiler-plugins-ide-support.main" />
+      <element id="module-output" name="kotlin.compiler.backend-common.main" />
+      <element id="module-output" name="kotlin.compiler.backend.main" />
+      <element id="module-output" name="kotlin.compiler.backend.jvm.main" />
+      <element id="module-output" name="kotlin.compiler.cli-common.main" />
+      <element id="module-output" name="kotlin.compiler.container.main" />
+      <element id="module-output" name="kotlin.compiler.daemon-common.main" />
+      <element id="module-output" name="kotlin.core.descriptors.jvm.main" />
+      <element id="module-output" name="kotlin.core.descriptors.main" />
+      <element id="module-output" name="kotlin.core.deserialization.main" />
+      <element id="module-output" name="kotlin.eval4j.main" />
+      <element id="module-output" name="kotlin.idea.fir-view.main" />
+      <element id="module-output" name="kotlin.compiler.frontend.java.main" />
+      <element id="module-output" name="kotlin.compiler.frontend.script.main" />
+      <element id="module-output" name="kotlin.compiler.frontend.main" />
+      <element id="module-output" name="kotlin.idea.ide-common.main" />
+      <element id="module-output" name="kotlin.idea.idea-core.main" />
+      <element id="module-output" name="kotlin.idea.formatter.main" />
+      <element id="module-output" name="kotlin.idea.idea-gradle-native.main" />
+      <element id="module-output" name="kotlin.idea.idea-gradle.main" />
+      <element id="module-output" name="kotlin.idea.idea-native.main" />
+      <element id="module-output" name="kotlin.idea.main" />
+      <element id="module-output" name="kotlin.compiler.ir.backend.common.main" />
+      <element id="module-output" name="kotlin.compiler.ir.psi2ir.main" />
+      <element id="module-output" name="kotlin.compiler.ir.tree.main" />
+      <element id="module-output" name="kotlin.js.js.ast.main" />
+      <element id="module-output" name="kotlin.js.js.frontend.main" />
+      <element id="module-output" name="kotlin.js.js.parser.main" />
+      <element id="module-output" name="kotlin.js.js.serializer.main" />
+      <element id="module-output" name="kotlin.js.js.translator.main" />
+      <element id="module-output" name="kotlin.kotlin-build-common.main" />
+      <element id="module-output" name="kotlin.kotlin-native.kotlin-native-library-reader.main" />
+      <element id="module-output" name="kotlin.kotlin-native.kotlin-native-utils.main" />
+      <element id="module-output" name="kotlin.kotlin-preloader.main" />
+      <element id="module-output" name="kotlin.compiler.light-classes.main" />
+      <element id="module-output" name="kotlin.core.metadata.jvm.main" />
+      <element id="module-output" name="kotlin.core.metadata.main" />
+      <element id="module-output" name="kotlin.compiler.plugin-api.main" />
+      <element id="module-output" name="kotlin.compiler.psi.main" />
+      <element id="module-output" name="kotlin.compiler.resolution.main" />
+      <element id="module-output" name="kotlin.compiler.serialization.main" />
+      <element id="module-output" name="kotlin.core.util.runtime.main" />
+      <element id="module-output" name="kotlin.compiler.util.main" />
       <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
-      <element id="module-output" name="org.jetbrains.kotlin.frontend.common.main" />
+      <element id="module-output" name="kotlin.compiler.frontend.common.main" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/kotlin_reflect_jar.xml b/.idea/artifacts/kotlin_reflect_jar.xml
index 16400c66f8d..087b070cdf8 100644
--- a/.idea/artifacts/kotlin_reflect_jar.xml
+++ b/.idea/artifacts/kotlin_reflect_jar.xml
@@ -7,15 +7,15 @@
       </element>
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/protobuf-lite/2.6.1/9af39e6d6cbd4404d06ae2ae63505b6247e6760b/protobuf-lite-2.6.1.jar" path-in-jar="/" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.runtime.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.descriptors.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.deserialization.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-reflect-api.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.kotlin-reflect.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.metadata.jvm.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.metadata.main" />
-      <element id="module-output" name="org.jetbrains.kotlin.util.runtime.main" />
+      <element id="module-output" name="kotlin.core.descriptors.jvm.main" />
+      <element id="module-output" name="kotlin.core.descriptors.runtime.main" />
+      <element id="module-output" name="kotlin.core.descriptors.main" />
+      <element id="module-output" name="kotlin.core.deserialization.main" />
+      <element id="module-output" name="kotlin.kotlin-reflect-api.main" />
+      <element id="module-output" name="kotlin.kotlin-reflect.main" />
+      <element id="module-output" name="kotlin.core.metadata.jvm.main" />
+      <element id="module-output" name="kotlin.core.metadata.main" />
+      <element id="module-output" name="kotlin.core.util.runtime.main" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/kotlinc.xml b/.idea/artifacts/kotlinc.xml
index ee63a1e972f..c494ee7e29b 100644
--- a/.idea/artifacts/kotlinc.xml
+++ b/.idea/artifacts/kotlinc.xml
@@ -9,46 +9,46 @@
         <element id="file-copy" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
         <element id="file-copy" path="$PROJECT_DIR$/buildSrc/prepare-deps/intellij-sdk/build/repo/kotlin.build.custom.deps/183.5153.4/intellij/lib/trove4j.jar" />
         <element id="archive" name="allopen-compiler-plugin.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-allopen-compiler-plugin.main" />
+          <element id="module-output" name="kotlin.kotlin-allopen-compiler-plugin.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/allopen/allopen-cli/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="android-extensions-runtime.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-android-extensions-runtime.main" />
+          <element id="module-output" name="kotlin.kotlin-android-extensions-runtime.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/android-extensions/android-extensions-runtime/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-annotation-processing.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-annotation-processing.main" />
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-annotation-processing-runtime.main" />
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-annotation-processing-cli.main" />
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-annotation-processing-base.main" />
+          <element id="module-output" name="kotlin.kotlin-annotation-processing.main" />
+          <element id="module-output" name="kotlin.kotlin-annotation-processing-runtime.main" />
+          <element id="module-output" name="kotlin.kotlin-annotation-processing-cli.main" />
+          <element id="module-output" name="kotlin.kotlin-annotation-processing-base.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/kapt3/kapt3-compiler/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-annotation-processing-cli.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-annotation-processing-cli.main" />
+          <element id="module-output" name="kotlin.kotlin-annotation-processing-cli.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/kapt3/kapt3-cli/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-annotation-processing-runtime.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-annotation-processing-runtime.main" />
+          <element id="module-output" name="kotlin.kotlin-annotation-processing-runtime.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/kapt3/kapt3-runtime/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-annotations-android.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-annotations-android.main" />
+          <element id="module-output" name="kotlin.kotlin-annotations-android.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/tools/kotlin-annotations-android/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-annotations-jvm.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-annotations-jvm.main" />
+          <element id="module-output" name="kotlin.kotlin-annotations-jvm.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/tools/kotlin-annotations-jvm/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -68,19 +68,19 @@
           </element>
         </element>
         <element id="archive" name="kotlin-ant.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-ant.main" />
+          <element id="module-output" name="kotlin.kotlin-ant.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/ant/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="noarg-compiler-plugin.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-noarg-compiler-plugin.main" />
+          <element id="module-output" name="kotlin.kotlin-noarg-compiler-plugin.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/noarg/noarg-cli/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-preloader.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-preloader.main" />
+          <element id="module-output" name="kotlin.kotlin-preloader.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/compiler/preloader/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -97,19 +97,19 @@
           </element>
         </element>
         <element id="archive" name="kotlin-runner.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-runner.main" />
+          <element id="module-output" name="kotlin.kotlin-runner.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/compiler/cli/cli-runner/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="sam-with-receiver-compiler-plugin.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-sam-with-receiver-compiler-plugin.main" />
+          <element id="module-output" name="kotlin.kotlin-sam-with-receiver-compiler-plugin.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-script-runtime.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-script-runtime.main" />
+          <element id="module-output" name="kotlin.kotlin-script-runtime.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/tools/script-runtime/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -121,32 +121,31 @@
           </element>
         </element>
         <element id="archive" name="kotlin-scripting-common.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-common.main" />
+          <element id="module-output" name="kotlin.kotlin-scripting-common.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/scripting/common/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-scripting-compiler.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-compiler.main" />
+          <element id="module-output" name="kotlin.kotlin-scripting-compiler.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/scripting/scripting-cli/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-scripting-jvm.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-scripting-jvm.main" />
+          <element id="module-output" name="kotlin.kotlin-scripting-jvm.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/scripting/jvm/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-source-sections-compiler-plugin.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-source-sections-compiler-plugin.main" />
+          <element id="module-output" name="kotlin.kotlin-source-sections-compiler-plugin.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/source-sections/source-sections-compiler/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="kotlin-test-js.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-test-js.main" />
-          <element id="dir-copy" path="$PROJECT_DIR$/libraries/kotlin.test/js/build/classes/main" />
+          <element id="module-output" name="kotlin.kotlin-test.kotlin-test-js.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/js/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -158,7 +157,7 @@
           </element>
         </element>
         <element id="archive" name="kotlin-test-junit.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-test-junit.main" />
+          <element id="module-output" name="kotlin.kotlin-test.kotlin-test-junit.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/junit/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -170,7 +169,7 @@
           </element>
         </element>
         <element id="archive" name="kotlin-test-junit5.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-test-junit5.main" />
+          <element id="module-output" name="kotlin.kotlin-test.kotlin-test-junit5.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/junit5/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -182,7 +181,7 @@
           </element>
         </element>
         <element id="archive" name="kotlin-test.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-test-jvm.main" />
+          <element id="module-output" name="kotlin.kotlin-test.kotlin-test-jvm.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/jvm/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -194,7 +193,7 @@
           </element>
         </element>
         <element id="archive" name="kotlin-test-testng.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-test-testng.main" />
+          <element id="module-output" name="kotlin.kotlin-test.kotlin-test-testng.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/kotlin.test/testng/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -206,20 +205,20 @@
           </element>
         </element>
         <element id="archive" name="kotlinx-serialization-compiler-plugin.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.kotlinx-serialization-compiler-plugin.main" />
+          <element id="module-output" name="kotlin.kotlinx-serialization-compiler-plugin.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/kotlin-serialization/kotlin-serialization-compiler/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="mutability-annotations-compat.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.mutability-annotations-compat.main" />
+          <element id="module-output" name="kotlin.libraries.tools.mutability-annotations-compat.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/libraries/tools/mutability-annotations-compat/build/tmp/jar/MANIFEST.MF" />
           </element>
         </element>
         <element id="archive" name="android-extensions-compiler.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.android-extensions-compiler.main" />
-          <element id="module-output" name="org.jetbrains.kotlin.kotlin-android-extensions-runtime.main" />
+          <element id="module-output" name="kotlin.plugins.android-extensions-compiler.main" />
+          <element id="module-output" name="kotlin.kotlin-android-extensions-runtime.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/build/tmp/jar/MANIFEST.MF" />
           </element>
@@ -238,7 +237,7 @@
         <element id="artifact" artifact-name="kotlin-main-kts.jar" />
         <element id="artifact" artifact-name="kotlin-imports-dumper-compiler-plugin.jar" />
         <element id="archive" name="jvm-abi-gen.jar">
-          <element id="module-output" name="org.jetbrains.kotlin.jvm-abi-gen.main" />
+          <element id="module-output" name="kotlin.plugins.jvm-abi-gen.main" />
           <element id="directory" name="META-INF">
             <element id="file-copy" path="$PROJECT_DIR$/plugins/jvm-abi-gen/build/tmp/jar/MANIFEST.MF" />
           </element>
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index 4046bda502d..c7a4f5a8a6c 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -63,7 +63,7 @@ if (isJpsBuildEnabled && System.getProperty("idea.active") != null) {
 
                     runConfigurations {
                         application("[JPS] IDEA") {
-                            moduleName = "org.jetbrains.kotlin.idea-runner.main"
+                            moduleName = "kotlin.idea-runner.main"
                             workingDirectory = File(intellijRootDir(), "bin").toString()
                             mainClass = "com.intellij.idea.Main"
                             jvmArgs = listOf(
@@ -83,7 +83,7 @@ if (isJpsBuildEnabled && System.getProperty("idea.active") != null) {
                         }
 
                         application("[JPS] Generate All Tests") {
-                            moduleName = "org.jetbrains.kotlin.generate-all-tests.test"
+                            moduleName = "kotlin.pill.generate-all-tests.test"
                             workingDirectory = rootDir.toString()
                             mainClass = "org.jetbrains.kotlin.pill.generateAllTests.Main"
                         }
@@ -94,31 +94,31 @@ if (isJpsBuildEnabled && System.getProperty("idea.active") != null) {
 
                         // todo: replace `pattern` with `package`, when `com.intellij.execution.junit.JUnitRunConfigurationImporter#process` will be fixed
                         junit("[JPS] All IDEA Plugin Tests") {
-                            moduleName = "org.jetbrains.kotlin.idea.test"
+                            moduleName = "kotlin.idea.test"
                             pattern = "org.jetbrains.kotlin.*"
                             configureForKotlin()
                         }
 
                         junit("[JPS] Compiler Tests") {
-                            moduleName = "org.jetbrains.kotlin.compiler.test"
+                            moduleName = "kotlin.compiler.test"
                             pattern = "org.jetbrains.kotlin.*"
                             configureForKotlin()
                         }
 
                         junit("[JPS] JVM Backend Tests") {
-                            moduleName = "org.jetbrains.kotlin.idea.test"
+                            moduleName = "kotlin.idea.test"
                             pattern = "org.jetbrains.kotlin.codegen.*"
                             configureForKotlin()
                         }
 
                         junit("[JPS] JS Backend Tests") {
-                            moduleName = "org.jetbrains.kotlin.js.tests.test"
+                            moduleName = "kotlin.js.js.tests.test"
                             pattern = "org.jetbrains.kotlin.js.test.*"
                             configureForKotlin()
                         }
 
                         junit("[JPS] Java 8 Tests") {
-                            moduleName = "org.jetbrains.kotlin.tests-java8.test"
+                            moduleName = "kotlin.compiler.tests-java8.test"
                             pattern = "org.jetbrains.kotlin.*"
                             configureForKotlin()
                         }