diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1d2fb72df..ff7895344 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -11,6 +11,7 @@
       <module fileurl="file://$PROJECT_DIR$/extras-slf4j/teavm-extras-slf4j.iml" filepath="$PROJECT_DIR$/extras-slf4j/teavm-extras-slf4j.iml" />
       <module fileurl="file://$PROJECT_DIR$/html4j/teavm-html4j.iml" filepath="$PROJECT_DIR$/html4j/teavm-html4j.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/idea/teavm-idea-plugin.iml" filepath="$PROJECT_DIR$/tools/idea/teavm-idea-plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/tools/idea/jps-common/teavm-jps-common.iml" filepath="$PROJECT_DIR$/tools/idea/jps-common/teavm-jps-common.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/idea/jps-plugin/teavm-jps-plugin.iml" filepath="$PROJECT_DIR$/tools/idea/jps-plugin/teavm-jps-plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/jso/core/teavm-jso.iml" filepath="$PROJECT_DIR$/jso/core/teavm-jso.iml" />
       <module fileurl="file://$PROJECT_DIR$/jso/apis/teavm-jso-apis.iml" filepath="$PROJECT_DIR$/jso/apis/teavm-jso-apis.iml" />
diff --git a/samples/async/teavm-samples-async.iml b/samples/async/teavm-samples-async.iml
index 8f024ece9..9c083f42e 100644
--- a/samples/async/teavm-samples-async.iml
+++ b/samples/async/teavm-samples-async.iml
@@ -38,4 +38,9 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.jcraft:jzlib:1.1.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: joda-time:joda-time:2.7" level="project" />
   </component>
+  <component name="teavm">
+    <option name="enabled" value="true" />
+    <option name="mainClass" value="org.teavm.samples.async.AsyncProgram" />
+    <option name="targetDirectory" value="$MODULE_DIR$/target/generated/js/teavm" />
+  </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 a9218567c..a697a6b71 100644
--- a/samples/benchmark/teavm-samples-benchmark.iml
+++ b/samples/benchmark/teavm-samples-benchmark.iml
@@ -63,4 +63,9 @@
     <orderEntry type="library" name="Maven: org.netbeans.html:net.java.html.boot:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.netbeans.html:net.java.html:1.2.3" level="project" />
   </component>
+  <component name="teavm">
+    <option name="enabled" value="true" />
+    <option name="mainClass" value="org.teavm.samples.benchmark.teavm.BenchmarkStarter" />
+    <option name="targetDirectory" value="$MODULE_DIR$/target/generated/js/teavm" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/samples/hello/teavm-samples-hello.iml b/samples/hello/teavm-samples-hello.iml
index ae6580c94..00d9f2466 100644
--- a/samples/hello/teavm-samples-hello.iml
+++ b/samples/hello/teavm-samples-hello.iml
@@ -39,4 +39,9 @@
     <orderEntry type="module" module-name="teavm-jso" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
   </component>
+  <component name="teavm">
+    <option name="enabled" value="true" />
+    <option name="mainClass" value="org.teavm.samples.hello.Client" />
+    <option name="targetDirectory" value="$MODULE_DIR$/target/generated/js/teavm" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/samples/kotlin/teavm-samples-kotlin.iml b/samples/kotlin/teavm-samples-kotlin.iml
index d85add9ff..c5711bd66 100644
--- a/samples/kotlin/teavm-samples-kotlin.iml
+++ b/samples/kotlin/teavm-samples-kotlin.iml
@@ -42,4 +42,9 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: joda-time:joda-time:2.7" level="project" />
     <orderEntry type="module" module-name="teavm-jso-apis" scope="PROVIDED" />
   </component>
+  <component name="teavm">
+    <option name="enabled" value="true" />
+    <option name="mainClass" value="org.teavm.samples.kotlin.HelloKt" />
+    <option name="targetDirectory" value="$MODULE_DIR$/target/generated/js/teavm" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/samples/scala/teavm-samples-scala.iml b/samples/scala/teavm-samples-scala.iml
index ee90882ee..699569234 100644
--- a/samples/scala/teavm-samples-scala.iml
+++ b/samples/scala/teavm-samples-scala.iml
@@ -39,4 +39,9 @@
     <orderEntry type="module" module-name="teavm-jso" />
     <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.11.7" level="project" />
   </component>
