diff --git a/compiler/android-tests/android-tests.iml b/compiler/android-tests/android-tests.iml
index d83693aca0a..fe0070a1f31 100644
--- a/compiler/android-tests/android-tests.iml
+++ b/compiler/android-tests/android-tests.iml
@@ -13,9 +13,8 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="library" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="generators" scope="TEST" />
     <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/compiler/backend-common/backend-common.iml b/compiler/backend-common/backend-common.iml
index f72898e3ec8..4390c92b7c5 100644
--- a/compiler/backend-common/backend-common.iml
+++ b/compiler/backend-common/backend-common.iml
@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend" />
     <orderEntry type="library" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index 5ebf18aedfa..0bc76f7bb22 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -12,9 +12,8 @@
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="library" name="protobuf-java" level="project" />
     <orderEntry type="module" module-name="serialization.jvm" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend-common" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/builtins-serializer/builtins-serializer.iml b/compiler/builtins-serializer/builtins-serializer.iml
index b52a03ab852..4e9b3e13495 100644
--- a/compiler/builtins-serializer/builtins-serializer.iml
+++ b/compiler/builtins-serializer/builtins-serializer.iml
@@ -8,11 +8,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="intellij-core" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 5da42806451..071bbf8f03a 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -15,9 +15,9 @@
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="library" name="jline" level="project" />
     <orderEntry type="module" module-name="cli-common" exported="" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend-common" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
index 3c7fdc31aa0..a93d520b9c6 100644
--- a/compiler/frontend.java/frontend.java.iml
+++ b/compiler/frontend.java/frontend.java.iml
@@ -13,7 +13,6 @@
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
-    <orderEntry type="module" module-name="util.runtime" />
     <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index f34930f7f6e..0feba84a696 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -10,9 +10,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 249cccb288b..c42bfcd7910 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="protobuf-java" level="project" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
@@ -17,9 +16,9 @@
     <orderEntry type="library" name="dx-android" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="builtins-serializer" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="module" module-name="js.tests" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/util/util.iml b/compiler/util/util.iml
index b50252e28ad..14ab235d6bd 100644
--- a/compiler/util/util.iml
+++ b/compiler/util/util.iml
@@ -10,8 +10,6 @@
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="util.runtime" exported="" />
     <orderEntry type="module" module-name="Kotlin" exported="" />
-    <orderEntry type="library" exported="" name="kotlin-runtime" level="project" />
     <orderEntry type="library" name="jps-model" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml
index 53da6311a8d..50865109b16 100644
--- a/core/descriptor.loader.java/descriptor.loader.java.iml
+++ b/core/descriptor.loader.java/descriptor.loader.java.iml
@@ -11,6 +11,5 @@
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="library" name="protobuf-java" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/serialization.jvm/serialization.jvm.iml b/core/serialization.jvm/serialization.jvm.iml
index 9338ee69201..1e5af8fbb69 100644
--- a/core/serialization.jvm/serialization.jvm.iml
+++ b/core/serialization.jvm/serialization.jvm.iml
@@ -7,8 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="protobuf-java" level="project" />
     <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="util.runtime" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/core/serialization/serialization.iml b/core/serialization/serialization.iml
index dbe8b500275..e3ad3ad8c79 100644
--- a/core/serialization/serialization.iml
+++ b/core/serialization/serialization.iml
@@ -9,8 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="protobuf-java" level="project" />
     <orderEntry type="library" name="trove4j" level="project" />
-    <orderEntry type="module" module-name="util.runtime" exported="" />
     <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="util.runtime" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/generators/generators.iml b/generators/generators.iml
index 9a600650886..1dc96699ec1 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -19,11 +19,10 @@
     <orderEntry type="module" module-name="serialization" scope="TEST" />
     <orderEntry type="module" module-name="js.tests" scope="TEST" />
     <orderEntry type="module" module-name="jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
     <orderEntry type="module" module-name="j2k" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="js.dart-ast" />
