diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt
index d02f39f4366..6b6564790c5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt
@@ -58,10 +58,4 @@ private object IdeaJavaDataFlowAnalyzerFacade : JavaDataFlowAnalyzerFacade {
         IntellijNullability.NOT_NULL -> Nullability.NotNull
         IntellijNullability.NULLABLE -> Nullability.Nullable
     }
-}
-
-object IdeaNewJavaToKotlinServices : NewJavaToKotlinServices {
-    override val oldServices: JavaToKotlinConverterServices
-        get() = IdeaJavaToKotlinServices
-
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
index f9d95740b4a..1f5bdbf4c38 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
@@ -16,24 +16,15 @@
 
 package org.jetbrains.kotlin.idea.j2k
 
-import com.intellij.codeInsight.actions.OptimizeImportsProcessor
-import com.intellij.codeInspection.*
-import com.intellij.codeInspection.ex.LocalInspectionToolWrapper
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiElement
+import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.psi.search.LocalSearchScope
 import com.intellij.psi.search.searches.ReferencesSearch
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.descriptors.CallableDescriptor
-import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.diagnostics.Errors
-import org.jetbrains.kotlin.idea.analysis.analyzeInContext
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
+import org.jetbrains.kotlin.idea.core.moveFunctionLiteralOutsideParenthesesIfPossible
 import org.jetbrains.kotlin.idea.core.replaced
 import org.jetbrains.kotlin.idea.core.setVisibility
 import org.jetbrains.kotlin.idea.inspections.*
@@ -44,23 +35,19 @@ import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.F
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToReturnIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isTrivialStatementBody
-import org.jetbrains.kotlin.idea.quickfix.ChangeVariableMutabilityFix
-import org.jetbrains.kotlin.idea.quickfix.QuickFixActionBase
 import org.jetbrains.kotlin.idea.quickfix.RemoveModifierFix
 import org.jetbrains.kotlin.idea.quickfix.RemoveUselessCastFix
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.util.getResolutionScope
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.ConverterSettings
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.*
+import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.isAncestor
+import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.getType
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.types.isNullable
-import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
 import org.jetbrains.kotlin.utils.mapToIndex
 import java.util.*
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
index a2ddec7f858..52891da9fd0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.idea.j2k
 
-import com.intellij.codeInsight.actions.OptimizeImportsProcessor
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.editor.RangeMarker
@@ -33,8 +32,6 @@ import org.jetbrains.kotlin.idea.core.util.EDT
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.ConverterSettings
 import org.jetbrains.kotlin.j2k.PostProcessor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtElement
@@ -43,10 +40,7 @@ import org.jetbrains.kotlin.psi.psiUtil.elementsInRange
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
 import java.util.*
 
-class J2kPostProcessor(
-    private val formatCode: Boolean,
-    private val postProcessingRegistrar: J2KPostProcessingRegistrar = J2KPostProcessingRegistrarImpl
-) : PostProcessor {
+class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor {
     override fun insertImport(file: KtFile, fqName: FqName) {
         ApplicationManager.getApplication().invokeAndWait {
             runWriteAction {
@@ -62,49 +56,36 @@ class J2kPostProcessor(
         PROCESS
     }
 
-
-    override fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?,settings: ConverterSettings??) {
-        fun Processing.flattenToGroups(): List<List<J2kPostProcessing>> =
-            when (this) {
-                is SingleProcessing -> listOf(listOf(this.processing))
-                is ProcessingGroup ->
-                    if (processings.all { it is SingleProcessing }) {
-                        listOf(processings.map { (it as SingleProcessing).processing })
-                    } else {
-                        processings.flatMap { it.flattenToGroups() }
-                    }
-                else -> error("Processing tree is corrupted")
-            }
-        OptimizeImportsProcessor(file.project, file.containingKtFile).run()
-        val groupsOfProcessings = postProcessingRegistrar.mainProcessings.flattenToGroups()
-
+    override fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?) =
         runBlocking(EDT.ModalityStateElement(ModalityState.defaultModalityState())) {
-            for (processings in groupsOfProcessings) {
-                do {
-                    var modificationStamp: Long? = file.modificationStamp
-                    val elementToActions = runReadAction {
-                        collectAvailableActions(processings, file, rangeMarker, settings)
-                    }
+            do {
+                var modificationStamp: Long? = file.modificationStamp
+                val elementToActions = runReadAction {
+                    collectAvailableActions(file, rangeMarker)
+                }
 
-                    withContext(EDT) {
-                        for ((element, action, _, writeActionNeeded) in elementToActions) {
-                            if (element.isValid) {
-                                if (writeActionNeeded) {
-                                    runWriteAction {
-                                        action()
-                                    }
-                                } else {
+                withContext(EDT) {
+                    for ((element, action, _, writeActionNeeded) in elementToActions) {
+                        if (element.isValid) {
+                            if (writeActionNeeded) {
+                                runWriteAction {
                                     action()
                                 }
-                            } else {
-                                modificationStamp = null
+                            }
+                            else {
+                                action()
                             }
                         }
+                        else {
+                            modificationStamp = null
+                        }
                     }
+                }
 
-                    if (modificationStamp == file.modificationStamp) break
-                } while (elementToActions.isNotEmpty())
+                if (modificationStamp == file.modificationStamp) break
             }
+            while (elementToActions.isNotEmpty())
+
 
             if (formatCode) {
                 withContext(EDT) {
@@ -114,7 +95,8 @@ class J2kPostProcessor(
                             if (rangeMarker.isValid) {
                                 codeStyleManager.reformatRange(file, rangeMarker.startOffset, rangeMarker.endOffset)
                             }
-                        } else {
+                        }
+                        else {
                             codeStyleManager.reformat(file)
                         }
                         Unit
@@ -122,17 +104,11 @@ class J2kPostProcessor(
                 }
             }
         }
-    }
 
 
     private data class ActionData(val element: KtElement, val action: () -> Unit, val priority: Int, val writeActionNeeded: Boolean)
 
-    private fun collectAvailableActions(
-        processings: Collection<J2kPostProcessing>,
-        file: KtFile,
-        rangeMarker: RangeMarker?,
-        settings: ConverterSettings??
-    ): List<ActionData> {
+    private fun collectAvailableActions(file: KtFile, rangeMarker: RangeMarker?): List<ActionData> {
         val diagnostics = analyzeFileRange(file, rangeMarker)
 
         val availableActions = ArrayList<ActionData>()
@@ -146,16 +122,12 @@ class J2kPostProcessor(
                     super.visitElement(element)
 
                     if (rangeResult == RangeFilterResult.PROCESS) {
-                        processings.forEach { processing ->
-                            val action = processing.createAction(element, diagnostics, settings)
+                        J2KPostProcessingRegistrar.processings.forEach { processing ->
+                            val action = processing.createAction(element, diagnostics)
                             if (action != null) {
-                                availableActions.add(
-                                    ActionData(
-                                        element, action,
-                                        postProcessingRegistrar.priority(processing),
-                                        processing.writeActionNeeded
-                                    )
-                                )
+                                availableActions.add(ActionData(element, action,
+                                                                J2KPostProcessingRegistrar.priority(processing),
+                                                                processing.writeActionNeeded))
                             }
                         }
                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index 0d34645780d..102c19a634c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -1154,7 +1154,7 @@ internal fun <D : KtNamedDeclaration> placeDeclarationInContainer(
     return declarationInPlace
 }
 
-internal fun KtNamedDeclaration.getReturnTypeReference() = getReturnTypeReferences().singleOrNull()
+fun KtNamedDeclaration.getReturnTypeReference() = getReturnTypeReferences().singleOrNull()
 
 internal fun KtNamedDeclaration.getReturnTypeReferences(): List<KtTypeReference> {
     return when (this) {
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt b/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt
index 6bd551a656e..c388262b346 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/AfterConversionPass.kt
@@ -33,6 +33,6 @@ class AfterConversionPass(val project: Project, val postProcessor: PostProcessor
             null
         }
 
-        postProcessor.doAdditionalProcessing(kotlinFile, rangeMarker, null)
+        postProcessor.doAdditionalProcessing(kotlinFile, rangeMarker)
     }
 }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
index 01791b0de37..771c02f753b 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
@@ -39,7 +39,7 @@ import java.util.*
 interface PostProcessor {
     fun insertImport(file: KtFile, fqName: FqName)
 
-    fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?, settings: ConverterSettings?)
+    fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?)
 }
 
 enum class ParseContext {
@@ -48,9 +48,9 @@ enum class ParseContext {
 }
 
 class JavaToKotlinConverter(
-        private val project: Project,
-        private val settings: ConverterSettings,
-        private val services: JavaToKotlinConverterServices
+    private val project: Project,
+    private val settings: ConverterSettings,
+    private val services: JavaToKotlinConverterServices
 ) {
     private val LOG = Logger.getInstance("#org.jetbrains.kotlin.j2k.JavaToKotlinConverter")
 
@@ -141,25 +141,25 @@ class JavaToKotlinConverter(
     }
 
     private data class ReferenceInfo(
-            val reference: PsiReference,
-            val target: PsiElement,
-            val file: PsiFile,
-            val processings: Collection<UsageProcessing>
+        val reference: PsiReference,
+        val target: PsiElement,
+        val file: PsiFile,
+        val processings: Collection<UsageProcessing>
     ) {
         val depth: Int by lazy(LazyThreadSafetyMode.NONE) { target.parentsWithSelf.takeWhile { it !is PsiFile }.count() }
         val offset: Int by lazy(LazyThreadSafetyMode.NONE) { reference.element.textRange.startOffset }
     }
 
     private fun buildExternalCodeProcessing(
-            usageProcessings: Map<PsiElement, Collection<UsageProcessing>>,
-            inConversionScope: (PsiElement) -> Boolean
+        usageProcessings: Map<PsiElement, Collection<UsageProcessing>>,
+        inConversionScope: (PsiElement) -> Boolean
     ): ExternalCodeProcessing? {
         if (usageProcessings.isEmpty()) return null
 
         val map: Map<PsiElement, Collection<UsageProcessing>> = usageProcessings.values
-                .flatten()
-                .filter { it.javaCodeProcessors.isNotEmpty() || it.kotlinCodeProcessors.isNotEmpty() }
-                .groupBy { it.targetElement }
+            .flatten()
+            .filter { it.javaCodeProcessors.isNotEmpty() || it.kotlinCodeProcessors.isNotEmpty() }
+            .groupBy { it.targetElement }
         if (map.isEmpty()) return null
 
         return object: ExternalCodeProcessing {
@@ -176,14 +176,14 @@ class JavaToKotlinConverter(
                     progress.checkCanceled()
 
                     ProgressManager.getInstance().runProcess(
-                            {
-                                val searchJava = processings.any { it.javaCodeProcessors.isNotEmpty() }
-                                val searchKotlin = processings.any { it.kotlinCodeProcessors.isNotEmpty() }
-                                services.referenceSearcher.findUsagesForExternalCodeProcessing(psiElement, searchJava, searchKotlin)
-                                        .filterNot { inConversionScope(it.element) }
-                                        .mapTo(refs) { ReferenceInfo(it, psiElement, it.element.containingFile, processings) }
-                            },
-                            ProgressPortionReporter(progress, i / map.size.toDouble(), 1.0 / map.size))
+                        {
+                            val searchJava = processings.any { it.javaCodeProcessors.isNotEmpty() }
+                            val searchKotlin = processings.any { it.kotlinCodeProcessors.isNotEmpty() }
+                            services.referenceSearcher.findUsagesForExternalCodeProcessing(psiElement, searchJava, searchKotlin)
+                                .filterNot { inConversionScope(it.element) }
+                                .mapTo(refs) { ReferenceInfo(it, psiElement, it.element.containingFile, processings) }
+                        },
+                        ProgressPortionReporter(progress, i / map.size.toDouble(), 1.0 / map.size))
 
                 }
 
@@ -245,37 +245,37 @@ class JavaToKotlinConverter(
         private var pass = 1
 
         fun <TInputItem, TOutputItem> processItems(
-                fractionPortion: Double,
-                inputItems: Iterable<TInputItem>,
-                processItem: (TInputItem) -> TOutputItem
+            fractionPortion: Double,
+            inputItems: Iterable<TInputItem>,
+            processItem: (TInputItem) -> TOutputItem
         ): List<TOutputItem> {
             val outputItems = ArrayList<TOutputItem>()
             // we use special process with EmptyProgressIndicator to avoid changing text in our progress by inheritors search inside etc
             ProgressManager.getInstance().runProcess(
-                    {
-                        progress?.text = "$progressText ($fileCountText) - pass $pass of 3"
+                {
+                    progress?.text = "$progressText ($fileCountText) - pass $pass of 3"
 
-                        for ((i, item) in inputItems.withIndex()) {
-                            progress?.checkCanceled()
-                            progress?.fraction = fraction + fractionPortion * i / fileCount
+                    for ((i, item) in inputItems.withIndex()) {
+                        progress?.checkCanceled()
+                        progress?.fraction = fraction + fractionPortion * i / fileCount
 
-                            progress?.text2 = files!![i].virtualFile.presentableUrl
+                        progress?.text2 = files!![i].virtualFile.presentableUrl
 
-                            outputItems.add(processItem(item))
-                        }
+                        outputItems.add(processItem(item))
+                    }
 
-                        pass++
-                        fraction += fractionPortion
-                    },
-                    EmptyProgressIndicator())
+                    pass++
+                    fraction += fractionPortion
+                },
+                EmptyProgressIndicator())
             return outputItems
         }
     }
 
     private class ProgressPortionReporter(
-            indicator: ProgressIndicator,
-            private val start: Double,
-            private val portion: Double
+        indicator: ProgressIndicator,
+        private val start: Double,
+        private val portion: Double
     ) : DelegatingProgressIndicator(indicator) {
 
         init {
diff --git a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java
index 1a66a0a33b9..2328ea5cff9 100644
--- a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java
+++ b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java
@@ -1,5 +1,6 @@
 // !forceNotNullTypes: false
 // !specifyLocalVariableTypeByDefault: true
+import java.util.HashSet;
 
 class Foo {
   void foo(HashSet o) {
diff --git a/j2k/testData/fileOrElement/class/anonymousClass.kt b/j2k/testData/fileOrElement/class/anonymousClass.kt
index 6b7b76286da..5070cdc215c 100644
--- a/j2k/testData/fileOrElement/class/anonymousClass.kt
+++ b/j2k/testData/fileOrElement/class/anonymousClass.kt
@@ -1,6 +1,6 @@
 package test
 
-import javaApi.Listener
+import javaApi.*
 
 class Test {
     private val listener = Listener { visibility -> val a = visibility and 1 }
diff --git a/nj2k/build.gradle.kts b/nj2k/build.gradle.kts
new file mode 100644
index 00000000000..1bbc3866d83
--- /dev/null
+++ b/nj2k/build.gradle.kts
@@ -0,0 +1,95 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    testRuntime(intellijDep())
+
+    compile(project(":j2k"))
+    testCompile(files(project(":j2k").dependencyProject.sourceSets.getByName("test").output))
+
+    compile(project(":idea:idea-core"))
+    compile(project(":kotlin-stdlib"))
+    compile(project(":compiler:frontend"))
+    compile(project(":compiler:frontend.java"))
+    compile(project(":compiler:light-classes"))
+    compile(project(":compiler:util"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+
+    testCompile(project(":idea"))
+    compile(project(":nj2k:nj2k-services"))
+    testCompile(projectTests(":idea:idea-test-framework"))
+    testCompile(project(":compiler:light-classes"))
+    testCompile(project(":kotlin-test:kotlin-test-junit"))
+    testCompile(commonDep("junit:junit"))
+
+    when {
+        Ide.IJ181.orHigher() || Ide.AS33.orHigher() -> testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") }
+        Ide.AS32() -> testCompileOnly(intellijDep()) { includeJars("idea") }
+    }
+    testCompile(project(":idea:idea-native")) { isTransitive = false }
+    testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }
+
+    testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false }
+    testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false }
+    testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
+    testRuntime(project(":idea:idea-jvm"))
+    testRuntime(project(":idea:idea-android"))
+    testRuntime(project(":plugins:android-extensions-ide"))
+    testRuntime(project(":sam-with-receiver-ide-plugin"))
+    testRuntime(project(":allopen-ide-plugin"))
+    testRuntime(project(":noarg-ide-plugin"))
+    testRuntime(project(":kotlin-scripting-idea"))
+    testRuntime(project(":kotlinx-serialization-ide-plugin"))
+    testRuntime(intellijPluginDep("properties"))
+    testRuntime(intellijPluginDep("gradle"))
+    testRuntime(intellijPluginDep("Groovy"))
+    testRuntime(intellijPluginDep("coverage"))
+    Ide.IJ {
+        testRuntime(intellijPluginDep("maven"))
+    }
+    testRuntime(intellijPluginDep("android"))
+    testRuntime(intellijPluginDep("smali"))
+    testRuntime(intellijPluginDep("junit"))
+    testRuntime(intellijPluginDep("testng"))
+    testRuntime(intellijPluginDep("IntelliLang"))
+    testRuntime(intellijPluginDep("testng"))
+    testRuntime(intellijPluginDep("copyright"))
+    testRuntime(intellijPluginDep("properties"))
+    testRuntime(intellijPluginDep("java-i18n"))
+    testRuntime(intellijPluginDep("java-decompiler"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { projectDefault() }
+}
+
+projectTest {
+    dependsOn(":dist")
+    workingDir = rootDir
+}
+
+testsJar()
+
+
+val test: Test by tasks
+val cleanTest by tasks
+
+configureFreeCompilerArg(true, "-Xeffect-system")
+configureFreeCompilerArg(true, "-Xnew-inference")
+
+fun configureFreeCompilerArg(isEnabled: Boolean, compilerArgument: String) {
+    if (isEnabled) {
+        allprojects {
+            tasks.withType<KotlinCompile<*>> {
+                kotlinOptions {
+                    freeCompilerArgs += listOf(compilerArgument)
+                }
+            }
+        }
+    }
+}
diff --git a/nj2k/nj2k-services/build.gradle.kts b/nj2k/nj2k-services/build.gradle.kts
new file mode 100644
index 00000000000..7736c710da2
--- /dev/null
+++ b/nj2k/nj2k-services/build.gradle.kts
@@ -0,0 +1,76 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+
+dependencies {
+    testRuntime(intellijDep())
+
+    compile(project(":kotlin-stdlib-jdk8"))
+    compileOnly(project(":kotlin-reflect-api"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
+    compile(project(":compiler:backend"))
+    compile(project(":compiler:cli-common"))
+    compile(project(":compiler:frontend"))
+    compile(project(":compiler:frontend.common"))
+    compile(project(":compiler:frontend.java"))
+    compile(project(":compiler:frontend.script"))
+    compile(project(":js:js.frontend"))
+    compile(project(":js:js.serializer"))
+    compile(project(":compiler:light-classes"))
+    compile(project(":compiler:util"))
+    compile(project(":kotlin-build-common"))
+    compile(project(":compiler:daemon-common"))
+    compile(projectRuntimeJar(":kotlin-daemon-client"))
+    compile(project(":kotlin-compiler-runner")) { isTransitive = false }
+    compile(project(":compiler:plugin-api"))
+    compile(project(":eval4j"))
+    compile(project(":j2k"))
+    compile(project(":idea"))
+    compile(project(":idea:formatter"))
+    compile(project(":idea:fir-view"))
+    compile(project(":idea:idea-core"))
+    compile(project(":idea:ide-common"))
+    compile(project(":idea:idea-jps-common"))
+    compile(project(":idea:kotlin-gradle-tooling"))
+    compile(project(":plugins:uast-kotlin"))
+    compile(project(":plugins:uast-kotlin-idea"))
+    compile(project(":kotlin-script-util")) { isTransitive = false }
+    compile(project(":kotlin-scripting-intellij"))
+
+    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+
+    compileOnly(project(":kotlin-daemon-client"))
+
+    compileOnly(intellijDep())
+    compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
+    compileOnly(intellijPluginDep("IntelliLang"))
+    compileOnly(intellijPluginDep("copyright"))
+    compileOnly(intellijPluginDep("properties"))
+    compileOnly(intellijPluginDep("java-i18n"))
+
+    testCompile(project(":kotlin-test:kotlin-test-junit"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(project(":idea:idea-jvm")) { isTransitive = false }
+    testCompile(project(":idea:idea-gradle")) { isTransitive = false }
+    testCompile(project(":idea:idea-maven")) { isTransitive = false }
+    testCompile(project(":idea:idea-native")) { isTransitive = false }
+    testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }
+    testCompile(commonDep("junit:junit"))
+
+
+    testRuntime(commonDep("org.jetbrains", "markdown"))
+    testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
+    testRuntime(project(":kotlin-reflect"))
+    testRuntime(project(":kotlin-preloader"))
+
+    testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+}
+
diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/IdeaJavaToKotlinServices.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/IdeaJavaToKotlinServices.kt
new file mode 100644
index 00000000000..47eb832fe72
--- /dev/null
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/IdeaJavaToKotlinServices.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.nj2k
+
+import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices
+import org.jetbrains.kotlin.j2k.JavaToKotlinConverterServices
+
+
+interface NewJavaToKotlinServices {
+    val oldServices: JavaToKotlinConverterServices
+}
+
+object IdeaNewJavaToKotlinServices : NewJavaToKotlinServices {
+    override val oldServices: JavaToKotlinConverterServices
+        get() = IdeaJavaToKotlinServices
+}
\ No newline at end of file
diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/J2kPostProcessor.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/J2kPostProcessor.kt
new file mode 100644
index 00000000000..fe0208c22a4
--- /dev/null
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/J2kPostProcessor.kt
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2010-2015 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.kotlin.idea.nj2k
+
+import com.intellij.codeInsight.actions.OptimizeImportsProcessor
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.ModalityState
+import com.intellij.openapi.editor.RangeMarker
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiRecursiveElementVisitor
+import com.intellij.psi.codeStyle.CodeStyleManager
+import kotlinx.coroutines.experimental.withContext
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
+import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
+import org.jetbrains.kotlin.idea.conversion.copy.range
+import org.jetbrains.kotlin.idea.core.util.EDT
+import org.jetbrains.kotlin.idea.util.ImportInsertHelper
+import org.jetbrains.kotlin.idea.util.application.runReadAction
+import org.jetbrains.kotlin.idea.util.application.runWriteAction
+import org.jetbrains.kotlin.j2k.ConverterSettings
+import org.jetbrains.kotlin.j2k.PostProcessor
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.nj2k.*
+import org.jetbrains.kotlin.psi.KtElement
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.psiUtil.elementsInRange
+import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
+import java.util.*
+
+class NewJ2kPostProcessor(
+    private val formatCode: Boolean,
+    private val settings: ConverterSettings?
+) : PostProcessor {
+    override fun insertImport(file: KtFile, fqName: FqName) {
+        ApplicationManager.getApplication().invokeAndWait {
+            runWriteAction {
+                val descriptors = file.resolveImportReference(fqName)
+                descriptors.firstOrNull()?.let { ImportInsertHelper.getInstance(file.project).importDescriptor(file, it) }
+            }
+        }
+    }
+
+    private enum class RangeFilterResult {
+        SKIP,
+        GO_INSIDE,
+        PROCESS
+    }
+
+
+    override fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?) {
+        fun Processing.flattenToGroups(): List<List<NewJ2kPostProcessing>> =
+            when (this) {
+                is SingleProcessing -> listOf(listOf(this.processing))
+                is ProcessingGroup ->
+                    if (processings.all { it is SingleProcessing }) {
+                        listOf(processings.map { (it as SingleProcessing).processing })
+                    } else {
+                        processings.flatMap { it.flattenToGroups() }
+                    }
+                else -> error("Processing tree is corrupted")
+            }
+        OptimizeImportsProcessor(file.project, file.containingKtFile).run()
+        val groupsOfProcessings = NewJ2KPostProcessingRegistrar.mainProcessings.flattenToGroups()
+
+        runBlocking(EDT.ModalityStateElement(ModalityState.defaultModalityState())) {
+            for (processings in groupsOfProcessings) {
+                do {
+                    var modificationStamp: Long? = file.modificationStamp
+                    val elementToActions = runReadAction {
+                        collectAvailableActions(processings, file, rangeMarker)
+                    }
+
+                    withContext(EDT) {
+                        for ((element, action, _, writeActionNeeded) in elementToActions) {
+                            if (element.isValid) {
+                                if (writeActionNeeded) {
+                                    runWriteAction {
+                                        action()
+                                    }
+                                } else {
+                                    action()
+                                }
+                            } else {
+                                modificationStamp = null
+                            }
+                        }
+                    }
+
+                    if (modificationStamp == file.modificationStamp) break
+                } while (elementToActions.isNotEmpty())
+            }
+
+            if (formatCode) {
+                withContext(EDT) {
+                    runWriteAction {
+                        val codeStyleManager = CodeStyleManager.getInstance(file.project)
+                        if (rangeMarker != null) {
+                            if (rangeMarker.isValid) {
+                                codeStyleManager.reformatRange(file, rangeMarker.startOffset, rangeMarker.endOffset)
+                            }
+                        } else {
+                            codeStyleManager.reformat(file)
+                        }
+                        Unit
+                    }
+                }
+            }
+        }
+    }
+
+
+    private data class ActionData(val element: KtElement, val action: () -> Unit, val priority: Int, val writeActionNeeded: Boolean)
+
+    private fun collectAvailableActions(
+        processings: Collection<NewJ2kPostProcessing>,
+        file: KtFile,
+        rangeMarker: RangeMarker?
+    ): List<ActionData> {
+        val diagnostics = analyzeFileRange(file, rangeMarker)
+
+        val availableActions = ArrayList<ActionData>()
+
+        file.accept(object : PsiRecursiveElementVisitor() {
+            override fun visitElement(element: PsiElement) {
+                if (element is KtElement) {
+                    val rangeResult = rangeFilter(element, rangeMarker)
+                    if (rangeResult == RangeFilterResult.SKIP) return
+
+                    super.visitElement(element)
+
+                    if (rangeResult == RangeFilterResult.PROCESS) {
+                        processings.forEach { processing ->
+                            val action = processing.createAction(element, diagnostics, settings)
+                            if (action != null) {
+                                availableActions.add(
+                                    ActionData(
+                                        element, action,
+                                        NewJ2KPostProcessingRegistrar.priority(processing),
+                                        processing.writeActionNeeded
+                                    )
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        })
+        availableActions.sortBy { it.priority }
+        return availableActions
+    }
+
+    private fun analyzeFileRange(file: KtFile, rangeMarker: RangeMarker?): Diagnostics {
+        val elements = if (rangeMarker == null)
+            listOf(file)
+        else
+            file.elementsInRange(rangeMarker.range!!).filterIsInstance<KtElement>()
+
+        return if (elements.isNotEmpty())
+            file.getResolutionFacade().analyzeWithAllCompilerChecks(elements).bindingContext.diagnostics
+        else
+            Diagnostics.EMPTY
+    }
+
+    private fun rangeFilter(element: PsiElement, rangeMarker: RangeMarker?): RangeFilterResult {
+        if (rangeMarker == null) return RangeFilterResult.PROCESS
+        if (!rangeMarker.isValid) return RangeFilterResult.SKIP
+        val range = TextRange(rangeMarker.startOffset, rangeMarker.endOffset)
+        val elementRange = element.textRange
+        return when {
+            range.contains(elementRange) -> RangeFilterResult.PROCESS
+            range.intersects(elementRange) -> RangeFilterResult.GO_INSIDE
+            else -> RangeFilterResult.SKIP
+        }
+    }
+}
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt
similarity index 91%
rename from idea/src/org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt
rename to nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt
index 30756af3684..15d02d6d6cf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt
@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2015 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.
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.codeInsight.actions.OptimizeImportsProcessor
 import com.intellij.codeInspection.*
@@ -43,16 +32,16 @@ import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.F
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToReturnIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isTrivialStatementBody
-import org.jetbrains.kotlin.idea.j2k.postProcessing.ConvertDataClass
-import org.jetbrains.kotlin.idea.j2k.postProcessing.ConvertGettersAndSetters
-import org.jetbrains.kotlin.idea.j2k.postProcessing.resolve
-import org.jetbrains.kotlin.idea.j2k.postProcessing.topLevelContainingClassOrObject
 import org.jetbrains.kotlin.idea.quickfix.*
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.references.readWriteAccess
 import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.j2k.ConverterSettings
+import org.jetbrains.kotlin.nj2k.postProcessing.ConvertDataClass
+import org.jetbrains.kotlin.nj2k.postProcessing.ConvertGettersAndSetters
+import org.jetbrains.kotlin.nj2k.postProcessing.resolve
+import org.jetbrains.kotlin.nj2k.postProcessing.topLevelContainingClassOrObject
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
@@ -65,9 +54,25 @@ import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
 import org.jetbrains.kotlin.utils.mapToIndex
 import java.util.*
 
-object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
+interface NewJ2kPostProcessing {
+    fun createAction(element: KtElement, diagnostics: Diagnostics, settings: ConverterSettings?): (() -> Unit)? =
+        createAction(element, diagnostics)
 
-    private fun Processing.processings(): Sequence<J2kPostProcessing> =
+    fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? =
+        createAction(element, diagnostics, null)
+
+    val writeActionNeeded: Boolean
+}
+
+interface Processing
+data class SingleProcessing(val processing: NewJ2kPostProcessing) : Processing
+data class ProcessingGroup(val processings: List<Processing>) : Processing {
+    constructor(vararg processings: Processing) : this(processings.toList())
+}
+
+object NewJ2KPostProcessingRegistrar {
+
+    private fun Processing.processings(): Sequence<NewJ2kPostProcessing> =
         when (this) {
             is SingleProcessing -> sequenceOf(processing)
             is ProcessingGroup -> processings.asSequence().flatMap { it.processings() }
@@ -75,11 +80,11 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
 
 
-    private val processingsToPriorityMap = HashMap<J2kPostProcessing, Int>()
+    private val processingsToPriorityMap = HashMap<NewJ2kPostProcessing, Int>()
 
-    override fun priority(processing: J2kPostProcessing): Int = processingsToPriorityMap[processing]!!
+    fun priority(processing: NewJ2kPostProcessing): Int = processingsToPriorityMap[processing]!!
 
-    override val mainProcessings = ProcessingGroup(
+    val mainProcessings = ProcessingGroup(
         SingleProcessing(VarToVal()),
         ProcessingGroup(
             SingleProcessing(ConvertGettersAndSetters()),
@@ -107,7 +112,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
             SingleProcessing(UseExpressionBodyProcessing()),
             registerInspectionBasedProcessing(UnnecessaryVariableInspection()),
             SingleProcessing(
-                object : J2kPostProcessing {
+                object : NewJ2kPostProcessing {
                     override val writeActionNeeded: Boolean = true
                     private val processing = registerGeneralInspectionBasedProcessing(RedundantExplicitTypeInspection())
 
@@ -210,17 +215,18 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
             },
 
             registerDiagnosticBasedProcessingFactory(
-                Errors.VAL_REASSIGNMENT, Errors.CAPTURED_VAL_INITIALIZATION, Errors.CAPTURED_MEMBER_VAL_INITIALIZATION
+                    Errors.VAL_REASSIGNMENT, Errors.CAPTURED_VAL_INITIALIZATION, Errors.CAPTURED_MEMBER_VAL_INITIALIZATION
             ) { element: KtSimpleNameExpression, _: Diagnostic ->
                 val property = element.mainReference.resolve() as? KtProperty
                 if (property == null) {
                     null
                 } else {
-                    {
+                    val action = {
                         if (!property.isVar) {
                             property.valOrVarKeyword.replace(KtPsiFactory(element.project).createVarKeyword())
                         }
                     }
+                    action
                 }
             },
 
@@ -235,7 +241,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         )
     )
 
-    override val processings: Collection<J2kPostProcessing> =
+    val processings: Collection<NewJ2kPostProcessing> =
         mainProcessings.processings().toList()
 
 
@@ -247,7 +253,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
     private inline fun <reified TElement : KtElement, TIntention : SelfTargetingRangeIntention<TElement>> registerIntentionBasedProcessing(
         intention: TIntention,
         noinline additionalChecker: (TElement) -> Boolean = { true }
-    ) = SingleProcessing(object : J2kPostProcessing {
+    ) = SingleProcessing(object : NewJ2kPostProcessing {
         // Intention can either need or not need write action
         override val writeActionNeeded = intention.startInWriteAction()
 
@@ -269,7 +275,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
     private inline fun <TInspection : AbstractKotlinInspection> registerGeneralInspectionBasedProcessing(
         inspection: TInspection,
         acceptInformationLevel: Boolean = false
-    ) = SingleProcessing(object : J2kPostProcessing {
+    ) = SingleProcessing(object : NewJ2kPostProcessing {
         override val writeActionNeeded = false
 
         fun <D : CommonProblemDescriptor> QuickFix<D>.applyFixSmart(project: Project, descriptor: D) {
@@ -341,7 +347,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
 
         inspection: TInspection,
         acceptInformationLevel: Boolean = false
-    ) = SingleProcessing(object : J2kPostProcessing {
+    ) = SingleProcessing(object : NewJ2kPostProcessing {
         // Inspection can either need or not need write action
         override val writeActionNeeded = inspection.startFixInWriteAction
 
@@ -379,7 +385,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
     private inline fun <reified TElement : KtElement> registerDiagnosticBasedProcessingFactory(
         vararg diagnosticFactory: DiagnosticFactory<*>,
         crossinline fixFactory: (TElement, Diagnostic) -> (() -> Unit)?
-    ) = SingleProcessing(object : J2kPostProcessing {
+    ) = SingleProcessing(object : NewJ2kPostProcessing {
         // ???
         override val writeActionNeeded = true
 
@@ -391,7 +397,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
     })
 
 
-    private class RemoveExplicitPropertyType : J2kPostProcessing {
+    private class RemoveExplicitPropertyType : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics, settings: ConverterSettings?): (() -> Unit)? {
@@ -425,7 +431,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
     }
 
 
-    private class RemoveRedundantNullability : J2kPostProcessing {
+    private class RemoveRedundantNullability : NewJ2kPostProcessing {
         override val writeActionNeeded: Boolean = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -463,7 +469,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class RemoveExplicitTypeArgumentsProcessing : J2kPostProcessing {
+    private class RemoveExplicitTypeArgumentsProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -481,7 +487,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class RemoveRedundantOverrideVisibilityProcessing : J2kPostProcessing {
+    private class RemoveRedundantOverrideVisibilityProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -491,7 +497,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class ConvertToStringTemplateProcessing : J2kPostProcessing {
+    private class ConvertToStringTemplateProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         private val intention = ConvertToStringTemplateIntention()
@@ -508,7 +514,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class UsePropertyAccessSyntaxProcessing : J2kPostProcessing {
+    private class UsePropertyAccessSyntaxProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         private val intention = UsePropertyAccessSyntaxIntention()
@@ -520,7 +526,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class RemoveRedundantSamAdaptersProcessing : J2kPostProcessing {
+    private class RemoveRedundantSamAdaptersProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -536,7 +542,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class UseExpressionBodyProcessing : J2kPostProcessing {
+    private class UseExpressionBodyProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -553,7 +559,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class RemoveRedundantCastToNullableProcessing : J2kPostProcessing {
+    private class RemoveRedundantCastToNullableProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -574,7 +580,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class FixObjectStringConcatenationProcessing : J2kPostProcessing {
+    private class FixObjectStringConcatenationProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -604,7 +610,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class UninitializedVariableReferenceFromInitializerToThisReferenceProcessing : J2kPostProcessing {
+    private class UninitializedVariableReferenceFromInitializerToThisReferenceProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -624,7 +630,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class UnresolvedVariableReferenceFromInitializerToThisReferenceProcessing : J2kPostProcessing {
+    private class UnresolvedVariableReferenceFromInitializerToThisReferenceProcessing : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         override fun createAction(element: KtElement, diagnostics: Diagnostics): (() -> Unit)? {
@@ -644,7 +650,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class VarToVal : J2kPostProcessing {
+    private class VarToVal : NewJ2kPostProcessing {
         override val writeActionNeeded = true
 
         private fun KtProperty.hasWriteUsages(): Boolean =
@@ -678,7 +684,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         }
     }
 
-    private class RemoveRedundantExpressionQualifierProcessing : J2kPostProcessing {
+    private class RemoveRedundantExpressionQualifierProcessing : NewJ2kPostProcessing {
         private fun check(qualifiedExpression: KtQualifiedExpression): Boolean {
             val qualifier = (qualifiedExpression.receiverExpression as? KtNameReferenceExpression)
                 ?.referenceExpression()
@@ -700,7 +706,7 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
         override val writeActionNeeded: Boolean = true
     }
 
-    private class RemoveRedundantTypeQualifierProcessing : J2kPostProcessing {
+    private class RemoveRedundantTypeQualifierProcessing : NewJ2kPostProcessing {
         private fun check(reference: KtUserType): Boolean {
             val qualifierClass = reference.qualifier
                 ?.referenceExpression
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/ConvertDataClass.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/ConvertDataClass.kt
similarity index 94%
rename from idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/ConvertDataClass.kt
rename to nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/ConvertDataClass.kt
index 632d7a12e51..0e08e9ed49b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/ConvertDataClass.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/ConvertDataClass.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.j2k.postProcessing
+package org.jetbrains.kotlin.nj2k.postProcessing
 
 import com.intellij.psi.impl.source.tree.PsiWhiteSpaceImpl
 import com.intellij.psi.search.LocalSearchScope
@@ -11,8 +11,8 @@ import com.intellij.psi.search.searches.ReferencesSearch
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.core.setDefaultValue
-import org.jetbrains.kotlin.idea.j2k.J2kPostProcessing
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
+import org.jetbrains.kotlin.nj2k.NewJ2kPostProcessing
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.addRemoveModifier.setModifierList
 import org.jetbrains.kotlin.psi.psiUtil.asAssignment
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.psiUtil.containingClass
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 
-class ConvertDataClass : J2kPostProcessing {
+class ConvertDataClass : NewJ2kPostProcessing {
     override val writeActionNeeded: Boolean = true
 
     fun KtCallableDeclaration.rename(newName: String) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/ConvertGettersAndSetters.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/ConvertGettersAndSetters.kt
similarity index 98%
rename from idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/ConvertGettersAndSetters.kt
rename to nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/ConvertGettersAndSetters.kt
index 416fac09347..6dfb50b35a6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/ConvertGettersAndSetters.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/ConvertGettersAndSetters.kt
@@ -1,17 +1,17 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.j2k.postProcessing
+package org.jetbrains.kotlin.nj2k.postProcessing
 
 import com.intellij.psi.search.LocalSearchScope
 import com.intellij.psi.search.searches.ReferencesSearch
 import com.intellij.psi.util.parentOfType
 import org.jetbrains.kotlin.idea.core.setVisibility
-import org.jetbrains.kotlin.idea.j2k.J2kPostProcessing
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getReturnTypeReference
 import org.jetbrains.kotlin.idea.refactoring.isInterfaceClass
+import org.jetbrains.kotlin.nj2k.NewJ2kPostProcessing
 import org.jetbrains.kotlin.lexer.KtKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.load.java.JvmAbi
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.addRemoveModifier.setModifierList
 import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
 
-class ConvertGettersAndSetters : J2kPostProcessing {
+class ConvertGettersAndSetters : NewJ2kPostProcessing {
     override val writeActionNeeded: Boolean = true
 
     data class PropertyData(
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/utils.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
similarity index 93%
rename from idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/utils.kt
rename to nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
index 2dc323ef5e0..2f58bb6a59d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/postProcessing/utils.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
@@ -1,9 +1,9 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.idea.j2k.postProcessing
+package org.jetbrains.kotlin.nj2k.postProcessing
 
 import com.intellij.psi.search.LocalSearchScope
 import com.intellij.psi.search.searches.ReferencesSearch
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionContext.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionContext.kt
similarity index 90%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionContext.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/ConversionContext.kt
index e587622ca49..b832093dd95 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionContext.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionContext.kt
@@ -3,11 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.j2k.tree.JKElement
+import org.jetbrains.kotlin.j2k.*
+import org.jetbrains.kotlin.nj2k.tree.JKElement
 
 data class ConversionContext(
     val symbolProvider: JKSymbolProvider,
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
similarity index 96%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
index aa1ffb180b1..364cc7684ae 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
-import org.jetbrains.kotlin.j2k.conversions.*
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.conversions.*
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
 
 object ConversionsRunner {
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
similarity index 96%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
index ec5864337e9..ace2b9a1ffa 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/JKSymbolProvider.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
@@ -3,15 +3,15 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.psi.*
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.elements.KtLightDeclaration
-import org.jetbrains.kotlin.j2k.conversions.multiResolveFqName
-import org.jetbrains.kotlin.j2k.conversions.resolveFqName
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.conversions.multiResolveFqName
+import org.jetbrains.kotlin.nj2k.conversions.resolveFqName
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.FqNameUnsafe
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
similarity index 99%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
index f94860bb3b9..3474ed9529d 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.lang.jvm.JvmAnnotatedElement
 import com.intellij.psi.*
@@ -30,10 +30,11 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.elements.KtLightField
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.idea.j2k.content
+import org.jetbrains.kotlin.j2k.ReferenceSearcher
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.JKLiteralExpression.LiteralType.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.JKLiteralExpression.LiteralType.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.lexer.KtToken
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
similarity index 99%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
index 2396f1755db..83fce3bb4dd 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
-import org.jetbrains.kotlin.j2k.NewCodeBuilder.ParenthesisKind.*
+import org.jetbrains.kotlin.nj2k.NewCodeBuilder.ParenthesisKind.*
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.conversions.parentOfType
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitorVoid
+import org.jetbrains.kotlin.nj2k.conversions.parentOfType
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitorVoid
 import org.jetbrains.kotlin.lexer.KtKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverter.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt
similarity index 91%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverter.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt
index a2cc840bf9f..74d8a8b2746 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverter.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.openapi.progress.EmptyProgressIndicator
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiJavaFile
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
-import org.jetbrains.kotlin.j2k.tree.prettyDebugPrintTree
+import org.jetbrains.kotlin.j2k.ConverterSettings
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.tree.prettyDebugPrintTree
 
 class NewJavaToKotlinConverter(
     val project: Project,
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewJavaToKotlinServices.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinServices.kt
similarity index 72%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/NewJavaToKotlinServices.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinServices.kt
index cbe3d5a53c6..7b7c870b461 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewJavaToKotlinServices.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinServices.kt
@@ -3,7 +3,9 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
+
+import org.jetbrains.kotlin.j2k.JavaToKotlinConverterServices
 
 interface NewJavaToKotlinServices {
     val oldServices: JavaToKotlinConverterServices
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/TreeCopy.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/TreeCopy.kt
similarity index 77%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/TreeCopy.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/TreeCopy.kt
index a87b2ab335d..c0e9e558736 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/TreeCopy.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/TreeCopy.kt
@@ -3,10 +3,10 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
-import org.jetbrains.kotlin.j2k.tree.JKElement
-import org.jetbrains.kotlin.j2k.tree.impl.JKElementBase
+import org.jetbrains.kotlin.nj2k.tree.JKElement
+import org.jetbrains.kotlin.nj2k.tree.impl.JKElementBase
 
 fun <T : JKElement> T.copyTree(): T =
     when (this) {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ASTWalk.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ASTWalk.kt
similarity index 77%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ASTWalk.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ASTWalk.kt
index a8f1922b87d..e255a1fe082 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ASTWalk.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ASTWalk.kt
@@ -3,9 +3,9 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.JKElement
+import org.jetbrains.kotlin.nj2k.tree.JKElement
 
 inline fun <reified T : JKElement> JKElement.parentOfType(): T? {
     return generateSequence(parent) { it.parent }.filterIsInstance<T>().firstOrNull()
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AnnotationClassConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AnnotationClassConversion.kt
similarity index 90%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AnnotationClassConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AnnotationClassConversion.kt
index f038c149eba..7bbf0e7431b 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AnnotationClassConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AnnotationClassConversion.kt
@@ -3,13 +3,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.toExpression
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.toExpression
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class AnnotationClassConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AnnotationConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AnnotationConversion.kt
similarity index 80%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AnnotationConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AnnotationConversion.kt
index 28c2a487681..47d1c79e0d8 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AnnotationConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AnnotationConversion.kt
@@ -3,16 +3,16 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.isVarargsArgument
-import org.jetbrains.kotlin.j2k.primaryConstructor
-import org.jetbrains.kotlin.j2k.toExpression
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKAnnotationNameParameterImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKAnnotationParameterImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKUniverseClassSymbol
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.isVarargsArgument
+import org.jetbrains.kotlin.nj2k.primaryConstructor
+import org.jetbrains.kotlin.nj2k.toExpression
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKAnnotationNameParameterImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKAnnotationParameterImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKUniverseClassSymbol
 
 class AnnotationConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ArrayInitializerConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt
similarity index 95%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ArrayInitializerConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt
index 8e5121510c8..a6ea7af10e2 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ArrayInitializerConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayInitializerConversion.kt
@@ -3,14 +3,14 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.PrimitiveType
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.resolve.CollectionLiteralResolver
 
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ArrayOperationsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayOperationsConversion.kt
similarity index 73%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ArrayOperationsConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayOperationsConversion.kt
index 2520b06057a..14108f5e926 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ArrayOperationsConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ArrayOperationsConversion.kt
@@ -8,14 +8,14 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKExpressionStatementImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKFieldAccessExpressionImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKFieldSymbol
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtThrowExpressionImpl
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKExpressionStatementImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKFieldAccessExpressionImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKFieldSymbol
+import org.jetbrains.kotlin.nj2k.tree.impl.JKKtThrowExpressionImpl
 
 
 class ArrayOperationsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssertStatementConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssertStatementConversion.kt
similarity index 71%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssertStatementConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssertStatementConversion.kt
index 6ce96892ca0..cea7ae43278 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssertStatementConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssertStatementConversion.kt
@@ -3,14 +3,14 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.*
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKExpressionStatementImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKJavaOperatorImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKLambdaExpressionImpl
-import org.jetbrains.kotlin.j2k.tree.impl.toKtToken
+import org.jetbrains.kotlin.nj2k.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKExpressionStatementImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKJavaOperatorImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKLambdaExpressionImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.toKtToken
 
 
 class AssertStatementConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
similarity index 88%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
index 9e95b383a05..5eb6f209873 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.utils.addToStdlib.cast
 
 class AssignmentAsExpressionToAlsoConversion(val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementOperatorConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementOperatorConversion.kt
similarity index 83%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementOperatorConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementOperatorConversion.kt
index afe4850aac6..cd5e128dc61 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementOperatorConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementOperatorConversion.kt
@@ -3,14 +3,14 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.JavaTokenType
-import org.jetbrains.kotlin.j2k.copyTreeAndDetach
-import org.jetbrains.kotlin.j2k.tree.JKKtAssignmentStatement
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
-import org.jetbrains.kotlin.j2k.tree.detached
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.copyTreeAndDetach
+import org.jetbrains.kotlin.nj2k.tree.JKKtAssignmentStatement
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.tree.detached
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class AssignmentStatementOperatorConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSimplifyAlsoConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSimplifyAlsoConversion.kt
similarity index 85%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSimplifyAlsoConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSimplifyAlsoConversion.kt
index 17721042a51..f4dc69bd210 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSimplifyAlsoConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSimplifyAlsoConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKExpressionStatementImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKStubExpressionImpl
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKExpressionStatementImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKStubExpressionImpl
 
 class AssignmentStatementSimplifyAlsoConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSimplifyValConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSimplifyValConversion.kt
similarity index 93%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSimplifyValConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSimplifyValConversion.kt
index 21f669b5d0f..225fed7c465 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSimplifyValConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSimplifyValConversion.kt
@@ -3,10 +3,10 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKStubExpressionImpl
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKStubExpressionImpl
 
 class AssignmentStatementSimplifyValConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSplitAlsoConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSplitAlsoConversion.kt
similarity index 94%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSplitAlsoConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSplitAlsoConversion.kt
index 9901bea2d5d..6991c9637c0 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementSplitAlsoConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementSplitAlsoConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.copyTreeAndDetach
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.copyTreeAndDetach
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class AssignmentStatementSplitAlsoConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementValCreationConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementValCreationConversion.kt
similarity index 94%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementValCreationConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementValCreationConversion.kt
index ef9099fbcf2..664349dc9ff 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentStatementValCreationConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/AssignmentStatementValCreationConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class AssignmentStatementValCreationConversion(val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BaseConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BaseConversion.kt
similarity index 87%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BaseConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BaseConversion.kt
index a4bae1b9cf6..e6517b6a462 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BaseConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BaseConversion.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
 
 interface BatchBaseConversion {
     fun runConversion(treeRoots: List<JKTreeElement>, context: ConversionContext): Boolean
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BlockToRunConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BlockToRunConversion.kt
similarity index 76%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BlockToRunConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BlockToRunConversion.kt
index aff182daee3..4985ffd83ce 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BlockToRunConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BlockToRunConversion.kt
@@ -3,15 +3,15 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.JKBlock
-import org.jetbrains.kotlin.j2k.tree.JKBlockStatement
-import org.jetbrains.kotlin.j2k.tree.JKDeclaration
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.JKBlock
+import org.jetbrains.kotlin.nj2k.tree.JKBlockStatement
+import org.jetbrains.kotlin.nj2k.tree.JKDeclaration
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.name.ClassId
 
 class BlockToRunConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BoxedTypeOperationsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BoxedTypeOperationsConversion.kt
similarity index 89%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BoxedTypeOperationsConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BoxedTypeOperationsConversion.kt
index e2637fe152b..00b81ec2e83 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BoxedTypeOperationsConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BoxedTypeOperationsConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKExpressionListImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtCallExpressionImpl
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKExpressionListImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKKtCallExpressionImpl
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 
 class BoxedTypeOperationsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BuiltinMembersConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt
similarity index 97%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BuiltinMembersConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt
index 106ca5be083..8c5f589bcfa 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BuiltinMembersConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.parenthesizeIfBinaryExpression
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.parenthesizeIfBinaryExpression
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class BuiltinMembersConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ClassToObjectPromotionConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ClassToObjectPromotionConversion.kt
similarity index 93%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ClassToObjectPromotionConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ClassToObjectPromotionConversion.kt
index 0bfdc92925f..0760dae73a4 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ClassToObjectPromotionConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ClassToObjectPromotionConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 
 class ClassToObjectPromotionConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/CompositeConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/CompositeConversion.kt
similarity index 94%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/CompositeConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/CompositeConversion.kt
index 30db324e473..8ac3c11d369 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/CompositeConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/CompositeConversion.kt
@@ -3,10 +3,10 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
 
 class BatchPipelineConversion(val conversions: List<BatchBaseConversion>) : BatchBaseConversion {
     override fun runConversion(treeRoots: List<JKTreeElement>, context: ConversionContext): Boolean {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ConstructorConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ConstructorConversion.kt
similarity index 89%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ConstructorConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ConstructorConversion.kt
index e2ab575cc57..ab80b59f5da 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ConstructorConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ConstructorConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class ConstructorConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/DefaultArgumentsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultArgumentsConversion.kt
similarity index 92%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/DefaultArgumentsConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultArgumentsConversion.kt
index 9fb1b8b4014..57b54b75325 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/DefaultArgumentsConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultArgumentsConversion.kt
@@ -3,14 +3,14 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.jvmAnnotation
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKFieldAccessExpressionImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKUniverseMethodSymbol
-import org.jetbrains.kotlin.j2k.tree.impl.psi
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.jvmAnnotation
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKFieldAccessExpressionImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKUniverseMethodSymbol
+import org.jetbrains.kotlin.nj2k.tree.impl.psi
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 class DefaultArgumentsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/DefaultNullabilityToNullableConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultNullabilityToNullableConversion.kt
similarity index 81%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/DefaultNullabilityToNullableConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultNullabilityToNullableConversion.kt
index d82d80a710b..a41a05d3d37 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/DefaultNullabilityToNullableConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/DefaultNullabilityToNullableConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKTypeElementImpl
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKTypeElementImpl
 
 class DefaultNullabilityToNullableConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/EqualsOperatorConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/EqualsOperatorConversion.kt
similarity index 85%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/EqualsOperatorConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/EqualsOperatorConversion.kt
index 4640a668401..689b04c84a7 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/EqualsOperatorConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/EqualsOperatorConversion.kt
@@ -3,15 +3,15 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.equalsExpression
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.equalsExpression
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.lexer.KtTokens
 
 class EqualsOperatorConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldToPropertyConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/FieldToPropertyConversion.kt
similarity index 88%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldToPropertyConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/FieldToPropertyConversion.kt
index 4e1950d0a7e..a5de26464c1 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldToPropertyConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/FieldToPropertyConversion.kt
@@ -3,10 +3,10 @@
      * that can be found in the license/LICENSE.txt file.
      */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class FieldToPropertyConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForConversion.kt
similarity index 98%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForConversion.kt
index 9e02c5f3581..16ca8b69939 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForConversion.kt
@@ -3,13 +3,15 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.*
 import com.intellij.util.IncorrectOperationException
-import org.jetbrains.kotlin.j2k.*
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.j2k.ReferenceSearcher
+import org.jetbrains.kotlin.j2k.hasWriteAccesses
+import org.jetbrains.kotlin.nj2k.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.ClassId
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForInConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForInConversion.kt
similarity index 83%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForInConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForInConversion.kt
index d0f7bbd74ab..7d3db6f448a 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForInConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForInConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.*
-import org.jetbrains.kotlin.j2k.*
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.ClassId
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImplicitCastsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitCastsConversion.kt
similarity index 97%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImplicitCastsConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitCastsConversion.kt
index a4bd8b0ad23..d54ad626faa 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImplicitCastsConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitCastsConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.*
+import org.jetbrains.kotlin.nj2k.*
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 
 class ImplicitCastsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImplicitInitializerConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt
similarity index 95%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImplicitInitializerConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt
index 267ec599dda..981dad1749f 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImplicitInitializerConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.findUsages
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.findUsages
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class ImplicitInitializerConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImportStatementConversion.kt
similarity index 93%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImportStatementConversion.kt
index 5ce76d65b81..c5074bc4f63 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImportStatementConversion.kt
@@ -8,13 +8,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.CommonClassNames
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKImportStatementImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKNameIdentifierImpl
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitorVoid
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKImportStatementImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKNameIdentifierImpl
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitorVoid
 
 
 class ImportStatementConversion : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InnerClassConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InnerClassConversion.kt
similarity index 93%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InnerClassConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InnerClassConversion.kt
index e3bc5e580ba..31022ade38e 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InnerClassConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InnerClassConversion.kt
@@ -3,9 +3,9 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.*
 
 class InnerClassConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InsertDefaultPrimaryConstructorConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InsertDefaultPrimaryConstructorConversion.kt
similarity index 90%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InsertDefaultPrimaryConstructorConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InsertDefaultPrimaryConstructorConversion.kt
index 076abd4d393..08d2a0f0f4b 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InsertDefaultPrimaryConstructorConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InsertDefaultPrimaryConstructorConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 
 class InsertDefaultPrimaryConstructorConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InterfaceWithFieldConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InterfaceWithFieldConversion.kt
similarity index 90%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InterfaceWithFieldConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InterfaceWithFieldConversion.kt
index ffae2e82dcc..966a56427fe 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InterfaceWithFieldConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InterfaceWithFieldConversion.kt
@@ -3,10 +3,10 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.*
-import org.jetbrains.kotlin.j2k.tree.*
+import org.jetbrains.kotlin.nj2k.*
+import org.jetbrains.kotlin.nj2k.tree.*
 
 
 class InterfaceWithFieldConversion : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InternalClassConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InternalClassConversion.kt
similarity index 90%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InternalClassConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InternalClassConversion.kt
index 65f9d3e2377..bf37ebb8b44 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InternalClassConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/InternalClassConversion.kt
@@ -3,9 +3,9 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.*
 
 class InternalClassConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaAnnotationsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaAnnotationsConversion.kt
similarity index 89%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaAnnotationsConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaAnnotationsConversion.kt
index bc5a9fe6300..125b7e459d1 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaAnnotationsConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaAnnotationsConversion.kt
@@ -3,13 +3,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKAnnotationParameterImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKFieldAccessExpressionImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtLiteralExpressionImpl
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKAnnotationParameterImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKFieldAccessExpressionImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKKtLiteralExpressionImpl
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 class JavaAnnotationsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaMethodToKotlinFunctionConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaMethodToKotlinFunctionConversion.kt
similarity index 87%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaMethodToKotlinFunctionConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaMethodToKotlinFunctionConversion.kt
index 0aebf10517f..3fe0696bc80 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaMethodToKotlinFunctionConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaMethodToKotlinFunctionConversion.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.throwAnnotation
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtFunctionImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKTypeElementImpl
-import org.jetbrains.kotlin.j2k.tree.impl.psi
+import org.jetbrains.kotlin.nj2k.throwAnnotation
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKKtFunctionImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKTypeElementImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.psi
 
 class JavaMethodToKotlinFunctionConversion(private val context: ConversionContext) : TransformerBasedConversion() {
     override fun visitTreeElement(element: JKTreeElement) {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaModifiersConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaModifiersConversion.kt
similarity index 91%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaModifiersConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaModifiersConversion.kt
index 602ded50c68..7109b7eb381 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaModifiersConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaModifiersConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.annotationByFqName
-import org.jetbrains.kotlin.j2k.jvmAnnotation
-import org.jetbrains.kotlin.j2k.tree.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.annotationByFqName
+import org.jetbrains.kotlin.nj2k.jvmAnnotation
+import org.jetbrains.kotlin.nj2k.tree.*
 
 class JavaModifiersConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaStandartMethodsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaStandartMethodsConversion.kt
similarity index 93%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaStandartMethodsConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaStandartMethodsConversion.kt
index b822f97aba6..2a9cebdc256 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaStandartMethodsConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaStandartMethodsConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class JavaStandartMethodsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JetbrainsNullableAnnotationsConverter.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt
similarity index 92%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JetbrainsNullableAnnotationsConverter.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt
index f7ef30913bf..32707747f35 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JetbrainsNullableAnnotationsConverter.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKTypeElementImpl
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKTypeElementImpl
 
 
 class JetbrainsNullableAnnotationsConverter(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LabeledStatementConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LabeledStatementConversion.kt
similarity index 82%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LabeledStatementConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LabeledStatementConversion.kt
index 4584326e149..927bbd812be 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LabeledStatementConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LabeledStatementConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.blockStatement
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.blockStatement
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 
 class LabeledStatementConversion : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LiteralConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LiteralConversion.kt
similarity index 67%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LiteralConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LiteralConversion.kt
index 17ff91cd2eb..47d3cf07e54 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LiteralConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LiteralConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.fixLiteral
-import org.jetbrains.kotlin.j2k.tree.JKJavaLiteralExpression
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.fixLiteral
+import org.jetbrains.kotlin.nj2k.tree.JKJavaLiteralExpression
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
 
 class LiteralConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LowerNullabilityInFunctionParametersConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LowerNullabilityInFunctionParametersConversion.kt
similarity index 89%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LowerNullabilityInFunctionParametersConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LowerNullabilityInFunctionParametersConversion.kt
index 3c52bc5473c..497c357a363 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LowerNullabilityInFunctionParametersConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/LowerNullabilityInFunctionParametersConversion.kt
@@ -3,13 +3,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKFieldSymbol
-import org.jetbrains.kotlin.j2k.tree.impl.JKTypeElementImpl
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKFieldSymbol
+import org.jetbrains.kotlin.nj2k.tree.impl.JKTypeElementImpl
 
 class LowerNullabilityInFunctionParametersConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/MainFunctionConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/MainFunctionConversion.kt
similarity index 90%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/MainFunctionConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/MainFunctionConversion.kt
index 755c7ef4ee0..5a47384098e 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/MainFunctionConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/MainFunctionConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.util.collectionUtils.concatInOrder
 
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/MatchBasedConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/MatchBasedConversion.kt
similarity index 82%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/MatchBasedConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/MatchBasedConversion.kt
index 197118cd9ef..bd8aebb3b7a 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/MatchBasedConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/MatchBasedConversion.kt
@@ -3,15 +3,15 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
-import org.jetbrains.kotlin.j2k.tree.impl.JKBranchElementBase
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.tree.impl.JKBranchElementBase
 
 abstract class MatchBasedConversion : SequentialBaseConversion {
 
     fun <R : JKTreeElement, T> applyRecursive(element: R, data: T, func: (JKTreeElement, T) -> JKTreeElement): R  =
-        org.jetbrains.kotlin.j2k.tree.applyRecursive(element, data, ::onElementChanged, func)
+        org.jetbrains.kotlin.nj2k.tree.applyRecursive(element, data, ::onElementChanged, func)
 
     inline fun <R : JKTreeElement> applyRecursive(element: R, crossinline func: (JKTreeElement) -> JKTreeElement): R {
         return applyRecursive(element, null) { it, _ -> func(it) }
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModalityConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt
similarity index 91%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModalityConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt
index 5ac5b7a41f7..143041c2643 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModalityConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt
@@ -3,13 +3,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiMethod
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.psi
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.psi
 
 class ModalityConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/NullableQualifierConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/NullableQualifierConversion.kt
similarity index 87%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/NullableQualifierConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/NullableQualifierConversion.kt
index 290681434ab..5e444602bcf 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/NullableQualifierConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/NullableQualifierConversion.kt
@@ -3,13 +3,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.bangedBangedExpr
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.bangedBangedExpr
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class NullableQualifierConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/OperatorExpressionConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/OperatorExpressionConversion.kt
similarity index 95%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/OperatorExpressionConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/OperatorExpressionConversion.kt
index 3a1f695a99c..38a86694e05 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/OperatorExpressionConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/OperatorExpressionConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.JavaTokenType
-import org.jetbrains.kotlin.j2k.*
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.lexer.KtTokens
 
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ParameterModificationInMethodCallsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ParameterModificationInMethodCallsConversion.kt
similarity index 77%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ParameterModificationInMethodCallsConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ParameterModificationInMethodCallsConversion.kt
index 08fbb33b055..dae7c8b721f 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ParameterModificationInMethodCallsConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ParameterModificationInMethodCallsConversion.kt
@@ -3,14 +3,14 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.asAssignmentFromTarget
-import org.jetbrains.kotlin.j2k.findUsages
-import org.jetbrains.kotlin.j2k.hasWritableUsages
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.asAssignmentFromTarget
+import org.jetbrains.kotlin.nj2k.findUsages
+import org.jetbrains.kotlin.nj2k.hasWritableUsages
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 
 class ParameterModificationInMethodCallsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PolyadicExpressionConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PolyadicExpressionConversion.kt
similarity index 86%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PolyadicExpressionConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PolyadicExpressionConversion.kt
index fb14ce6a7b7..247d96b2453 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PolyadicExpressionConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PolyadicExpressionConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.kotlinBinaryExpression
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.kotlinBinaryExpression
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 
 class PolyadicExpressionConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PrimaryConstructorDetectConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrimaryConstructorDetectConversion.kt
similarity index 90%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PrimaryConstructorDetectConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrimaryConstructorDetectConversion.kt
index 9a8f19e4d98..ec2e9c467c4 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PrimaryConstructorDetectConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrimaryConstructorDetectConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtInitDeclarationImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtPrimaryConstructorImpl
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKKtInitDeclarationImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKKtPrimaryConstructorImpl
 
 class PrimaryConstructorDetectConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PrintlnConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrintlnConversion.kt
similarity index 85%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PrintlnConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrintlnConversion.kt
index 0b9bcef057f..e0c5cbdf871 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PrintlnConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrintlnConversion.kt
@@ -3,13 +3,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtCallExpressionImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKMethodSymbol
-import org.jetbrains.kotlin.j2k.tree.impl.psi
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.JKKtCallExpressionImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKMethodSymbol
+import org.jetbrains.kotlin.nj2k.tree.impl.psi
 import org.jetbrains.kotlin.name.ClassId
 
 // TODO: Full special methods conversion
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/RecursiveApplicableConversionBase.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/RecursiveApplicableConversionBase.kt
similarity index 84%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/RecursiveApplicableConversionBase.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/RecursiveApplicableConversionBase.kt
index e55b698ae5c..4486b78bbdf 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/RecursiveApplicableConversionBase.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/RecursiveApplicableConversionBase.kt
@@ -3,10 +3,10 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
 
 abstract class RecursiveApplicableConversionBase : MatchBasedConversion() {
     override fun onElementChanged(new: JKTreeElement, old: JKTreeElement) {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SortClassMembersConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SortClassMembersConversion.kt
similarity index 86%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SortClassMembersConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SortClassMembersConversion.kt
index 00c61aa55af..0b09ff0b3ff 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SortClassMembersConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SortClassMembersConversion.kt
@@ -3,9 +3,9 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.*
 
 //TODO temporary
 class SortClassMembersConversion : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/StaticsToCompanionExtractConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/StaticsToCompanionExtractConversion.kt
similarity index 85%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/StaticsToCompanionExtractConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/StaticsToCompanionExtractConversion.kt
index e345371bac8..d3d9428ee97 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/StaticsToCompanionExtractConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/StaticsToCompanionExtractConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.getOrCreateCompainonObject
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.getOrCreateCompainonObject
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 class StaticsToCompanionExtractConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SwitchStatementConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SwitchStatementConversion.kt
similarity index 94%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SwitchStatementConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SwitchStatementConversion.kt
index 0f3f918d9f9..6a063649d28 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SwitchStatementConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SwitchStatementConversion.kt
@@ -3,18 +3,18 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.controlFlow.ControlFlowFactory
 import com.intellij.psi.controlFlow.ControlFlowUtil
 import com.intellij.psi.controlFlow.LocalsOrMyInstanceFieldsControlFlowPolicy
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.blockStatement
-import org.jetbrains.kotlin.j2k.copyTreeAndDetach
-import org.jetbrains.kotlin.j2k.runExpression
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.blockStatement
+import org.jetbrains.kotlin.nj2k.copyTreeAndDetach
+import org.jetbrains.kotlin.nj2k.runExpression
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 
 class SwitchStatementConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SynchronizedStatementConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SynchronizedStatementConversion.kt
similarity index 85%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SynchronizedStatementConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SynchronizedStatementConversion.kt
index 760f57fd566..07421524445 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/SynchronizedStatementConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SynchronizedStatementConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.*
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 
 class SynchronizedStatementConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ThrowStatementConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ThrowStatementConversion.kt
similarity index 57%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ThrowStatementConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ThrowStatementConversion.kt
index 77e8aecc176..51b059d9f39 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ThrowStatementConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ThrowStatementConversion.kt
@@ -3,14 +3,14 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.tree.JKExpressionStatement
-import org.jetbrains.kotlin.j2k.tree.JKJavaThrowStatement
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
-import org.jetbrains.kotlin.j2k.tree.detached
-import org.jetbrains.kotlin.j2k.tree.impl.JKExpressionStatementImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtThrowExpressionImpl
+import org.jetbrains.kotlin.nj2k.tree.JKExpressionStatement
+import org.jetbrains.kotlin.nj2k.tree.JKJavaThrowStatement
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.tree.detached
+import org.jetbrains.kotlin.nj2k.tree.impl.JKExpressionStatementImpl
+import org.jetbrains.kotlin.nj2k.tree.impl.JKKtThrowExpressionImpl
 
 
 class ThrowStatementConversion : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TransformerBasedConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TransformerBasedConversion.kt
similarity index 81%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TransformerBasedConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TransformerBasedConversion.kt
index b75d07b8f74..5a2957dc79d 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TransformerBasedConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TransformerBasedConversion.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitorVoid
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitorVoid
 
 abstract class TransformerBasedConversion : SequentialBaseConversion, JKVisitorVoid {
     protected var somethingChanged = false
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TryStatementConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TryStatementConversion.kt
similarity index 94%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TryStatementConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TryStatementConversion.kt
index 3265f715aa2..5f09bb56882 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TryStatementConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TryStatementConversion.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
-import org.jetbrains.kotlin.j2k.*
+import org.jetbrains.kotlin.nj2k.*
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 
 class TryStatementConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeMappingConversion.kt
similarity index 97%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeMappingConversion.kt
index b2bbdc53011..30ea4cdc30f 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeMappingConversion.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
@@ -12,10 +12,11 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.j2k.*
+import org.jetbrains.kotlin.nj2k.*
 import org.jetbrains.kotlin.j2k.ast.Mutability
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeParametersNullabilityConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeParametersNullabilityConversion.kt
similarity index 94%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeParametersNullabilityConversion.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeParametersNullabilityConversion.kt
index 5e8f7dfd9a8..00e68a19628 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeParametersNullabilityConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeParametersNullabilityConversion.kt
@@ -3,11 +3,11 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 
 class TypeParametersNullabilityConversion : RecursiveApplicableConversionBase() {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/resolveUtil.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt
similarity index 90%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/resolveUtil.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt
index e639a876666..9bda02b8ee2 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/resolveUtil.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt
@@ -3,13 +3,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.conversions
+package org.jetbrains.kotlin.nj2k.conversions
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiPolyVariantReference
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
-import org.jetbrains.kotlin.j2k.tree.impl.psi
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.tree.impl.psi
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
 import org.jetbrains.kotlin.psi.KtImportDirective
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/expressions.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/expressions.kt
similarity index 98%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/expressions.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/expressions.kt
index 827211972d7..e69cd257daa 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/expressions.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/expressions.kt
@@ -3,18 +3,18 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.tree.TokenSet
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.conversions.RecursiveApplicableConversionBase
-import org.jetbrains.kotlin.j2k.conversions.multiResolveFqName
-import org.jetbrains.kotlin.j2k.conversions.resolveFqName
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.conversions.RecursiveApplicableConversionBase
+import org.jetbrains.kotlin.nj2k.conversions.multiResolveFqName
+import org.jetbrains.kotlin.nj2k.conversions.resolveFqName
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.lexer.KtSingleValueToken
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.ClassId
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/psiUtils.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/psiUtils.kt
similarity index 94%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/psiUtils.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/psiUtils.kt
index 1ea144b09c9..e1a176eac45 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/psiUtils.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/psiUtils.kt
@@ -3,12 +3,13 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.codeInsight.generation.GenerateEqualsHelper.getEqualsSignature
 import com.intellij.psi.*
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.util.MethodSignatureUtil
+import org.jetbrains.kotlin.j2k.isNullLiteral
 
 //copied from old j2k
 fun canKeepEqEq(left: PsiExpression, right: PsiExpression?): Boolean {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/DebugTreePrinter.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/DebugTreePrinter.kt
similarity index 96%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/DebugTreePrinter.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/DebugTreePrinter.kt
index f859c7f8914..1591f87b786 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/DebugTreePrinter.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/DebugTreePrinter.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.tree
+package org.jetbrains.kotlin.nj2k.tree
 
-import org.jetbrains.kotlin.j2k.tree.impl.*
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitorVoid
+import org.jetbrains.kotlin.nj2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitorVoid
 import org.jetbrains.kotlin.utils.Printer
 
 private class DebugTreePrinter : JKVisitorVoid {
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/base.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/base.kt
similarity index 94%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/base.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/base.kt
index fdc16f38993..9e9bb22a47d 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/base.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/base.kt
@@ -3,12 +3,12 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.tree.impl
+package org.jetbrains.kotlin.nj2k.tree.impl
 
-import org.jetbrains.kotlin.j2k.tree.JKBranchElement
-import org.jetbrains.kotlin.j2k.tree.JKElement
-import org.jetbrains.kotlin.j2k.tree.JKTreeElement
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitor
+import org.jetbrains.kotlin.nj2k.tree.JKBranchElement
+import org.jetbrains.kotlin.nj2k.tree.JKElement
+import org.jetbrains.kotlin.nj2k.tree.JKTreeElement
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitor
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/j.kt
similarity index 98%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/j.kt
index 03b43f12429..4b0dc66a17b 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/j.kt
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.tree.impl
+package org.jetbrains.kotlin.nj2k.tree.impl
 
 import com.intellij.psi.JavaTokenType
 import com.intellij.psi.impl.source.tree.ElementType.OPERATION_BIT_SET
 import com.intellij.psi.tree.IElementType
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.ast.Parameter
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.JKLiteralExpression.LiteralType.*
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitor
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.JKLiteralExpression.LiteralType.*
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitor
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/jk.kt
similarity index 98%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/jk.kt
index 184c9051365..e8003abf91a 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/jk.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.tree.impl
+package org.jetbrains.kotlin.nj2k.tree.impl
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.j2k.JKSymbolProvider
+import org.jetbrains.kotlin.nj2k.JKSymbolProvider
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.conversions.resolveFqName
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.JKLiteralExpression.LiteralType
-import org.jetbrains.kotlin.j2k.tree.JKLiteralExpression.LiteralType.BOOLEAN
-import org.jetbrains.kotlin.j2k.tree.JKLiteralExpression.LiteralType.NULL
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitor
+import org.jetbrains.kotlin.nj2k.conversions.resolveFqName
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.JKLiteralExpression.LiteralType
+import org.jetbrains.kotlin.nj2k.tree.JKLiteralExpression.LiteralType.BOOLEAN
+import org.jetbrains.kotlin.nj2k.tree.JKLiteralExpression.LiteralType.NULL
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitor
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtNamedFunction
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/k.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/k.kt
similarity index 98%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/k.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/k.kt
index 347cfd6a7a2..d0016d4f978 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/k.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/k.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.tree.impl
+package org.jetbrains.kotlin.nj2k.tree.impl
 
 import com.intellij.psi.JavaTokenType
 import org.jetbrains.kotlin.j2k.ast.Nullability
 import com.intellij.psi.tree.IElementType
-import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitor
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitor
 import org.jetbrains.kotlin.lexer.KtSingleValueToken
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
 import org.jetbrains.kotlin.utils.addToStdlib.cast
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/symbols.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt
similarity index 97%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/symbols.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt
index 01b3298c19d..ee73dac163f 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/symbols.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.tree.impl
+package org.jetbrains.kotlin.nj2k.tree.impl
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiMethod
@@ -14,11 +14,11 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
 import org.jetbrains.kotlin.idea.search.declarationsSearch.findDeepestSuperMethodsKotlinAware
 import org.jetbrains.kotlin.idea.search.declarationsSearch.findDeepestSuperMethodsNoWrapping
-import org.jetbrains.kotlin.j2k.JKSymbolProvider
+import org.jetbrains.kotlin.nj2k.JKSymbolProvider
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.conversions.parentOfType
-import org.jetbrains.kotlin.j2k.conversions.resolveFqName
-import org.jetbrains.kotlin.j2k.tree.*
+import org.jetbrains.kotlin.nj2k.conversions.parentOfType
+import org.jetbrains.kotlin.nj2k.conversions.resolveFqName
+import org.jetbrains.kotlin.nj2k.tree.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
 import org.jetbrains.kotlin.psi.KtClassOrObject
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/j.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/j.kt
similarity index 97%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/j.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/j.kt
index cc362d53786..35072d2593f 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/j.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/j.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.tree
+package org.jetbrains.kotlin.nj2k.tree
 
 import org.jetbrains.kotlin.idea.search.usagesSearch.constructor
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 
 interface JKField : JKVariable, JKVisibilityOwner, JKMutabilityOwner, JKModalityOwner, JKExtraModifiersOwner, JKAnnotationListOwner
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/jk.kt
similarity index 97%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/jk.kt
index 40d9a643dd5..16a5d69f5a1 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/jk.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.tree
+package org.jetbrains.kotlin.nj2k.tree
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.j2k.tree.impl.JKClassSymbol
-import org.jetbrains.kotlin.j2k.tree.impl.JKFieldSymbol
-import org.jetbrains.kotlin.j2k.tree.impl.JKMethodSymbol
-import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitor
+import org.jetbrains.kotlin.nj2k.tree.impl.JKClassSymbol
+import org.jetbrains.kotlin.nj2k.tree.impl.JKFieldSymbol
+import org.jetbrains.kotlin.nj2k.tree.impl.JKMethodSymbol
+import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitor
 
 interface JKTreeElement : JKElement {
     fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/k.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/k.kt
similarity index 96%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/k.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/k.kt
index 4d5e76f7b12..ff41e3efc26 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/k.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/k.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.tree
+package org.jetbrains.kotlin.nj2k.tree
 
-import org.jetbrains.kotlin.j2k.tree.impl.JKMethodSymbol
+import org.jetbrains.kotlin.nj2k.tree.impl.JKMethodSymbol
 
 interface JKKtGetterOrSetter : JKTreeElement, JKVisibilityOwner, JKBranchElement {
     var body: JKStatement
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/markers.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/markers.kt
similarity index 96%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/markers.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/markers.kt
index 12d796653c9..57c5502b565 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/markers.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/markers.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k.tree
+package org.jetbrains.kotlin.nj2k.tree
 
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.tree.impl.JKBranchElementBase
-import org.jetbrains.kotlin.j2k.tree.impl.JKClassSymbol
+import org.jetbrains.kotlin.nj2k.tree.impl.JKBranchElementBase
+import org.jetbrains.kotlin.nj2k.tree.impl.JKClassSymbol
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 import kotlin.reflect.KProperty0
 import kotlin.jvm.internal.CallableReference
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/types.kt
similarity index 98%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/types.kt
index d02b04c6039..8465c6397c3 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/types.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k.tree
+package org.jetbrains.kotlin.nj2k.tree
 
 import com.intellij.psi.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
@@ -11,13 +11,12 @@ import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaClassDescriptor
-import org.jetbrains.kotlin.j2k.ConversionContext
-import org.jetbrains.kotlin.j2k.JKSymbolProvider
-import org.jetbrains.kotlin.j2k.ast.ArrayType
+import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.JKSymbolProvider
 import org.jetbrains.kotlin.j2k.ast.Nullability
-import org.jetbrains.kotlin.j2k.conversions.resolveFqName
-import org.jetbrains.kotlin.j2k.kotlinTypeByName
-import org.jetbrains.kotlin.j2k.tree.impl.*
+import org.jetbrains.kotlin.nj2k.conversions.resolveFqName
+import org.jetbrains.kotlin.nj2k.kotlinTypeByName
+import org.jetbrains.kotlin.nj2k.tree.impl.*
 import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.*
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/GenerateJKTreeVisitorAndTransformer.kts b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/GenerateJKTreeVisitorAndTransformer.kts
similarity index 95%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/GenerateJKTreeVisitorAndTransformer.kts
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/GenerateJKTreeVisitorAndTransformer.kts
index 310e1f28d2e..e987a3b3ab1 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/GenerateJKTreeVisitorAndTransformer.kts
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/GenerateJKTreeVisitorAndTransformer.kts
@@ -80,7 +80,7 @@ fun genVisitors(commonData: List<InterfaceData>, uncommonData: List<InterfaceDat
 
     val interfaceData = commonData + uncommonData
 
-    val pkg = "package org.jetbrains.kotlin.j2k.tree.visitors"
+    val pkg = "package org.jetbrains.kotlin.nj2k.tree.visitors"
 
     fun String.firstCommonInterfaceName(): String {
         val data = interfaceData.find { it.name == this }!!
@@ -92,7 +92,7 @@ fun genVisitors(commonData: List<InterfaceData>, uncommonData: List<InterfaceDat
     File(JK_OUT_ROOT, "$visitorName.kt").writeText(buildString {
         appendln(pkg)
         appendln()
-        appendln("import org.jetbrains.kotlin.j2k.tree.*")
+        appendln("import org.jetbrains.kotlin.nj2k.tree.*")
         appendln()
         appendln("interface $visitorName<out R, in D> {")
         interfaceData.joinTo(this, separator = "\n") { (name, ext) ->
@@ -111,7 +111,7 @@ fun genVisitors(commonData: List<InterfaceData>, uncommonData: List<InterfaceDat
     File(JK_OUT_ROOT, "${visitorName}Void.kt").writeText(buildString {
         appendln(pkg)
         appendln()
-        appendln("import org.jetbrains.kotlin.j2k.tree.*")
+        appendln("import org.jetbrains.kotlin.nj2k.tree.*")
         appendln()
 
         appendln("interface ${visitorName}Void : $visitorName<Unit, Nothing?> {")
@@ -132,7 +132,7 @@ fun genVisitors(commonData: List<InterfaceData>, uncommonData: List<InterfaceDat
     /*File(JK_OUT_ROOT, "$transformerName.kt").writeText(buildString {
         appendln(pkg)
         appendln()
-        appendln("import org.jetbrains.kotlin.j2k.tree.*")
+        appendln("import org.jetbrains.kotlin.nj2k.tree.*")
         appendln()
 
         appendln("interface $transformerName<in D> : JKVisitor<JKTreeElement, D> {")
@@ -158,7 +158,7 @@ fun genVisitors(commonData: List<InterfaceData>, uncommonData: List<InterfaceDat
     File(JK_OUT_ROOT, "${transformerName}Void.kt").writeText(buildString {
         appendln(pkg)
         appendln()
-        appendln("import org.jetbrains.kotlin.j2k.tree.*")
+        appendln("import org.jetbrains.kotlin.nj2k.tree.*")
         appendln()
 
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitor.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/JKVisitor.kt
similarity index 99%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitor.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/JKVisitor.kt
index d2be20b1a05..aed61a044b3 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitor.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/JKVisitor.kt
@@ -1,6 +1,6 @@
-package org.jetbrains.kotlin.j2k.tree.visitors
+package org.jetbrains.kotlin.nj2k.tree.visitors
 
-import org.jetbrains.kotlin.j2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.*
 
 interface JKVisitor<out R, in D> {
     fun visitTreeElement(treeElement: JKTreeElement, data: D): R 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitorVoid.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/JKVisitorVoid.kt
similarity index 99%
rename from j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitorVoid.kt
rename to nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/JKVisitorVoid.kt
index ccc92a2cb40..4e735325fb5 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitorVoid.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/visitors/JKVisitorVoid.kt
@@ -1,6 +1,6 @@
-package org.jetbrains.kotlin.j2k.tree.visitors
+package org.jetbrains.kotlin.nj2k.tree.visitors
 
-import org.jetbrains.kotlin.j2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.*
 
 interface JKVisitorVoid : JKVisitor<Unit, Nothing?> {
     fun visitTreeElement(treeElement: JKTreeElement) 
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt
similarity index 95%
rename from j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt
rename to nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt
index 01b58509a73..4e8b7f71e1d 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 abstract class AbstractNewJavaToKotlinConverterNewSingleFileTest : AbstractNewJavaToKotlinConverterSingleFileTest()
\ No newline at end of file
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
similarity index 80%
rename from j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
rename to nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
index f8a42aac9dd..3983edb57e8 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.idea.j2k.IdeaNewJavaToKotlinServices
-import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor
-import org.jetbrains.kotlin.idea.j2k.NewJ2KPostProcessingRegistrarImpl
+import org.jetbrains.kotlin.idea.nj2k.NewJ2kPostProcessor
+import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest
+import org.jetbrains.kotlin.j2k.ConverterSettings
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import java.io.File
 
@@ -29,14 +29,14 @@ abstract class AbstractNewJavaToKotlinConverterSingleFileTest : AbstractJavaToKo
     override fun fileToKotlin(text: String, settings: ConverterSettings, project: Project): String {
         val file = createJavaFile(text)
         val factory = KtPsiFactory(project, true)
-        val postProcessor = J2kPostProcessor(true, NewJ2KPostProcessingRegistrarImpl)
+        val postProcessor = NewJ2kPostProcessor(true, settings)
 
 
         return NewJavaToKotlinConverter(project, settings, IdeaNewJavaToKotlinServices).filesToKotlin(listOf(file)).map {
             factory.createFileWithLightClassSupport("Dummy.kt", it, file)
         }.map {
             CommandProcessor.getInstance().runUndoTransparentAction {
-                postProcessor.doAdditionalProcessing(it, null, settings)
+                postProcessor.doAdditionalProcessing(it, null)
             }
             it.text
         }.single()
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterStructureSingleFileTest.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterStructureSingleFileTest.kt
similarity index 97%
rename from j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterStructureSingleFileTest.kt
rename to nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterStructureSingleFileTest.kt
index e96554d3c2c..3dc9de556aa 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterStructureSingleFileTest.kt
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterStructureSingleFileTest.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.google.gson.Gson
 import com.intellij.openapi.util.registry.Registry
@@ -14,7 +14,7 @@ import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.concurrent.thread
-import org.jetbrains.kotlin.j2k.NewJ2KTestView.stat
+import org.jetbrains.kotlin.nj2k.NewJ2KTestView.stat
 
 
 abstract class AbstractNewJavaToKotlinConverterStructureSingleFileTest : AbstractNewJavaToKotlinConverterSingleFileTest() {
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/NewJ2KTestView.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJ2KTestView.kt
similarity index 97%
rename from j2k/tests/org/jetbrains/kotlin/j2k/NewJ2KTestView.kt
rename to nj2k/tests/org/jetbrains/kotlin/nj2k/NewJ2KTestView.kt
index 6544040c291..24cae239c6c 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/NewJ2KTestView.kt
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJ2KTestView.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.icons.AllIcons
 import com.intellij.ui.components.JBLabel
@@ -12,9 +12,9 @@ import com.intellij.ui.components.JBScrollPane
 import com.intellij.ui.components.JBTabbedPane
 import com.intellij.uiDesigner.core.GridConstraints
 import com.intellij.uiDesigner.core.GridLayoutManager
-import org.jetbrains.kotlin.j2k.AbstractNewJavaToKotlinConverterStructureSingleFileTest.Companion.TestResults
-import org.jetbrains.kotlin.j2k.AbstractNewJavaToKotlinConverterStructureSingleFileTest.Companion.dateFormat
-import org.jetbrains.kotlin.j2k.AbstractNewJavaToKotlinConverterStructureSingleFileTest.Companion.loadTestResults
+import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinConverterStructureSingleFileTest.Companion.TestResults
+import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinConverterStructureSingleFileTest.Companion.dateFormat
+import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinConverterStructureSingleFileTest.Companion.loadTestResults
 import java.awt.Component
 import java.awt.Graphics
 import java.awt.event.ActionEvent
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java
similarity index 98%
rename from j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java
rename to nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java
index cf7f6b2b3d3..ce2bdae1a7b 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k;
+package org.jetbrains.kotlin.nj2k;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterSingleFileTestGenerated.java b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
similarity index 99%
rename from j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
rename to nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
index a6e07066b11..3d43280d3a5 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k;
+package org.jetbrains.kotlin.nj2k;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterStructureSingleFileTestGenerated.java b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterStructureSingleFileTestGenerated.java
similarity index 99%
rename from j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterStructureSingleFileTestGenerated.java
rename to nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterStructureSingleFileTestGenerated.java
index 4af776ab698..75569955c3f 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterStructureSingleFileTestGenerated.java
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterStructureSingleFileTestGenerated.java
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k;
+package org.jetbrains.kotlin.nj2k;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/StructuralPsiCompare.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
similarity index 96%
rename from j2k/tests/org/jetbrains/kotlin/j2k/StructuralPsiCompare.kt
rename to nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
index 171093051c7..dd60072c019 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/StructuralPsiCompare.kt
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.j2k
+package org.jetbrains.kotlin.nj2k
 
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
diff --git a/settings.gradle b/settings.gradle
index 77dbf5329dc..a31e29add59 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -94,6 +94,8 @@ include ":kotlin-build-common",
         ":idea-runner",
         ":idea:eval4j",
         ":j2k",
+        ":nj2k",
+        ":nj2k:nj2k-services",
         ":plugins:lint",
         ":plugins:kapt3-idea",
         ":plugins:android-extensions-compiler",