+  <component name="teavm">
+    <option name="enabled" value="true" />
+    <option name="mainClass" value="org.teavm.samples.scala.Client" />
+    <option name="targetDirectory" value="$MODULE_DIR$/target/generated/js/teavm" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/samples/storage/teavm-samples-storage.iml b/samples/storage/teavm-samples-storage.iml
index a14ad037d..17dde64b4 100644
--- a/samples/storage/teavm-samples-storage.iml
+++ b/samples/storage/teavm-samples-storage.iml
@@ -39,4 +39,9 @@
     <orderEntry type="module" module-name="teavm-jso-apis" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
   </component>
+  <component name="teavm">
+    <option name="enabled" value="true" />
+    <option name="mainClass" value="org.teavm.samples.storage.Application" />
+    <option name="targetDirectory" value="$MODULE_DIR$/target/generated/js/teavm" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/samples/video/teavm-samples-video.iml b/samples/video/teavm-samples-video.iml
index a14ad037d..5bf84503f 100644
--- a/samples/video/teavm-samples-video.iml
+++ b/samples/video/teavm-samples-video.iml
@@ -39,4 +39,9 @@
     <orderEntry type="module" module-name="teavm-jso-apis" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
   </component>
+  <component name="teavm">
+    <option name="enabled" value="true" />
+    <option name="mainClass" value="org.teavm.samples.video.Player" />
+    <option name="targetDirectory" value="$MODULE_DIR$/target/generated/js/teavm" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/teavm.iml b/teavm.iml
index 0b8e2b00b..3c52d870a 100644
--- a/teavm.iml
+++ b/teavm.iml
@@ -14,7 +14,7 @@
       <excludeFolder url="file://$MODULE_DIR$/classlib" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java