-    <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="module" module-name="js.dart-ast" scope="TEST" />
+    <orderEntry type="module" module-name="js.frontend" scope="TEST" />
+    <orderEntry type="module" module-name="util" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/ide-compiler-runner/ide-compiler-runner.iml b/ide-compiler-runner/ide-compiler-runner.iml
index 8fbeffb3f24..c5705a58d73 100644
--- a/ide-compiler-runner/ide-compiler-runner.iml
+++ b/ide-compiler-runner/ide-compiler-runner.iml
@@ -9,8 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="preloader" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/idea/ide-common/ide-common.iml b/idea/ide-common/ide-common.iml
index 616a31aae0a..0314d844bde 100644
--- a/idea/ide-common/ide-common.iml
+++ b/idea/ide-common/ide-common.iml
@@ -18,8 +18,8 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-analysis/idea-analysis.iml b/idea/idea-analysis/idea-analysis.iml
index 296c22d492f..b5cd8e6cffd 100644
--- a/idea/idea-analysis/idea-analysis.iml
+++ b/idea/idea-analysis/idea-analysis.iml
@@ -13,7 +13,6 @@
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
@@ -29,9 +28,9 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" name="trove4j" level="project" />
     <orderEntry type="module" module-name="ide-common" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea.iml b/idea/idea.iml
index 0ccf19fdafd..60c936000cf 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -34,16 +34,15 @@
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="module" module-name="idea-analysis" exported="" />
     <orderEntry type="module" module-name="kotlin-android-plugin" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/kotlin-android-plugin/kotlin-android-plugin.iml b/idea/kotlin-android-plugin/kotlin-android-plugin.iml
index 8f1c11eea81..00cb2b04cd1 100644
--- a/idea/kotlin-android-plugin/kotlin-android-plugin.iml
+++ b/idea/kotlin-android-plugin/kotlin-android-plugin.iml
@@ -8,9 +8,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="android-plugin" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/j2k/j2k.iml b/j2k/j2k.iml
index 1e19d9b038d..3f387a96335 100644
--- a/j2k/j2k.iml
+++ b/j2k/j2k.iml
@@ -8,12 +8,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="idea" scope="TEST" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps-plugin/bare-plugin/bare-plugin.iml b/jps-plugin/bare-plugin/bare-plugin.iml
index 80ba7107224..feff85211d8 100644
--- a/jps-plugin/bare-plugin/bare-plugin.iml
+++ b/jps-plugin/bare-plugin/bare-plugin.iml
@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="jps-plugin" />
     <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="jps-plugin" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index a4e8a5a1756..6878e4f6683 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -10,16 +10,16 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="ide-compiler-runner" />
     <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
     <orderEntry type="module" module-name="backend" scope="TEST" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/js/js.dart-ast/js.dart-ast.iml b/js/js.dart-ast/js.dart-ast.iml
index 5e7b8f6572b..f8f395284a6 100644
--- a/js/js.dart-ast/js.dart-ast.iml
+++ b/js/js.dart-ast/js.dart-ast.iml
@@ -8,8 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="descriptors" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/js/js.frontend/js.frontend.iml b/js/js.frontend/js.frontend.iml
index 1a044eec4b2..887bd1954ef 100644
--- a/js/js.frontend/js.frontend.iml
+++ b/js/js.frontend/js.frontend.iml
@@ -7,10 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="frontend" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="js.dart-ast" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/js/js.inliner/js.inliner.iml b/js/js.inliner/js.inliner.iml
index 95fb8a582de..76d6e58eb55 100644
--- a/js/js.inliner/js.inliner.iml
+++ b/js/js.inliner/js.inliner.iml
@@ -8,10 +8,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="js.dart-ast" />
     <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="descriptors" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/js/js.parser/js.parser.iml b/js/js.parser/js.parser.iml
index 2f76876c68f..bb4d75fe325 100644
--- a/js/js.parser/js.parser.iml
+++ b/js/js.parser/js.parser.iml
@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="js.dart-ast" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="js.dart-ast" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/js/js.tests/js.tests.iml b/js/js.tests/js.tests.iml
index 9106c5cf3c9..5c6fdb38ccd 100644
--- a/js/js.tests/js.tests.iml
+++ b/js/js.tests/js.tests.iml
@@ -14,8 +14,7 @@
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend-common" scope="TEST" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/js/js.translator/js.translator.iml b/js/js.translator/js.translator.iml
index 6969f8cd869..1bb3169fa32 100644
--- a/js/js.translator/js.translator.iml
+++ b/js/js.translator/js.translator.iml
@@ -9,11 +9,11 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend-common" />
     <orderEntry type="module" module-name="js.dart-ast" exported="" />
     <orderEntry type="module" module-name="js.frontend" exported="" />
     <orderEntry type="module" module-name="js.inliner" exported="" />
     <orderEntry type="module" module-name="js.parser" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file