diff --git a/.idea/libraries/teavm_all.xml b/.idea/libraries/teavm_all.xml
deleted file mode 100644
index 55f1409ea..000000000
--- a/.idea/libraries/teavm_all.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="teavm-all">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/tools/idea/jps-plugin/lib/teavm-all.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="file://$PROJECT_DIR$/core/src/main/java" />
-      <root url="file://$PROJECT_DIR$/tools/core/src/main/java" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/all-deps/all-deps.iml b/all-deps/all-deps.iml
index d673fc169..559978a27 100644
--- a/all-deps/all-deps.iml
+++ b/all-deps/all-deps.iml
@@ -24,4 +24,8 @@
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.3" level="project" />
   </component>
+  <component name="teavm">
+    <option name="mainClass" value="" />
+    <option name="targetDirectory" value="" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/samples/benchmark/teavm-samples-benchmark.iml b/samples/benchmark/teavm-samples-benchmark.iml
index 4931cd5de..d347eb8c6 100644
--- a/samples/benchmark/teavm-samples-benchmark.iml
+++ b/samples/benchmark/teavm-samples-benchmark.iml
@@ -41,6 +41,8 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-debug-all:5.0.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.objenesis:objenesis:2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.3" level="project" />
     <orderEntry type="module" module-name="teavm-jso" scope="PROVIDED" />
     <orderEntry type="module" module-name="teavm-jso-impl" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.mozilla:rhino:1.7.7" level="project" />
diff --git a/tools/idea/jps-plugin/.gitignore b/tools/idea/jps-common/.gitignore
similarity index 100%
rename from tools/idea/jps-plugin/.gitignore
rename to tools/idea/jps-common/.gitignore
diff --git a/tools/idea/jps-plugin/pom.xml b/tools/idea/jps-common/pom.xml
similarity index 100%
rename from tools/idea/jps-plugin/pom.xml
rename to tools/idea/jps-common/pom.xml
diff --git a/tools/idea/jps-common/teavm-jps-common.iml b/tools/idea/jps-common/teavm-jps-common.iml
index 7bf93ed0e..777635ac4 100644
--- a/tools/idea/jps-common/teavm-jps-common.iml
+++ b/tools/idea/jps-common/teavm-jps-common.iml
@@ -10,11 +10,15 @@
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../jps-plugin/lib/teavm-all.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/teavm-all.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
   </component>
+  <component name="teavm">
+    <option name="mainClass" value="" />
+    <option name="targetDirectory" value="" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java
index 8b1f91175..a702a0f9e 100644
--- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java
@@ -451,6 +451,8 @@ class TeaVMBuild {
                 return "Resolving method invocations";
             case DECOMPILATION:
                 return "Compiling classes";
+            case OPTIMIZATION:
+                return "Optimizing code";
             case RENDERING:
                 return "Building JS file";
             default:
diff --git a/tools/idea/jps-plugin/teavm-jps-plugin.iml b/tools/idea/jps-plugin/teavm-jps-plugin.iml
index 329ce4b11..687376480 100644
--- a/tools/idea/jps-plugin/teavm-jps-plugin.iml
+++ b/tools/idea/jps-plugin/teavm-jps-plugin.iml
@@ -11,6 +11,6 @@
     </content>
     <orderEntry type="jdk" jdkName="IntelliJ IDEA" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="teavm-jps-common" />
+    <orderEntry type="module" module-name="teavm-jps-common" exported="" />
   </component>
 </module>
\ No newline at end of file