similarity index 100%
rename from tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java
rename to tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java
similarity index 100%
rename from tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java
rename to tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java
similarity index 94%
rename from tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java
rename to tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java
index 0a9741b8a..ceff8f2da 100644
--- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java
+++ b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java
@@ -19,6 +19,7 @@ import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 public interface TeaVMBuilderAssistant extends Remote {
+    String REMOTE_PORT = "teavm.jps.remote-port";
     String ID = "TeaVM-JPS-Assistant";
 
     TeaVMElementLocation getMethodLocation(String className, String methodName, String methodDesc)
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/remote/TeaVMElementLocation.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMElementLocation.java
similarity index 100%
rename from tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/remote/TeaVMElementLocation.java
rename to tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMElementLocation.java
diff --git a/tools/idea/jps-common/teavm-jps-common.iml b/tools/idea/jps-common/teavm-jps-common.iml
new file mode 100644
index 000000000..7bf93ed0e
--- /dev/null
+++ b/tools/idea/jps-common/teavm-jps-common.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="IntelliJ IDEA" jdkType="IDEA JDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../jps-plugin/lib/teavm-all.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
index ac9bedc3d..ed68d5cf4 100644
--- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
@@ -15,6 +15,7 @@
  */
 package org.teavm.idea.jps;
 
+import static org.teavm.idea.jps.remote.TeaVMBuilderAssistant.REMOTE_PORT;
 import java.io.IOException;
 import java.rmi.NotBoundException;
 import java.rmi.RemoteException;
@@ -35,7 +36,6 @@ import org.jetbrains.jps.model.module.JpsModule;
 import org.teavm.idea.jps.remote.TeaVMBuilderAssistant;
 
 public class TeaVMBuilder extends ModuleLevelBuilder {
-    public static final String REMOTE_PORT = "teavm.jps.remote-port";
     private static TeaVMBuilderAssistant assistant;
 
     public TeaVMBuilder() {
diff --git a/tools/idea/jps-plugin/teavm-jps-plugin.iml b/tools/idea/jps-plugin/teavm-jps-plugin.iml
index 8a7611ab7..329ce4b11 100644
--- a/tools/idea/jps-plugin/teavm-jps-plugin.iml
+++ b/tools/idea/jps-plugin/teavm-jps-plugin.iml
@@ -11,8 +11,6 @@
     </content>
     <orderEntry type="jdk" jdkName="IntelliJ IDEA" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm-debug-all:5.0.4" level="project" />
-    <orderEntry type="library" name="teavm-all" level="project" />
-    <orderEntry type="library" name="teavm-all" level="project" />
+    <orderEntry type="module" module-name="teavm-jps-common" />
   </component>
 </module>
\ No newline at end of file
diff --git a/tools/idea/src/main/java/org/teavm/idea/TeaVMJPSConfigurator.java b/tools/idea/src/main/java/org/teavm/idea/TeaVMJPSConfigurator.java
index a03f8ed06..9c67deffd 100644
--- a/tools/idea/src/main/java/org/teavm/idea/TeaVMJPSConfigurator.java
+++ b/tools/idea/src/main/java/org/teavm/idea/TeaVMJPSConfigurator.java
@@ -15,11 +15,11 @@
  */
 package org.teavm.idea;
 
+import static org.teavm.idea.jps.remote.TeaVMBuilderAssistant.REMOTE_PORT;
 import com.intellij.compiler.server.BuildProcessParametersProvider;
 import java.util.Collections;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
-import org.teavm.idea.jps.TeaVMBuilder;
 
 public class TeaVMJPSConfigurator extends BuildProcessParametersProvider {
     private TeaVMJPSRemoteService remoteService;
@@ -31,6 +31,6 @@ public class TeaVMJPSConfigurator extends BuildProcessParametersProvider {
     @NotNull
     @Override
     public List<String> getVMArguments() {
-        return Collections.singletonList("-D" + TeaVMBuilder.REMOTE_PORT + "=" + remoteService.getPort());
+        return Collections.singletonList("-D" + REMOTE_PORT + "=" + remoteService.getPort());
     }
 }
diff --git a/tools/idea/src/main/resources/META-INF/plugin.xml b/tools/idea/src/main/resources/META-INF/plugin.xml
index 7cea7813b..81579c5a2 100644
--- a/tools/idea/src/main/resources/META-INF/plugin.xml
+++ b/tools/idea/src/main/resources/META-INF/plugin.xml
@@ -29,7 +29,7 @@
     <moduleConfigurable instance="org.teavm.idea.ui.TeaVMConfigurable"/>
     <moduleService serviceInterface="org.teavm.idea.TeaVMConfigurationStorage"
                    serviceImplementation="org.teavm.idea.TeaVMConfigurationStorage"/>
-    <compileServer.plugin classpath="jps/teavm-jps-plugin.jar;teavm-all.jar"/>
+    <compileServer.plugin classpath="jps/teavm-jps-plugin.jar;teavm-all.jar;teavm-jps-common.jar"/>
     <buildProcess.parametersProvider implementation="org.teavm.idea.TeaVMJPSConfigurator"/>
     <configurationType implementation="org.teavm.idea.debug.TeaVMDebugConfigurationType"/>
     <programRunner implementation="org.teavm.idea.debug.TeaVMDebugRunner"/>
diff --git a/tools/idea/teavm-idea-plugin.iml b/tools/idea/teavm-idea-plugin.iml
index 8ec274334..e536d5514 100644
--- a/tools/idea/teavm-idea-plugin.iml
+++ b/tools/idea/teavm-idea-plugin.iml
@@ -12,7 +12,7 @@
     </content>
     <orderEntry type="jdk" jdkName="IntelliJ IDEA" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="teavm-jps-plugin" />
-    <orderEntry type="library" name="teavm-all" level="project" />
+    <orderEntry type="module" module-name="teavm-jps-common" exported="" />
+    <orderEntry type="module" module-name="teavm-jps-plugin" exported="" />
   </component>
 </module>
\ No newline at end of file