diff --git a/.idea/artifacts/KotlinAndroidExtensions.xml b/.idea/artifacts/KotlinAndroidExtensions.xml
deleted file mode 100644
index 5d5242b5c18..00000000000
--- a/.idea/artifacts/KotlinAndroidExtensions.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="KotlinAndroidExtensions">
-    <output-path>$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions</output-path>
-    <properties id="ant-postprocessing">
-      <options enabled="true">
-        <file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
-        <target>copy-runtime-for-idea-plugin</target>
-      </options>
-    </properties>
-    <root id="root">
-      <element id="directory" name="lib">
-        <element id="archive" name="kotlin-android-extensions.jar">
-          <element id="module-output" name="android-idea-plugin" />
-        </element>
-        <element id="directory" name="jps">
-          <element id="archive" name="kotlin-android-extensions-jps.jar">
-            <element id="module-output" name="android-jps-plugin" />
-          </element>
-        </element>
-        <element id="archive" name="android-compiler-plugin.jar">
-          <element id="module-output" name="android-compiler-plugin" />
-        </element>
-      </element>
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/artifacts/KotlinJpsPlugin.xml b/.idea/artifacts/KotlinJpsPlugin.xml
index 92d7cf797b0..58abf6b8d87 100644
--- a/.idea/artifacts/KotlinJpsPlugin.xml
+++ b/.idea/artifacts/KotlinJpsPlugin.xml
@@ -23,6 +23,7 @@
       <element id="module-output" name="rmi-interface" />
       <element id="module-output" name="deserialization" />
       <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/native-platform-uberjar.jar" path-in-jar="/" />
+      <element id="module-output" name="android-jps-plugin" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 3a08a4c043c..b992edf832f 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -52,6 +52,12 @@
           <element id="artifact" artifact-name="KotlinJpsPlugin" />
         </element>
         <element id="library" level="project" name="markdown" />
+        <element id="archive" name="kotlin-android-extensions-plugin.jar">
+          <element id="module-output" name="android-idea-plugin" />
+        </element>
+        <element id="archive" name="kotlin-android-extensions-compiler-plugin.jar">
+          <element id="module-output" name="android-compiler-plugin" />
+        </element>
       </element>
       <element id="directory" name="kotlinc">
         <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />
diff --git a/.idea/runConfigurations/Android_Studio.xml b/.idea/runConfigurations/Android_Studio.xml
index d01ff43602c..f52c5a19ef7 100644
--- a/.idea/runConfigurations/Android_Studio.xml
+++ b/.idea/runConfigurations/Android_Studio.xml
@@ -24,9 +24,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml
index 16f5fcdef1e..f27978a5411 100644
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -43,9 +43,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
       <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
     </method>
   </configuration>
diff --git a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
index 8559cb4d530..40e1105bdf8 100644
--- a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
+++ b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
@@ -24,9 +24,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
       <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
     </method>
   </configuration>
diff --git a/.idea/runConfigurations/IDEA__win_.xml b/.idea/runConfigurations/IDEA__win_.xml
index 6d3c0f7176f..1ba9a915d1c 100644
--- a/.idea/runConfigurations/IDEA__win_.xml
+++ b/.idea/runConfigurations/IDEA__win_.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="IDEA (win)" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@@ -17,9 +16,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
       <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea-runner/runner.xml" target="force-enable-kotlin-plugin" />
     </method>
   </configuration>
diff --git a/.idea/runConfigurations/Update_Dist_Run.xml b/.idea/runConfigurations/Update_Dist_Run.xml
index 2348ba0d501..2730d562708 100644
--- a/.idea/runConfigurations/Update_Dist_Run.xml
+++ b/.idea/runConfigurations/Update_Dist_Run.xml
@@ -22,9 +22,7 @@
       <option name="BuildArtifacts" enabled="true">
         <artifact name="KotlinPlugin" />
       </option>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="KotlinAndroidExtensions" />
-      </option>
+      <option name="BuildArtifacts" enabled="true" />
       <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/idea_runner/runner.xml" target="force_enable_kotlin_plugin" />
     </method>
   </configuration>