diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 82b3bc3c12f..aa24f3b9c06 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -1,19 +1,19 @@
 <component name="ArtifactManager">
-  <artifact type="jar" name="KotlinPlugin">
-    <output-path>$PROJECT_DIR$/out/artifacts/KotlinPlugin</output-path>
+  <artifact name="KotlinPlugin">
+    <output-path>$PROJECT_DIR$/out/artifacts</output-path>
     <properties id="ant-postprocessing">
-      <options enabled="true">
+      <options>
         <file>file://$PROJECT_DIR$/plugin_post_build.xml</file>
         <target>renamePluginZip</target>
       </options>
     </properties>
     <properties id="ant-preprocessing">
-      <options enabled="true">
+      <options>
         <file>file://$PROJECT_DIR$/plugin_pre_build.xml</file>
         <target>cleanup</target>
       </options>
     </properties>
-    <root id="archive" name="KotlinPlugin.zip">
+    <root id="root">
       <element id="directory" name="Kotlin">
         <element id="directory" name="lib">
           <element id="library" level="project" name="asm" />
diff --git a/.idea/artifacts/PluginZip.xml b/.idea/artifacts/PluginZip.xml
new file mode 100644
index 00000000000..74860dfe421
--- /dev/null
+++ b/.idea/artifacts/PluginZip.xml
@@ -0,0 +1,22 @@
+<component name="ArtifactManager">
+  <artifact name="PluginZip">
+    <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
+    <properties id="ant-postprocessing">
+      <options enabled="true">
+        <file>file://$PROJECT_DIR$/plugin_post_build.xml</file>
+        <target>renamePluginZip</target>
+      </options>
+    </properties>
+    <properties id="ant-preprocessing">
+      <options enabled="true">
+        <file>file://$PROJECT_DIR$/plugin_pre_build.xml</file>
+        <target>cleanup</target>
+      </options>
+    </properties>
+    <root id="root">
+      <element id="archive" name="KotlinPlugin.zip">
+        <element id="artifact" artifact-name="KotlinPlugin" />
+      </element>
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/artifacts/localplugin.xml b/.idea/artifacts/localplugin.xml
deleted file mode 100644
index 732d0993edb..00000000000
--- a/.idea/artifacts/localplugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="LocalPlugin">
-    <output-path>$PROJECT_DIR$/out/LocalPlugin</output-path>
-    <root id="root">
-      <element id="directory" name="lib">
-        <element id="archive" name="KotlinPlugin.jar">
-          <element id="module-output" name="backend" />
-          <element id="module-output" name="frontend" />
-          <element id="module-output" name="frontend.java" />
-          <element id="module-output" name="stdlib" />
-          <element id="module-output" name="util" />
-          <element id="module-output" name="idea" />
-          <element id="module-output" name="jet.as.java.psi" />
-          <element id="module-output" name="j2k" />
-        </element>
-        <element id="library" level="project" name="asm" />
-      </element>
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml
index 2c3868f8bd4..2cef2c4af8c 100644
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="IDEA" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx500m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dplugin.path=$PROJECT_DIR$/out/LocalPlugin" />
+    <option name="VM_PARAMETERS" value="-Xmx500m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -21,7 +21,7 @@
     <ConfigurationWrapper RunnerId="Run" />
     <method>
       <option name="BuildArtifacts" enabled="true">
-        <artifact name="LocalPlugin" />
+        <artifact name="KotlinPlugin" />
       </option>
     </method>
   </configuration>
diff --git a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
index c96e7e56716..70068d677c5 100644
--- a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
+++ b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx500m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dplugin.path=$PROJECT_DIR$/out/LocalPlugin -Didea.ProcessCanceledException=disabled" />
+    <option name="VM_PARAMETERS" value="-Xmx500m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -22,7 +22,7 @@
     <ConfigurationWrapper RunnerId="Run" />
     <method>
       <option name="BuildArtifacts" enabled="true">
-        <artifact name="LocalPlugin" />
+        <artifact name="KotlinPlugin" />
       </option>
     </method>
   </configuration>