diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 301708fd5d3..2b330cf6985 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -13,6 +13,7 @@
             <element id="module-output" name="jet.as.java.psi" />
             <element id="module-output" name="runtime" />
             <element id="module-output" name="util" />
+            <element id="module-output" name="util.runtime" />
             <element id="module-output" name="j2k" />
             <element id="module-output" name="js.translator" />
             <element id="module-output" name="cli-common" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fc4c4f5c123..ce8b01f9be2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -31,8 +31,9 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/runtime/runtime.iml" filepath="$PROJECT_DIR$/runtime/runtime.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/frontend/serialization/serialization.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/core/serialization.java/serialization.java.iml" filepath="$PROJECT_DIR$/core/serialization.java/serialization.java.iml" group="compiler/java" />
+      <module fileurl="file://$PROJECT_DIR$/core/serialization.java/serialization.java.iml" filepath="$PROJECT_DIR$/core/serialization.java/serialization.java.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
+      <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
     </modules>
   </component>
 </project>
diff --git a/build-tools/build-tools.iml b/build-tools/build-tools.iml
index 7e88bcace67..2225c89f93b 100644
--- a/build-tools/build-tools.iml
+++ b/build-tools/build-tools.iml
@@ -9,7 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="runtime" />
     <orderEntry type="module-library">
       <library>
@@ -23,6 +22,7 @@
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="backend" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/build.xml b/build.xml
index a9a08eb3f89..51f917275c9 100644
--- a/build.xml
+++ b/build.xml
@@ -32,6 +32,7 @@
         <include name="compiler/cli/src"/>
         <include name="compiler/cli/cli-common/src"/>
         <include name="compiler/util/src"/>
+        <include name="core/util.runtime/src"/>
         <!--<include name="j2k/src"/>-->
         <include name="compiler/jet.as.java.psi/src"/>
 
@@ -51,6 +52,7 @@
         <include name="cli/**"/>
         <include name="cli-common/**"/>
         <include name="util/**"/>
+        <include name="util.runtime/**"/>
         <include name="jet.as.java.psi/**"/>
 
         <include name="runtime/**"/>
@@ -136,6 +138,7 @@
             <fileset dir="compiler/cli/src"/>
             <fileset dir="j2k/src"/>
             <fileset dir="compiler/util/src"/>
+            <fileset dir="core/util.runtime/src"/>
             <fileset dir="compiler/jet.as.java.psi/src"/>
             <fileset dir="runtime/src"/>
             <fileset dir="js/js.translator/src"/>
diff --git a/compiler/android-tests/android-tests.iml b/compiler/android-tests/android-tests.iml
index 30dba87a875..823c446f70c 100644
--- a/compiler/android-tests/android-tests.iml
+++ b/compiler/android-tests/android-tests.iml
@@ -11,10 +11,10 @@
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="compiler-tests" />
-    <orderEntry type="module" module-name="frontend.java" />
     <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" />
   </component>
 </module>
 
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index d729c5ca03a..6760729a8e7 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -17,6 +17,7 @@
     <orderEntry type="library" name="jline" level="project" />
     <orderEntry type="module" module-name="cli-common" exported="" />
     <orderEntry type="module" module-name="descriptor.loader.java" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
index 275f6c2cfff..5cd8c2e9746 100644
--- a/compiler/frontend.java/frontend.java.iml
+++ b/compiler/frontend.java/frontend.java.iml
@@ -9,7 +9,6 @@
     <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" exported="" />
     <orderEntry type="module" module-name="runtime" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="serialization" />
diff --git a/compiler/frontend/serialization/serialization.iml b/compiler/frontend/serialization/serialization.iml
index c08191ba561..3a14cef9af4 100644
--- a/compiler/frontend/serialization/serialization.iml
+++ b/compiler/frontend/serialization/serialization.iml
@@ -13,7 +13,7 @@
     <orderEntry type="library" name="annotations" level="project" />
     <orderEntry type="library" name="trove4j" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="util.runtime" />
   </component>
 </module>
 
