diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
index db9d7a83b64..9a364ad23fd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
@@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.util.Box;
 import org.jetbrains.jet.util.slicedmap.WritableSlice;
-import org.jetbrains.jet.storage.ReenteringLazyValueComputationException;
+import org.jetbrains.jet.util.ReenteringLazyValueComputationException;
 
 import javax.inject.Inject;
 import java.util.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
index 22dc0745c46..0f56d6cf8e8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.intellij.lang.ASTNode;
-import com.intellij.openapi.util.Computable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -54,7 +53,7 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.CONSTRUCTOR;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;
 import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*;
 import static org.jetbrains.jet.lexer.JetTokens.OVERRIDE_KEYWORD;
-import static org.jetbrains.jet.storage.StorageUtil.createRecursionIntolerantLazyValueWithDefault;
+import static org.jetbrains.jet.util.StorageUtil.createRecursionIntolerantLazyValueWithDefault;
 
 public class DescriptorResolver {
     public static final Name COPY_METHOD_NAME = Name.identifier("copy");
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java
index a77d19697bf..e74b862af57 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.storage.LockBasedStorageManager;
 import org.jetbrains.jet.storage.NotNullLazyValue;
-import org.jetbrains.jet.storage.ReenteringLazyValueComputationException;
+import org.jetbrains.jet.util.ReenteringLazyValueComputationException;
 import org.jetbrains.jet.util.Box;
 
 import java.util.List;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java
index 8e701d45dec..a32b60a38b6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java
@@ -45,7 +45,7 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT;
 import static org.jetbrains.jet.lang.types.TypeUtils.*;
 import static org.jetbrains.jet.lang.types.expressions.CoercionStrategy.COERCION_TO_UNIT;
-import static org.jetbrains.jet.storage.StorageUtil.createRecursionIntolerantLazyValueWithDefault;
+import static org.jetbrains.jet.util.StorageUtil.createRecursionIntolerantLazyValueWithDefault;
 
 public class ClosureExpressionsTypingVisitor extends ExpressionTypingVisitor {
     protected ClosureExpressionsTypingVisitor(@NotNull ExpressionTypingInternals facade) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java
index 0fa943f0215..00a10f09d8e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 import org.jetbrains.jet.lang.types.DeferredType;
 import org.jetbrains.jet.lang.types.ErrorUtils;
 import org.jetbrains.jet.lang.types.JetTypeInfo;
-import org.jetbrains.jet.storage.ReenteringLazyValueComputationException;
+import org.jetbrains.jet.util.ReenteringLazyValueComputationException;
 
 import static org.jetbrains.jet.lang.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM;
 
diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/ReenteringLazyValueComputationException.java b/compiler/frontend/src/org/jetbrains/jet/util/ReenteringLazyValueComputationException.java
similarity index 97%
rename from core/util.runtime/src/org/jetbrains/jet/storage/ReenteringLazyValueComputationException.java
rename to compiler/frontend/src/org/jetbrains/jet/util/ReenteringLazyValueComputationException.java
index 141d972ef03..fbb29e23298 100644
--- a/core/util.runtime/src/org/jetbrains/jet/storage/ReenteringLazyValueComputationException.java
+++ b/compiler/frontend/src/org/jetbrains/jet/util/ReenteringLazyValueComputationException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.storage;
+package org.jetbrains.jet.util;
 
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/StorageUtil.java b/compiler/frontend/src/org/jetbrains/jet/util/StorageUtil.java
similarity index 95%
rename from core/util.runtime/src/org/jetbrains/jet/storage/StorageUtil.java
rename to compiler/frontend/src/org/jetbrains/jet/util/StorageUtil.java
index 9d002302488..f0e5ae7ac21 100644
--- a/core/util.runtime/src/org/jetbrains/jet/storage/StorageUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/util/StorageUtil.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.storage;
+package org.jetbrains.jet.util;
 
 import jet.Function0;
 import jet.Function1;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.storage.NotNullLazyValue;
 
 import static org.jetbrains.jet.storage.LockBasedStorageManager.NO_LOCKS;
 
diff --git a/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java b/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java
index 5c6d3e5aac4..ad06f4be272 100644
--- a/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java
+++ b/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java
@@ -3,6 +3,7 @@ package org.jetbrains.jet.storage;
 import jet.Function0;
 import jet.Function1;
 import junit.framework.TestCase;
+import org.jetbrains.jet.util.ReenteringLazyValueComputationException;
 
 import java.util.ArrayList;
 import java.util.Arrays;