diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintError.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintError.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintError.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintError.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintPosition.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintPosition.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintPosition.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintPosition.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystem.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystem.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystem.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystem.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBounds.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBounds.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBounds.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBounds.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java b/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java
rename to compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeIntersector.java b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/types/TypeIntersector.java
rename to compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java