diff --git a/compiler/jet.as.java.psi/jet.as.java.psi.iml b/compiler/jet.as.java.psi/jet.as.java.psi.iml
index f4381227ffe..ed3221ac3ca 100644
--- a/compiler/jet.as.java.psi/jet.as.java.psi.iml
+++ b/compiler/jet.as.java.psi/jet.as.java.psi.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="descriptor.loader.java" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 3b17231d513..260be58cf28 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.java" />
     <orderEntry type="module" module-name="descriptor.loader.java" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/compiler/util/util.iml b/compiler/util/util.iml
index d0a04b011b4..dac3c15c169 100644
--- a/compiler/util/util.iml
+++ b/compiler/util/util.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="util.runtime" exported="" />
   </component>
 </module>
 
diff --git a/compiler/util/src/org/jetbrains/jet/utils/DFS.java b/core/util.runtime/src/org/jetbrains/jet/utils/DFS.java
similarity index 100%
rename from compiler/util/src/org/jetbrains/jet/utils/DFS.java
rename to core/util.runtime/src/org/jetbrains/jet/utils/DFS.java
diff --git a/compiler/util/src/org/jetbrains/jet/utils/ExceptionUtils.java b/core/util.runtime/src/org/jetbrains/jet/utils/ExceptionUtils.java
similarity index 100%
rename from compiler/util/src/org/jetbrains/jet/utils/ExceptionUtils.java
rename to core/util.runtime/src/org/jetbrains/jet/utils/ExceptionUtils.java
diff --git a/compiler/util/src/org/jetbrains/jet/utils/NotNullMemoizedFunction.java b/core/util.runtime/src/org/jetbrains/jet/utils/NotNullMemoizedFunction.java
similarity index 100%
rename from compiler/util/src/org/jetbrains/jet/utils/NotNullMemoizedFunction.java
rename to core/util.runtime/src/org/jetbrains/jet/utils/NotNullMemoizedFunction.java
diff --git a/compiler/util/src/org/jetbrains/jet/utils/NullableMemoizedFunction.java b/core/util.runtime/src/org/jetbrains/jet/utils/NullableMemoizedFunction.java
similarity index 100%
rename from compiler/util/src/org/jetbrains/jet/utils/NullableMemoizedFunction.java
rename to core/util.runtime/src/org/jetbrains/jet/utils/NullableMemoizedFunction.java
diff --git a/compiler/util/src/org/jetbrains/jet/utils/WrappedValues.java b/core/util.runtime/src/org/jetbrains/jet/utils/WrappedValues.java
similarity index 100%
rename from compiler/util/src/org/jetbrains/jet/utils/WrappedValues.java
rename to core/util.runtime/src/org/jetbrains/jet/utils/WrappedValues.java
diff --git a/core/util.runtime/util.runtime.iml b/core/util.runtime/util.runtime.iml
new file mode 100644
index 00000000000..d0a04b011b4
--- /dev/null
+++ b/core/util.runtime/util.runtime.iml
@@ -0,0 +1,13 @@
+<?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" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
+  </component>
+</module>
+
diff --git a/generators/generators.iml b/generators/generators.iml
index f4b45cef115..fa0ffa7a831 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="descriptor.loader.java" 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" />
   </component>
 </module>
 
diff --git a/idea/idea.iml b/idea/idea.iml
index 53fb442a634..446dce222a1 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -40,6 +40,7 @@
     <orderEntry type="module" module-name="serialization.java" />
     <orderEntry type="module" module-name="descriptor.loader.java" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/injector-generator/injector-generator.iml b/injector-generator/injector-generator.iml
index 81a535f8a98..03570e3cc59 100644
--- a/injector-generator/injector-generator.iml
+++ b/injector-generator/injector-generator.iml
@@ -8,10 +8,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="backend" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/js/js.tests/js.tests.iml b/js/js.tests/js.tests.iml
index 408bd4e304e..1e4130900f8 100644
--- a/js/js.tests/js.tests.iml
+++ b/js/js.tests/js.tests.iml
@@ -14,8 +14,8 @@
     <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="frontend.java" />
     <orderEntry type="library" name="js-libs" level="project" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>