diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java
index e653551f8af..0d4260edcf8 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java
@@ -31,7 +31,11 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.diagnostics.*;
 import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.resolve.*;
+import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
+import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.lang.resolve.java.JavaBindingContext;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
index 7d0eab8fcaf..09e364f15c8 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
@@ -50,7 +50,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.config.Services;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.resolve.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.utils.PathUtil;
 import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
 import org.jetbrains.k2js.config.*;
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt
index 0c6c37dbf22..a1195d3fe32 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations
 
-import org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression
+import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import org.jetbrains.jet.lang.diagnostics.Errors
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java
index 382cab80f58..eacf832065a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
-import org.jetbrains.jet.lang.resolve.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -40,7 +40,7 @@ public class DiagnosticUtils {
     @NotNull
     private static final Comparator<TextRange> TEXT_RANGE_COMPARATOR = new Comparator<TextRange>() {
         @Override
-        public int compare(TextRange o1, TextRange o2) {
+        public int compare(@NotNull TextRange o1, @NotNull TextRange o2) {
             if (o1.getStartOffset() != o2.getStartOffset()) {
                 return o1.getStartOffset() - o2.getStartOffset();
             }
@@ -57,10 +57,10 @@ public class DiagnosticUtils {
             element = DescriptorToSourceUtils.descriptorToDeclaration(descriptor.getOriginal());
         }
         if (element == null && descriptor instanceof ASTNode) {
-            element = DiagnosticUtils.getClosestPsiElement((ASTNode) descriptor);
+            element = getClosestPsiElement((ASTNode) descriptor);
         }
         if (element != null) {
-            return DiagnosticUtils.atLocation(element);
+            return atLocation(element);
         } else {
             return "unknown location";
         }
@@ -162,7 +162,7 @@ public class DiagnosticUtils {
     public static List<Diagnostic> sortedDiagnostics(@NotNull Collection<Diagnostic> diagnostics) {
         Comparator<Diagnostic> diagnosticComparator = new Comparator<Diagnostic>() {
             @Override
-            public int compare(Diagnostic d1, Diagnostic d2) {
+            public int compare(@NotNull Diagnostic d1, @NotNull Diagnostic d2) {
                 String path1 = d1.getPsiFile().getViewProvider().getVirtualFile().getPath();
                 String path2 = d2.getPsiFile().getViewProvider().getVirtualFile().getPath();
                 if (!path1.equals(path2)) return path1.compareTo(path2);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
index 3d60198ef35..617562d3744 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
@@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemCompleter;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
index 1059b109f43..aa48dd3b3f4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
@@ -20,6 +20,8 @@ import com.google.common.collect.ImmutableMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression;
 import org.jetbrains.jet.util.slicedmap.*;
 
 import java.util.Collection;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt
index 23fc600f7fb..0c9a330b12f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt
@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableMap
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
 import com.intellij.psi.PsiElement
 import com.intellij.openapi.util.ModificationTracker
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
 
 public class CompositeBindingContext private (
         private val delegates: List<BindingContext>
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java
index 1cce0933ced..aa5b7197be6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java
@@ -23,6 +23,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression;
 import org.jetbrains.jet.util.slicedmap.*;
 
 import java.util.Collection;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java
deleted file mode 100644
index 32c9eef786d..00000000000
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.resolve;
-
-import com.google.common.collect.ImmutableMap;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.diagnostics.Diagnostic;
-import org.jetbrains.jet.util.slicedmap.ReadOnlySlice;
-import org.jetbrains.jet.util.slicedmap.WritableSlice;
-
-import java.util.Collection;
-
-public class TraceUtil {
-    public final static BindingTrace TRACE_STUB = new BindingTrace() {
-
-        @NotNull
-        @Override
-        public BindingContext getBindingContext() {
-            return BINDING_CONTEXT_STUB;
-        }
-
-        @Override
-        public <K, V> void record(WritableSlice<K, V> slice, K key, V value) {
-            throw new IllegalStateException();
-        }
-
-        @Override
-        public <K> void record(WritableSlice<K, Boolean> slice, K key) {
-            throw new IllegalStateException();
-        }
-
-        @Nullable
-        @Override
-        public <K, V> V get(ReadOnlySlice<K, V> slice, K key) {
-            throw new IllegalStateException();
-        }
-
-        @NotNull
-        @Override
-        public <K, V> Collection<K> getKeys(WritableSlice<K, V> slice) {
-            throw new IllegalStateException();
-        }
-
-        @Override
-        public void report(@NotNull Diagnostic diagnostic) {
-            throw new IllegalStateException();
-        }
-    };
-
-    public final static BindingContext BINDING_CONTEXT_STUB = new BindingContext() {
-        @NotNull
-        @Override
-        public Diagnostics getDiagnostics() {
-            throw new IllegalStateException();
-        }
-
-        @Nullable
-        @Override
-        public <K, V> V get(ReadOnlySlice<K, V> slice, K key) {
-            throw new IllegalStateException();
-        }
-
-        @NotNull
-        @Override
-        public <K, V> Collection<K> getKeys(WritableSlice<K, V> slice) {
-            throw new IllegalStateException();
-        }
-
-        @NotNull
-        @Override
-        public <K, V> ImmutableMap<K, V> getSliceContents(@NotNull ReadOnlySlice<K, V> slice) {
-            throw new IllegalStateException();
-        }
-    };
-
-    public final static DelegatingBindingTrace DELEGATING_TRACE_STUB = new DelegatingBindingTrace(BINDING_CONTEXT_STUB, "Delegating trace stub") {
-
-        @Override
-        public <K, V> void record(WritableSlice<K, V> slice, K key, V value) {
-            throw new IllegalStateException();
-        }
-
-        @Override
-        public <K> void record(WritableSlice<K, Boolean> slice, K key) {
-            throw new IllegalStateException();
-        }
-
-        @Nullable
-        @Override
-        public <K, V> V get(ReadOnlySlice<K, V> slice, K key) {
-            throw new IllegalStateException();
-        }
-
-        @NotNull
-        @Override
-        public <K, V> Collection<K> getKeys(WritableSlice<K, V> slice) {
-            throw new IllegalStateException();
-        }
-
-        @Override
-        public void report(@NotNull Diagnostic diagnostic) {
-            throw new IllegalStateException();
-        }
-    };
-}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Diagnostics.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/Diagnostics.kt
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt
index b0ed1915352..4f67c4003fe 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Diagnostics.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve
+package org.jetbrains.jet.lang.resolve.diagnostics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsElementsCache.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java
similarity index 96%
rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsElementsCache.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java
index 4a3a1cc5aa0..6a1d20812f4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsElementsCache.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve;
+package org.jetbrains.jet.lang.resolve.diagnostics;
 
 import com.intellij.openapi.util.AtomicNotNullLazyValue;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.containers.ConcurrentMultiMap;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 
 import java.util.Collection;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java
similarity index 99%
rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java
index e746edff4c3..d489f93baa4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve;
+package org.jetbrains.jet.lang.resolve.diagnostics;
 
 import com.google.common.collect.ImmutableSet;
 import com.intellij.openapi.application.Application;
@@ -36,6 +36,7 @@ import org.jetbrains.jet.lang.diagnostics.Severity;
 import org.jetbrains.jet.lang.psi.JetAnnotated;
 import org.jetbrains.jet.lang.psi.JetAnnotationEntry;
 import org.jetbrains.jet.lang.psi.JetStubbedPsiUtil;
+import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.constants.ArrayValue;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.jet.lang.resolve.constants.StringValue;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutableDiagnosticsWithSuppression.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
similarity index 95%
rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutableDiagnosticsWithSuppression.kt
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
index 5c83c70d24c..813a55c7242 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutableDiagnosticsWithSuppression.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve
+package org.jetbrains.jet.lang.resolve.diagnostics
 
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
 import java.util.ArrayList
@@ -23,6 +23,7 @@ import com.intellij.util.CachedValueImpl
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.PsiElement
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.jet.lang.resolve.BindingContext
 
 public class MutableDiagnosticsWithSuppression(
         private val bindingContext: BindingContext,
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt
similarity index 95%
rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.kt
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt
index 403e350b8b8..61e5ee8e015 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve
+package org.jetbrains.jet.lang.resolve.diagnostics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
diff --git a/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.kt b/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.kt
index 03bbfa7af06..4b4d4e22d27 100644
--- a/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.kt
@@ -21,9 +21,9 @@ import org.jetbrains.annotations.TestOnly
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.resolve.BindingTrace
-import org.jetbrains.jet.lang.resolve.Diagnostics
 import org.jetbrains.jet.util.slicedmap.ReadOnlySlice
 import org.jetbrains.jet.util.slicedmap.WritableSlice
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
 
 public class LockBasedLazyResolveStorageManager(private val storageManager: StorageManager): StorageManager by storageManager, LazyResolveStorageManager {
     override fun <K, V> createWeaklyRetainedMemoizedFunction(compute: Function1<K, V>) =
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
index 40d206bd6dc..540f65a6a75 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
@@ -54,7 +54,7 @@ import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.psi.JetScript;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTraceContext;
-import org.jetbrains.jet.lang.resolve.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.org.objectweb.asm.Type;
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt
index 5a451d92126..2f8e7270534 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt
@@ -19,7 +19,7 @@ package org.jetbrains.jet.asJava
 import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.psi.JetClassOrObject
-import org.jetbrains.jet.lang.resolve.Diagnostics
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
 import org.jetbrains.jet.lang.resolve.name.FqName
 
 trait LightClassData
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
index 5018a0e73f1..c3b0e471105 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.asJava
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.resolve.Diagnostics
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
 import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.lang.psi.JetClassBody
 import org.jetbrains.jet.lang.psi.JetClassOrObject
diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
index 548f85ea473..97fc6fe7773 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -48,7 +48,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport;
 import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
@@ -63,8 +62,8 @@ import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
-import org.jetbrains.jet.lang.resolve.Diagnostics;
 import org.jetbrains.jet.lang.resolve.ImportPath;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil;
 import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil;
 import org.jetbrains.jet.lang.resolve.name.Name;
diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
index d7055abdb61..e657ba34a56 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
-import org.jetbrains.jet.lang.resolve.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
index d60867aebb5..ef4d49a6a00 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.diagnostics.*;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.lang.types.Flexibility;
 import org.junit.Assert;
 
diff --git a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt
index 0110ed6bbe5..dadab3f56d0 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt
+++ b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt
@@ -25,8 +25,8 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
 import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment
 import org.jetbrains.jet.config.CompilerConfiguration
 import org.jetbrains.jet.lang.resolve.BindingTrace
-import org.jetbrains.jet.lang.resolve.Diagnostics
-import org.jetbrains.jet.lang.resolve.MutableDiagnosticsWithSuppression
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
+import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression
 import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles
 
 class MutableDiagnosticsTest : KotlinTestWithEnvironment() {
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java
index bd87d60797f..3e0d99729d0 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java
@@ -26,7 +26,7 @@ import org.jetbrains.jet.asJava.AsJavaPackage;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.resolve.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.project.TargetPlatform;
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt
index cae8b8e1738..c794518b6f9 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.psi.JetCodeFragment
 import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.lang.psi.JetReferenceExpression
 import org.jetbrains.jet.lang.resolve.BindingContext
-import org.jetbrains.jet.lang.resolve.Diagnostics
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil
 import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode
 import org.jetbrains.jet.plugin.caches.resolve.*
diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/common.xml
index c7dfc3a0341..85aa0fe43ab 100644
--- a/idea/src/META-INF/extensions/common.xml
+++ b/idea/src/META-INF/extensions/common.xml
@@ -5,8 +5,8 @@
         <extensionPoint name="defaultErrorMessages"
                         interface="org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages$Extension"/>
         <extensionPoint name="suppressStringProvider"
-                        interface="org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression$SuppressStringProvider"/>
+                        interface="org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression$SuppressStringProvider"/>
         <extensionPoint name="diagnosticSuppressor"
-                        interface="org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression$DiagnosticSuppressor"/>
+                        interface="org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression$DiagnosticSuppressor"/>
     </extensionPoints>
 </idea-plugin>
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt b/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt
index 5267d9d9897..a5568614748 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin.debugger
 
-import org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression
+import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
 import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.lang.diagnostics.Errors
diff --git a/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt b/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt
index 9910876d336..6ab03402a97 100644
--- a/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt
+++ b/js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt
@@ -19,7 +19,7 @@ package org.jetbrains.k2js.analyze
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import org.jetbrains.jet.lang.diagnostics.Errors
-import org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression
+import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression
 import org.jetbrains.k2js.PredefinedAnnotation
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
 import org.jetbrains.jet.lang.diagnostics.Severity
diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
index 2899347859f..0cde148e319 100644
--- a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+++ b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
@@ -38,7 +38,7 @@ import org.jetbrains.jet.analyzer.AnalysisResult;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.Diagnostics;
+import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage;
 import org.jetbrains.js.compiler.JsSourceGenerationVisitor;
 import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder;