diff --git a/classlib/teavm-classlib.iml b/classlib/teavm-classlib.iml
index 4cbb552a6..35767f8a2 100644
--- a/classlib/teavm-classlib.iml
+++ b/classlib/teavm-classlib.iml
@@ -31,19 +31,19 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="module" module-name="teavm-platform" />
-    <orderEntry type="module" module-name="teavm-core" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm-debug-all:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
-    <orderEntry type="module" module-name="teavm-jso" />
-    <orderEntry type="module" module-name="teavm-jso-apis" />
-    <orderEntry type="module" module-name="teavm-jso-impl" />
-    <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jzlib:1.1.3" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.7" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="module" module-name="teavm-platform" exported="" />
+    <orderEntry type="module" module-name="teavm-core" exported="" />
+    <orderEntry type="library" exported="" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.ow2.asm:asm-debug-all:5.0.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
+    <orderEntry type="module" module-name="teavm-jso" exported="" />
+    <orderEntry type="module" module-name="teavm-jso-apis" exported="" />
+    <orderEntry type="module" module-name="teavm-jso-impl" exported="" />
+    <orderEntry type="library" exported="" name="Maven: org.mozilla:rhino:1.7.7" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.jcraft:jzlib:1.1.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: joda-time:joda-time:2.7" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jso/impl/teavm-jso-impl.iml b/jso/impl/teavm-jso-impl.iml
index a448936fb..2f7ffc268 100644
--- a/jso/impl/teavm-jso-impl.iml
+++ b/jso/impl/teavm-jso-impl.iml
@@ -12,12 +12,12 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="teavm-core" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm-debug-all:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.ow2.asm:asm-debug-all:5.0.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
     <orderEntry type="module" module-name="teavm-jso-apis" />
     <orderEntry type="module" module-name="teavm-jso" />
-    <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7.7" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.mozilla:rhino:1.7.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
diff --git a/samples/async/teavm-samples-async.iml b/samples/async/teavm-samples-async.iml
index c2b1426b5..7844dfe1a 100644
--- a/samples/async/teavm-samples-async.iml
+++ b/samples/async/teavm-samples-async.iml
@@ -24,7 +24,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="teavm-classlib" scope="PROVIDED" />
     <orderEntry type="module" module-name="teavm-platform" scope="PROVIDED" />
-    <orderEntry type="module" module-name="teavm-core" scope="PROVIDED" />
+    <orderEntry type="module" module-name="teavm-core" exported="" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.4" level="project" />
     <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" />
@@ -35,6 +35,5 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
     <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" />
-    <orderEntry type="module" module-name="teavm-cli" />
   </component>
 </module>
\ No newline at end of file
diff --git a/tools/cli/teavm-cli.iml b/tools/cli/teavm-cli.iml
index a90d1720a..a3f76502e 100644
--- a/tools/cli/teavm-cli.iml
+++ b/tools/cli/teavm-cli.iml
@@ -15,5 +15,13 @@
     <orderEntry type="library" exported="" name="Maven: org.ow2.asm:asm-debug-all:5.0.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+    <orderEntry type="module" module-name="teavm-classlib" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="teavm-platform" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="teavm-jso" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="teavm-jso-apis" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="teavm-jso-impl" exported="" scope="RUNTIME" />
+    <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7.7" level="project" />
+    <orderEntry type="module" module-name="teavm-samples-benchmark" />
+    <orderEntry type="module" module-name="teavm-samples-async" />
   </component>
 </module>
\ No newline at end of file