diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/ExpressionHelpers.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt
similarity index 96%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/ExpressionHelpers.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt
index 867e05a5230..023f69b6fd7 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/ExpressionHelpers.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/ExpressionHelpers.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.psi2ir.builders
+package org.jetbrains.kotlin.ir.builders
 
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -22,9 +22,6 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
-import org.jetbrains.kotlin.psi2ir.generators.eqeqeq
-import org.jetbrains.kotlin.psi2ir.generators.primitiveOp1
-import org.jetbrains.kotlin.psi2ir.generators.primitiveOp2
 import org.jetbrains.kotlin.types.KotlinType
 
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/IrBuilder.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/IrBuilder.kt
similarity index 97%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/IrBuilder.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/IrBuilder.kt
index 0e5d566e7d4..63436c91098 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/IrBuilder.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/IrBuilder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.psi2ir.builders
+package org.jetbrains.kotlin.ir.builders
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.ir.IrElement
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.psi2ir.generators.Generator
 import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext
 import org.jetbrains.kotlin.psi2ir.generators.GeneratorWithScope
-import org.jetbrains.kotlin.psi2ir.generators.Scope
 import org.jetbrains.kotlin.types.KotlinType
 import java.util.*
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/IrMemberFunctionBuilder.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/IrMemberFunctionBuilder.kt
similarity index 94%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/IrMemberFunctionBuilder.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/IrMemberFunctionBuilder.kt
index 7f586b6c164..ce7ea9f0f96 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/IrMemberFunctionBuilder.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/IrMemberFunctionBuilder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.psi2ir.builders
+package org.jetbrains.kotlin.ir.builders
 
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrClassImpl
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext
-import org.jetbrains.kotlin.psi2ir.generators.Scope
 
 class IrMemberFunctionBuilder(
         context: GeneratorContext,
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/generators/Primitives.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/Primitives.kt
similarity index 98%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/generators/Primitives.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/Primitives.kt
index fdbefdc077f..16339317d3d 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/generators/Primitives.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/Primitives.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.psi2ir.generators
+package org.jetbrains.kotlin.ir.builders
 
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/generators/Scope.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/Scope.kt
similarity index 97%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/generators/Scope.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/Scope.kt
index 8f35c03c992..6b12392c193 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/generators/Scope.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/Scope.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.psi2ir.generators
+package org.jetbrains.kotlin.ir.builders
 
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/ScopeHelpers.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/ScopeHelpers.kt
similarity index 92%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/ScopeHelpers.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/ScopeHelpers.kt
index d62955684b6..9cf20261705 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/psi2ir/builders/ScopeHelpers.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/builders/ScopeHelpers.kt
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.psi2ir.builders
+package org.jetbrains.kotlin.ir.builders
 
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.psi2ir.generators.Scope
 
 inline fun <reified T> Scope.assertCastOwner() =
         scopeOwner as? T ?: