diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
index 786acc783b2..af15a310bfb 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.types.JetType;
-import org.jetbrains.jet.lang.types.inference.SolutionStatus;
+import org.jetbrains.jet.lang.resolve.calls.inference.SolutionStatus;
 import org.jetbrains.jet.lexer.JetKeywordToken;
 import org.jetbrains.jet.resolve.DescriptorRenderer;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
index a896a2bf4e5..a918b063985 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
@@ -19,10 +19,10 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
-import org.jetbrains.jet.lang.types.inference.ConstraintSystem;
-import org.jetbrains.jet.lang.types.inference.ConstraintSystemSolution;
-import org.jetbrains.jet.lang.types.inference.ConstraintSystemImpl;
-import org.jetbrains.jet.lang.types.inference.SolutionStatus;
+import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem;
+import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemSolution;
+import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl;
+import org.jetbrains.jet.lang.resolve.calls.inference.SolutionStatus;
 import org.jetbrains.jet.lexer.JetTokens;
 
 import java.util.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TracingStrategy.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TracingStrategy.java
index 40d06bf6999..5e07ebb9e76 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TracingStrategy.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/TracingStrategy.java
@@ -6,7 +6,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
-import org.jetbrains.jet.lang.types.inference.SolutionStatus;
+import org.jetbrains.jet.lang.resolve.calls.inference.SolutionStatus;
 
 import java.util.Collection;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystem.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.java
similarity index 90%
rename from compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystem.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.java
index 20b47986c0b..8511fb78b37 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystem.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet.lang.types.inference;
+package org.jetbrains.jet.lang.resolve.calls.inference;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystemImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
similarity index 99%
rename from compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystemImpl.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
index f5baf6d6e77..fd274762a09 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystemImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet.lang.types.inference;
+package org.jetbrains.jet.lang.resolve.calls.inference;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystemSolution.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemSolution.java
similarity index 90%
rename from compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystemSolution.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemSolution.java
index 40a2cbbb90e..cffdca00922 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/inference/ConstraintSystemSolution.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemSolution.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet.lang.types.inference;
+package org.jetbrains.jet.lang.resolve.calls.inference;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/inference/SolutionStatus.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SolutionStatus.java
similarity index 81%
rename from compiler/frontend/src/org/jetbrains/jet/lang/types/inference/SolutionStatus.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SolutionStatus.java
index 0fd5cd02517..eae73924099 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/inference/SolutionStatus.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SolutionStatus.java
@@ -1,4 +1,4 @@
-package org.jetbrains.jet.lang.types.inference;
+package org.jetbrains.jet.lang.resolve.calls.inference;
 
 /**
 * @author abreslav