From 378d04e301c70936571aa9e1c96b867561a9ef79 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 9 Jan 2015 18:52:15 +0300
Subject: [PATCH] Rename jet -> kotlin in frontend: cfg

org.jetbrains.jet.lang.cfg, org.jetbrains.jet.cfg -> org.jetbrains.kotlin.cfg
---
 .../kotlin/codegen/TailRecursionCodegen.java  |  2 +-
 .../binding/CodegenAnnotatingVisitor.java     |  2 +-
 .../jet/lang/resolve/BindingContext.java      |  2 +-
 .../jet/lang/resolve/ControlFlowAnalyzer.java |  2 +-
 .../{jet/lang => kotlin}/cfg/BlockInfo.java   |  2 +-
 .../cfg/BreakableBlockInfo.java               |  2 +-
 .../cfg/GenerationTrigger.java                |  2 +-
 .../cfg/JetControlFlowBuilder.java            | 10 ++--
 .../cfg/JetControlFlowBuilderAdapter.java     | 10 ++--
 .../cfg/JetControlFlowProcessor.java          | 12 ++--
 .../cfg/JetFlowInformationProvider.java       | 58 +++++++++----------
 .../{jet/lang => kotlin}/cfg/Label.java       |  2 +-
 .../{jet/lang => kotlin}/cfg/LoopInfo.java    |  2 +-
 .../cfg/PseudocodeTraverser.kt                | 14 ++---
 .../cfg/PseudocodeVariableDataCollector.kt    | 15 +++--
 .../cfg/PseudocodeVariablesData.java          | 26 ++++-----
 .../cfg/TailRecursionDetector.java            | 20 +++----
 .../cfg/TailRecursionKind.java                |  2 +-
 .../lang => kotlin}/cfg/UnreachableCode.kt    |  4 +-
 .../{jet/lang => kotlin}/cfg/WhenChecker.java |  2 +-
 .../JetControlFlowInstructionsGenerator.java  | 14 ++---
 .../cfg/pseudocode/PseudoValue.kt             |  6 +-
 .../cfg/pseudocode/PseudoValueImpl.kt         |  6 +-
 .../cfg/pseudocode/Pseudocode.java            | 12 ++--
 .../cfg/pseudocode/PseudocodeImpl.java        | 48 +++++++--------
 .../cfg/pseudocode/PseudocodeUtil.java        | 12 ++--
 .../cfg/pseudocode/TypePredicate.kt           |  2 +-
 .../pseudocode/instructions/Instruction.kt    |  9 ++-
 .../instructions/InstructionImpl.kt           | 10 ++--
 .../instructions/InstructionVisitor.kt        | 10 ++--
 .../InstructionVisitorWithResult.kt           | 10 ++--
 .../instructions/InstructionWithNext.kt       |  2 +-
 .../instructions/JetElementInstruction.kt     |  2 +-
 .../instructions/JetElementInstructionImpl.kt |  2 +-
 .../pseudocode/instructions/LexicalScope.kt   |  2 +-
 .../eval/InstructionWithReceivers.kt          |  8 +--
 .../instructions/eval/InstructionWithValue.kt |  8 +--
 .../eval/LoadUnitValueInstruction.kt          | 12 ++--
 .../instructions/eval/accessInstructions.kt   | 18 +++---
 .../eval/operationInstructions.kt             | 20 +++----
 .../jumps/AbstractJumpInstruction.kt          | 12 ++--
 .../jumps/ConditionalJumpInstruction.kt       | 14 ++---
 .../instructions/jumps/JumpInstruction.kt     |  6 +-
 .../jumps/NondeterministicJumpInstruction.kt  | 18 +++---
 .../jumps/ReturnNoValueInstruction.kt         | 12 ++--
 .../jumps/ReturnValueInstruction.kt           | 12 ++--
 .../jumps/ThrowExceptionInstruction.kt        | 14 ++---
 .../jumps/UnconditionalJumpInstruction.kt     |  8 +--
 .../LocalFunctionDeclarationInstruction.kt    | 18 +++---
 .../instructions/special/MarkInstruction.kt   | 12 ++--
 .../special/SubroutineEnterInstruction.kt     | 14 ++---
 .../special/SubroutineExitInstruction.kt      | 14 ++---
 .../special/SubroutineSinkInstruction.kt      | 14 ++---
 .../special/VariableDeclarationInstruction.kt | 14 ++---
 .../cfg/pseudocode/pseudocodeUtil.kt          | 10 ++--
 .../cfg/AbstractControlFlowTest.java          |  8 +--
 .../cfg/AbstractDataFlowTest.java             | 19 +++---
 .../cfg/AbstractPseudoValueTest.kt            | 14 ++---
 .../cfg/AbstractPseudocodeTest.java           | 14 ++---
 .../cfg/CFGraphToDotFilePrinter.java          | 44 +++++++-------
 .../cfg/ControlFlowTestGenerated.java         |  2 +-
 .../cfg/DataFlowTestGenerated.java            |  2 +-
 .../cfg/PseudoValueTestGenerated.java         |  2 +-
 .../kotlin/generators/tests/GenerateTests.kt  |  6 +-
 .../lang/resolve/lazy/ElementResolver.java    |  2 +-
 .../extractableAnalysisUtil.kt                | 18 +++---
 66 files changed, 361 insertions(+), 366 deletions(-)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/BlockInfo.java (94%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/BreakableBlockInfo.java (97%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/GenerationTrigger.java (94%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/JetControlFlowBuilder.java (95%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/JetControlFlowBuilderAdapter.java (97%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/JetControlFlowProcessor.java (99%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/JetFlowInformationProvider.java (95%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/Label.java (95%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/LoopInfo.java (97%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/PseudocodeTraverser.kt (93%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/PseudocodeVariableDataCollector.kt (90%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/PseudocodeVariablesData.java (94%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/TailRecursionDetector.java (74%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/TailRecursionKind.java (96%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/UnreachableCode.kt (98%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/WhenChecker.java (99%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/JetControlFlowInstructionsGenerator.java (98%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/PseudoValue.kt (87%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/PseudoValueImpl.kt (90%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/Pseudocode.java (77%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/PseudocodeImpl.java (90%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/PseudocodeUtil.java (87%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/TypePredicate.kt (98%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/Instruction.kt (83%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/InstructionImpl.kt (89%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/InstructionVisitor.kt (91%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt (92%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/InstructionWithNext.kt (94%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/JetElementInstruction.kt (92%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/JetElementInstructionImpl.kt (94%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/LexicalScope.kt (95%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt (80%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/eval/InstructionWithValue.kt (77%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt (73%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/eval/accessInstructions.kt (88%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/eval/operationInstructions.kt (91%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt (79%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt (83%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/jumps/JumpInstruction.kt (77%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt (82%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt (79%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt (81%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt (80%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt (88%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt (76%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/special/MarkInstruction.kt (75%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt (72%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt (78%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt (75%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt (78%)
 rename compiler/frontend/src/org/jetbrains/{jet/lang => kotlin}/cfg/pseudocode/pseudocodeUtil.kt (96%)
 rename compiler/tests/org/jetbrains/{jet => kotlin}/cfg/AbstractControlFlowTest.java (95%)
 rename compiler/tests/org/jetbrains/{jet => kotlin}/cfg/AbstractDataFlowTest.java (86%)
 rename compiler/tests/org/jetbrains/{jet => kotlin}/cfg/AbstractPseudoValueTest.kt (91%)
 rename compiler/tests/org/jetbrains/{jet => kotlin}/cfg/AbstractPseudocodeTest.java (95%)
 rename compiler/tests/org/jetbrains/{jet => kotlin}/cfg/CFGraphToDotFilePrinter.java (79%)
 rename compiler/tests/org/jetbrains/{jet => kotlin}/cfg/ControlFlowTestGenerated.java (99%)
 rename compiler/tests/org/jetbrains/{jet => kotlin}/cfg/DataFlowTestGenerated.java (99%)
 rename compiler/tests/org/jetbrains/{jet => kotlin}/cfg/PseudoValueTestGenerated.java (99%)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java
index 8ab17a2c649..0a592caf3ba 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java
@@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
 import org.jetbrains.jet.lang.psi.ValueArgument;
-import org.jetbrains.jet.lang.cfg.TailRecursionKind;
+import org.jetbrains.kotlin.cfg.TailRecursionKind;
 import org.jetbrains.jet.lang.resolve.calls.model.*;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
index a37b28d5185..2e00045dca9 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.codegen.SamType;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil;
 import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping;
-import org.jetbrains.jet.lang.cfg.WhenChecker;
+import org.jetbrains.kotlin.cfg.WhenChecker;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl;
 import org.jetbrains.jet.lang.psi.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
index 617562d3744..b8e3cdc80e1 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.cfg.TailRecursionKind;
+import org.jetbrains.kotlin.cfg.TailRecursionKind;
 import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemCompleter;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java
index 52cf9cd30ee..689cb1bdf94 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java
@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider;
+import org.jetbrains.kotlin.cfg.JetFlowInformationProvider;
 import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/BlockInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/BlockInfo.java
similarity index 94%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/BlockInfo.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/BlockInfo.java
index ee56939295c..a078e4e0552 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/BlockInfo.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/BlockInfo.java
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 public abstract class BlockInfo {}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/BreakableBlockInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/BreakableBlockInfo.java
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/BreakableBlockInfo.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/BreakableBlockInfo.java
index 09ccd5584ab..157c8e3ac29 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/BreakableBlockInfo.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/BreakableBlockInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.google.common.collect.Sets;
 import org.jetbrains.jet.lang.psi.JetElement;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/GenerationTrigger.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/GenerationTrigger.java
similarity index 94%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/GenerationTrigger.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/GenerationTrigger.java
index 7a09860a163..8a3f6f373e9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/GenerationTrigger.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/GenerationTrigger.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 public interface GenerationTrigger {
     void generate();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java
similarity index 95%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java
index 32b0ed7eb4d..9faab40b70d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilder.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue;
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode;
-import org.jetbrains.jet.lang.cfg.pseudocode.TypePredicate;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.*;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue;
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode;
+import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java
index fe533019be0..6824a3ed64e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowBuilderAdapter.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue;
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode;
-import org.jetbrains.jet.lang.cfg.pseudocode.TypePredicate;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.*;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue;
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode;
+import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
similarity index 99%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
index e680245b3a2..2f1fd86a01f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
@@ -27,10 +27,10 @@ import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.pseudocode.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.AccessTarget;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.InstructionWithValue;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.MagicKind;
+import org.jetbrains.kotlin.cfg.pseudocode.*;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.AccessTarget;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValue;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicKind;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor;
 import org.jetbrains.jet.lang.psi.*;
@@ -54,7 +54,7 @@ import org.jetbrains.jet.lexer.JetTokens;
 
 import java.util.*;
 
-import static org.jetbrains.jet.lang.cfg.JetControlFlowBuilder.PredefinedOperation.*;
+import static org.jetbrains.kotlin.cfg.JetControlFlowBuilder.PredefinedOperation.*;
 import static org.jetbrains.jet.lang.diagnostics.Errors.*;
 import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
 import static org.jetbrains.jet.lexer.JetTokens.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
similarity index 95%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
index e2a3147e9d9..71c2fc67cab 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -27,24 +27,24 @@ import kotlin.Function3;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableInitState;
-import org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableUseState;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue;
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodePackage;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeUtil;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.MarkInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineExitInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.VariableDeclarationInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.Edges;
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.PseudocodeTraverserPackage;
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder;
+import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableInitState;
+import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue;
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudocodePackage;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.MarkInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction;
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges;
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage;
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory;
@@ -65,12 +65,12 @@ import org.jetbrains.jet.plugin.MainFunctionDetector;
 
 import java.util.*;
 
-import static org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableUseState.*;
-import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
+import static org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState.*;
+import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
 import static org.jetbrains.jet.lang.diagnostics.Errors.*;
 import static org.jetbrains.jet.lang.resolve.BindingContext.CAPTURED_IN_CLOSURE;
 import static org.jetbrains.jet.lang.resolve.BindingContext.TAIL_RECURSION_CALL;
-import static org.jetbrains.jet.lang.cfg.TailRecursionKind.*;
+import static org.jetbrains.kotlin.cfg.TailRecursionKind.*;
 import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
 import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE;
 import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType;
@@ -147,14 +147,14 @@ public class JetFlowInformationProvider {
         for (Instruction previousInstruction : exitInstruction.getPreviousInstructions()) {
             previousInstruction.accept(new InstructionVisitor() {
                 @Override
-                public void visitReturnValue(ReturnValueInstruction instruction) {
+                public void visitReturnValue(@NotNull ReturnValueInstruction instruction) {
                     if (instructions.contains(instruction)) { //exclude non-local return expressions
                         returnedExpressions.add(instruction.getElement());
                     }
                 }
 
                 @Override
-                public void visitReturnNoValue(ReturnNoValueInstruction instruction) {
+                public void visitReturnNoValue(@NotNull ReturnNoValueInstruction instruction) {
                     if (instructions.contains(instruction)) {
                         returnedExpressions.add(instruction.getElement());
                     }
@@ -162,12 +162,12 @@ public class JetFlowInformationProvider {
 
 
                 @Override
-                public void visitJump(AbstractJumpInstruction instruction) {
+                public void visitJump(@NotNull AbstractJumpInstruction instruction) {
                     // Nothing
                 }
 
                 @Override
-                public void visitUnconditionalJump(UnconditionalJumpInstruction instruction) {
+                public void visitUnconditionalJump(@NotNull UnconditionalJumpInstruction instruction) {
                     redirectToPrevInstructions(instruction);
                 }
 
@@ -178,17 +178,17 @@ public class JetFlowInformationProvider {
                 }
 
                 @Override
-                public void visitNondeterministicJump(NondeterministicJumpInstruction instruction) {
+                public void visitNondeterministicJump(@NotNull NondeterministicJumpInstruction instruction) {
                     redirectToPrevInstructions(instruction);
                 }
 
                 @Override
-                public void visitMarkInstruction(MarkInstruction instruction) {
+                public void visitMarkInstruction(@NotNull MarkInstruction instruction) {
                     redirectToPrevInstructions(instruction);
                 }
 
                 @Override
-                public void visitInstruction(Instruction instruction) {
+                public void visitInstruction(@NotNull Instruction instruction) {
                     if (instruction instanceof JetElementInstruction) {
                         JetElementInstruction elementInstruction = (JetElementInstruction) instruction;
                         returnedExpressions.add(elementInstruction.getElement());
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/Label.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/Label.java
similarity index 95%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/Label.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/Label.java
index f84085b4a4a..7ce9ac08253 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/Label.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/Label.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/LoopInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/LoopInfo.java
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/LoopInfo.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/LoopInfo.java
index b1aecbf21b6..9f820f97ac6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/LoopInfo.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/LoopInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import org.jetbrains.jet.lang.psi.JetLoopExpression;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeTraverser.kt
similarity index 93%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeTraverser.kt
index f2de664065c..7fc9164a588 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeTraverser.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocodeTraverser
+package org.jetbrains.kotlin.cfg.pseudocodeTraverser
 
-import org.jetbrains.jet.lang.cfg.pseudocode.*
+import org.jetbrains.kotlin.cfg.pseudocode.*
 import java.util.*
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.FORWARD
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineSinkInstruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineEnterInstruction
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.FORWARD
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineEnterInstruction
 
 public fun Pseudocode.traverse(
         traversalOrder: TraversalOrder,
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariableDataCollector.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt
similarity index 90%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariableDataCollector.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt
index 47e17db2a93..29f64a2747a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariableDataCollector.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg
+package org.jetbrains.kotlin.cfg
 
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor
 import org.jetbrains.jet.lang.resolve.BindingContext
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.VariableDeclarationInstruction
-import org.jetbrains.kotlin.utils.addToStdlib.*
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction
 
 import java.util.*
 
@@ -61,7 +60,7 @@ public class PseudocodeVariableDataCollector(
 
         // Variables declared in an inner (deeper) scope can't be accessed from an outer scope.
         // Thus they can be filtered out upon leaving the inner scope.
-        return data.filterKeys_tmp { variable ->
+        return data.filterKeys { variable ->
             val lexicalScope = lexicalScopeVariableInfo.declaredIn[variable]
             // '-1' for variables declared outside this pseudocode
             val depth = lexicalScope?.depth ?: -1
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java
similarity index 94%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java
index 93f31de42c1..5ca9a9a7215 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -22,16 +22,16 @@ import kotlin.Function1;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeUtil;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.ReadValueInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.WriteValueInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.VariableDeclarationInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.Edges;
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.PseudocodeTraverserPackage;
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.ReadValueInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.WriteValueInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction;
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges;
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
@@ -43,8 +43,8 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.BACKWARD;
-import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
+import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.BACKWARD;
+import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
 
 public class PseudocodeVariablesData {
     private final Pseudocode pseudocode;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionDetector.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java
similarity index 74%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionDetector.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java
index b3c12246c65..ca44841782a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionDetector.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.MagicInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.MergeInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.AbstractJumpInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.ThrowExceptionInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.MarkInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineExitInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineSinkInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MergeInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.AbstractJumpInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.ThrowExceptionInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.MarkInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction;
 import org.jetbrains.jet.lang.psi.JetElement;
 
 public class TailRecursionDetector extends InstructionVisitorWithResult<Boolean> implements Function1<Instruction, Boolean> {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionKind.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionKind.java
similarity index 96%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionKind.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionKind.java
index b8eb11e9597..e27647cad0d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/TailRecursionKind.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionKind.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 public enum TailRecursionKind {
     TAIL_CALL(true),
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/UnreachableCode.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt
similarity index 98%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/UnreachableCode.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt
index 6573e828dcb..440297899df 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/UnreachableCode.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg
+package org.jetbrains.kotlin.cfg
 
 import org.jetbrains.jet.lang.psi.JetElement
 import com.intellij.openapi.util.TextRange
@@ -86,7 +86,7 @@ class UnreachableCodeImpl(
                 collectSiblingsIfMeaningless(index, direction)
             }
         }
-        for ((index, element) in this.withIndices()) {
+        for ((index, element) in this.withIndex()) {
             if (reachableElements.contains(element)) {
                 childrenToRemove.add(element)
                 collectSiblingsIfMeaningless(index, -1)
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/WhenChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java
similarity index 99%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/WhenChecker.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java
index 797ef7db4ab..68d1b541484 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/WhenChecker.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
similarity index 98%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
index 6fc964aa022..74efa002e61 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode;
+package org.jetbrains.kotlin.cfg.pseudocode;
 
 import com.intellij.util.containers.Stack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.*;
+import org.jetbrains.kotlin.cfg.*;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudoValue.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValue.kt
similarity index 87%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudoValue.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValue.kt
index fd5042e7ee6..0a96cbe2a9c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudoValue.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValue.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode
+package org.jetbrains.kotlin.cfg.pseudocode
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.InstructionWithValue
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValue
 
 public trait PseudoValue {
     public val debugName: String
@@ -27,4 +27,4 @@ public trait PseudoValue {
 
 public trait PseudoValueFactory {
     public fun newValue(element: JetElement?, instruction: InstructionWithValue?): PseudoValue
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudoValueImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValueImpl.kt
similarity index 90%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudoValueImpl.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValueImpl.kt
index 0cb72ac355d..6663f68c027 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudoValueImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudoValueImpl.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode
+package org.jetbrains.kotlin.cfg.pseudocode
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.InstructionWithValue
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValue
 
 class PseudoValueImpl(
         override val debugName: String,
@@ -33,4 +33,4 @@ open class PseudoValueFactoryImpl: PseudoValueFactory {
     override fun newValue(element: JetElement?, instruction: InstructionWithValue?): PseudoValue {
         return PseudoValueImpl((instruction?.let { "" } ?: "!") + "<v${lastIndex++}>", element, instruction)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Pseudocode.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/Pseudocode.java
similarity index 77%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Pseudocode.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/Pseudocode.java
index aeeefff6961..1bf0060ae47 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Pseudocode.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/Pseudocode.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode;
+package org.jetbrains.kotlin.cfg.pseudocode;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineEnterInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineExitInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineSinkInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineEnterInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction;
 import org.jetbrains.jet.lang.psi.JetElement;
 
 import java.util.List;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java
similarity index 90%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java
index 6df1061514a..0f9e65fdc01 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode;
+package org.jetbrains.kotlin.cfg.pseudocode;
 
 import com.google.common.collect.*;
 import com.intellij.util.containers.BidirectionalMap;
@@ -22,23 +22,23 @@ import kotlin.Function0;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.Label;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.MergeInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.AbstractJumpInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.ConditionalJumpInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.NondeterministicJumpInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineEnterInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineExitInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.SubroutineSinkInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.PseudocodeTraverserPackage;
+import org.jetbrains.kotlin.cfg.Label;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.*;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MergeInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.AbstractJumpInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.ConditionalJumpInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.NondeterministicJumpInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineEnterInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction;
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage;
 import org.jetbrains.jet.lang.psi.JetElement;
 
 import java.util.*;
 
-import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.BACKWARD;
-import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
+import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.BACKWARD;
+import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
 
 public class PseudocodeImpl implements Pseudocode {
 
@@ -357,17 +357,17 @@ public class PseudocodeImpl implements Pseudocode {
     private void processInstruction(Instruction instruction, final int currentPosition) {
         instruction.accept(new InstructionVisitor() {
             @Override
-            public void visitInstructionWithNext(InstructionWithNext instruction) {
+            public void visitInstructionWithNext(@NotNull InstructionWithNext instruction) {
                 instruction.setNext(getNextPosition(currentPosition));
             }
 
             @Override
-            public void visitJump(AbstractJumpInstruction instruction) {
+            public void visitJump(@NotNull AbstractJumpInstruction instruction) {
                 instruction.setResolvedTarget(getJumpTarget(instruction.getTargetLabel()));
             }
 
             @Override
-            public void visitNondeterministicJump(NondeterministicJumpInstruction instruction) {
+            public void visitNondeterministicJump(@NotNull NondeterministicJumpInstruction instruction) {
                 instruction.setNext(getNextPosition(currentPosition));
                 List<Label> targetLabels = instruction.getTargetLabels();
                 for (Label targetLabel : targetLabels) {
@@ -376,7 +376,7 @@ public class PseudocodeImpl implements Pseudocode {
             }
 
             @Override
-            public void visitConditionalJump(ConditionalJumpInstruction instruction) {
+            public void visitConditionalJump(@NotNull ConditionalJumpInstruction instruction) {
                 Instruction nextInstruction = getNextPosition(currentPosition);
                 Instruction jumpTarget = getJumpTarget(instruction.getTargetLabel());
                 if (instruction.getOnTrue()) {
@@ -391,7 +391,7 @@ public class PseudocodeImpl implements Pseudocode {
             }
 
             @Override
-            public void visitLocalFunctionDeclarationInstruction(LocalFunctionDeclarationInstruction instruction) {
+            public void visitLocalFunctionDeclarationInstruction(@NotNull LocalFunctionDeclarationInstruction instruction) {
                 PseudocodeImpl body = (PseudocodeImpl) instruction.getBody();
                 body.setParent(PseudocodeImpl.this);
                 body.postProcess();
@@ -399,17 +399,17 @@ public class PseudocodeImpl implements Pseudocode {
             }
 
             @Override
-            public void visitSubroutineExit(SubroutineExitInstruction instruction) {
+            public void visitSubroutineExit(@NotNull SubroutineExitInstruction instruction) {
                 // Nothing
             }
 
             @Override
-            public void visitSubroutineSink(SubroutineSinkInstruction instruction) {
+            public void visitSubroutineSink(@NotNull SubroutineSinkInstruction instruction) {
                 // Nothing
             }
 
             @Override
-            public void visitInstruction(Instruction instruction) {
+            public void visitInstruction(@NotNull Instruction instruction) {
                 throw new UnsupportedOperationException(instruction.toString());
             }
         });
@@ -494,7 +494,7 @@ public class PseudocodeImpl implements Pseudocode {
         }
     }
 
-    private Instruction copyInstruction(@NotNull Instruction instruction, @NotNull Map<Label, Label> originalToCopy) {
+    private static Instruction copyInstruction(@NotNull Instruction instruction, @NotNull Map<Label, Label> originalToCopy) {
         if (instruction instanceof AbstractJumpInstruction) {
             Label originalTarget = ((AbstractJumpInstruction) instruction).getTargetLabel();
             if (originalToCopy.containsKey(originalTarget)) {
@@ -510,7 +510,7 @@ public class PseudocodeImpl implements Pseudocode {
     }
 
     @NotNull
-    private List<Label> copyLabels(Collection<Label> labels, Map<Label, Label> originalToCopy) {
+    private static List<Label> copyLabels(Collection<Label> labels, Map<Label, Label> originalToCopy) {
         List<Label> newLabels = Lists.newArrayList();
         for (Label label : labels) {
             Label newLabel = originalToCopy.get(label);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java
similarity index 87%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeUtil.java
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java
index 8ad89af03b5..5ed2ad7af44 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode;
+package org.jetbrains.kotlin.cfg.pseudocode;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.JetControlFlowProcessor;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.ReadValueInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.WriteValueInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.VariableDeclarationInstruction;
+import org.jetbrains.kotlin.cfg.JetControlFlowProcessor;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.ReadValueInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.WriteValueInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction;
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt
similarity index 98%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt
index 560caf55524..9bdbb0b59a1 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode
+package org.jetbrains.kotlin.cfg.pseudocode
 
 import org.jetbrains.jet.lang.types.JetType
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/Instruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/Instruction.kt
similarity index 83%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/Instruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/Instruction.kt
index ea2df5fbe4e..db42f2863f4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/Instruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/Instruction.kt
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions
+package org.jetbrains.kotlin.cfg.pseudocode.instructions
 
-import org.jetbrains.jet.lang.cfg.pseudocode
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 
 public trait Instruction {
     public var owner: Pseudocode
@@ -36,4 +35,4 @@ public trait Instruction {
 
     public fun accept(visitor: InstructionVisitor)
     public fun <R> accept(visitor: InstructionVisitorWithResult<R>): R
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionImpl.kt
similarity index 89%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionImpl.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionImpl.kt
index e84e9018cbe..5277fc2c2fc 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionImpl.kt
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions
+package org.jetbrains.kotlin.cfg.pseudocode.instructions
 
 import java.util.Collections
 import java.util.LinkedHashSet
-import java.util.HashSet
-import com.google.common.collect.Sets
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 
 public abstract class InstructionImpl(override val lexicalScope: LexicalScope): Instruction {
     private var _owner: Pseudocode? = null
@@ -63,4 +61,4 @@ public abstract class InstructionImpl(override val lexicalScope: LexicalScope):
     }
 
     override val inputValues: List<PseudoValue> = Collections.emptyList()
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionVisitor.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitor.kt
similarity index 91%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionVisitor.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitor.kt
index 5370144db57..387000cc70a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionVisitor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitor.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions
+package org.jetbrains.kotlin.cfg.pseudocode.instructions
 
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*
 
 public open class InstructionVisitor() {
     public open fun visitAccessInstruction(instruction: AccessValueInstruction) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt
similarity index 92%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt
index a3706e09d0a..74ba4cb2923 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionVisitorWithResult.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions
+package org.jetbrains.kotlin.cfg.pseudocode.instructions
 
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*
 
 public abstract class InstructionVisitorWithResult<R>() {
     public abstract fun visitInstruction(instruction: Instruction): R
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt
similarity index 94%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt
index 947eb5cfd58..4705a848f29 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/InstructionWithNext.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions
+package org.jetbrains.kotlin.cfg.pseudocode.instructions
 
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.kotlin.utils.emptyOrSingletonList
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/JetElementInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt
similarity index 92%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/JetElementInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt
index 035ffd12b9a..05fde902ed7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/JetElementInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstruction.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions
+package org.jetbrains.kotlin.cfg.pseudocode.instructions
 
 import org.jetbrains.jet.lang.psi.JetElement
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/JetElementInstructionImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt
similarity index 94%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/JetElementInstructionImpl.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt
index ba09e6c59d3..774efc36e2b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/JetElementInstructionImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/JetElementInstructionImpl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions
+package org.jetbrains.kotlin.cfg.pseudocode.instructions
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.psi.JetElement
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/LexicalScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt
similarity index 95%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/LexicalScope.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt
index 78ffed69daa..cbcddccf85d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/LexicalScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/LexicalScope.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions
+package org.jetbrains.kotlin.cfg.pseudocode.instructions
 
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.lang.psi.JetDeclaration
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt
similarity index 80%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt
index ee908d02114..2af7bb3fc03 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval
 
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
 
 public trait InstructionWithReceivers: Instruction {
     public val receiverValues: Map<PseudoValue, ReceiverValue>
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/InstructionWithValue.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithValue.kt
similarity index 77%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/InstructionWithValue.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithValue.kt
index eb7f7e640f2..04de9d9c316 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/InstructionWithValue.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithValue.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval
 
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstruction
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstruction
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 
 public trait InstructionWithValue : JetElementInstruction {
     public val outputValue: PseudoValue?
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt
similarity index 73%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt
index ee47e2a72d4..d98b3544de4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/LoadUnitValueInstruction.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval
 
 import org.jetbrains.jet.lang.psi.JetExpression
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
 
 public class LoadUnitValueInstruction(
         expression: JetExpression,
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
similarity index 88%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
index b6b851f76f9..ed5f4e41d93 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValueFactory
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValueFactory
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
 import org.jetbrains.jet.lang.psi.JetNamedDeclaration
 
 public trait AccessTarget {
@@ -117,4 +117,4 @@ public class WriteValueInstruction(
 
     override fun createCopy(): InstructionImpl =
             WriteValueInstruction(element, lexicalScope, target, receiverValues, lValue, rValue)
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
similarity index 91%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
index b4c55e2b98d..e73c0cad263 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval
 
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValueFactory
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValueFactory
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
-import org.jetbrains.jet.lang.cfg.pseudocode.TypePredicate
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.MagicKind
+import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicKind
 
 public abstract class OperationInstruction protected(
         element: JetElement,
@@ -174,4 +174,4 @@ class MergeInstruction private(
                 factory: PseudoValueFactory
         ): MergeInstruction = MergeInstruction(element, lexicalScope, inputValues).setResult(factory) as MergeInstruction
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
similarity index 79%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
index b3ffe00fc8a..e0aab3b4770 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.Label
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstructionImpl
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.Label
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
 import org.jetbrains.kotlin.utils.emptyOrSingletonList
 
 public abstract class AbstractJumpInstruction(
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt
similarity index 83%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt
index 724af8b2b6a..0110435ee20 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps
 
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.Label
+import org.jetbrains.kotlin.cfg.Label
 import java.util.Arrays
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
 import org.jetbrains.kotlin.utils.emptyOrSingletonList
 
 public class ConditionalJumpInstruction(
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/JumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/JumpInstruction.kt
similarity index 77%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/JumpInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/JumpInstruction.kt
index 2ec8a31badf..478022f071b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/JumpInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/JumpInstruction.kt
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps
 
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
 
-public trait JumpInstruction : Instruction
\ No newline at end of file
+public trait JumpInstruction : Instruction
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
similarity index 82%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
index c71258964b5..13bb3cc5abf 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps
 
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.Label
+import org.jetbrains.kotlin.cfg.Label
 import com.google.common.collect.Maps
 import com.google.common.collect.Lists
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstructionImpl
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
 import org.jetbrains.kotlin.utils.emptyOrSingletonList
 
 public class NondeterministicJumpInstruction(
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt
similarity index 79%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt
index 41875e59f1e..9d1cc3c4e2d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnNoValueInstruction.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.Label
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.Label
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
 
 public class ReturnNoValueInstruction(
         element: JetElement,
@@ -39,4 +39,4 @@ public class ReturnNoValueInstruction(
 
     override fun createCopy(newLabel: Label, lexicalScope: LexicalScope): AbstractJumpInstruction =
             ReturnNoValueInstruction(element, lexicalScope, newLabel)
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt
similarity index 81%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt
index 9950f6ef136..b0de80783d3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ReturnValueInstruction.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps
 
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 import org.jetbrains.jet.lang.psi.JetExpression
-import org.jetbrains.jet.lang.cfg.Label
+import org.jetbrains.kotlin.cfg.Label
 import java.util.Collections
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
 import org.jetbrains.jet.lang.psi.JetReturnExpression
 
 public class ReturnValueInstruction(
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt
similarity index 80%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt
index e462d20ab26..691f1bcedf6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/ThrowExceptionInstruction.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps
 
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
 import org.jetbrains.jet.lang.psi.JetThrowExpression
-import org.jetbrains.jet.lang.cfg.Label
+import org.jetbrains.kotlin.cfg.Label
 import java.util.Collections
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
 
 public class ThrowExceptionInstruction(
         expression: JetThrowExpression,
@@ -47,4 +47,4 @@ public class ThrowExceptionInstruction(
     override fun createCopy(newLabel: Label, lexicalScope: LexicalScope): AbstractJumpInstruction {
         return ThrowExceptionInstruction((element as JetThrowExpression), lexicalScope, newLabel, thrownValue)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt
similarity index 88%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt
index 55e0e0ee4c1..b7ea147a8b6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/UnconditionalJumpInstruction.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps
 
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.*
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.Label
+import org.jetbrains.kotlin.cfg.Label
 
 public class UnconditionalJumpInstruction(
         element: JetElement,
@@ -37,4 +37,4 @@ public class UnconditionalJumpInstruction(
 
     override fun createCopy(newLabel: Label, lexicalScope: LexicalScope): AbstractJumpInstruction =
             UnconditionalJumpInstruction(element, newLabel, lexicalScope)
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt
similarity index 76%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt
index 177ad24e86b..4cec71106db 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/LocalFunctionDeclarationInstruction.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.special
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.special
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode
 import com.google.common.collect.Lists
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
 
 public class LocalFunctionDeclarationInstruction(
         element: JetElement,
@@ -58,4 +58,4 @@ public class LocalFunctionDeclarationInstruction(
 
     override fun createCopy(): InstructionImpl =
             LocalFunctionDeclarationInstruction(element, body, lexicalScope)
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/MarkInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/MarkInstruction.kt
similarity index 75%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/MarkInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/MarkInstruction.kt
index 3265c588f62..c60e804e689 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/MarkInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/MarkInstruction.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.special
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.special
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
 
 public class MarkInstruction(
         element: JetElement,
@@ -38,4 +38,4 @@ public class MarkInstruction(
     override fun createCopy() = MarkInstruction(element, lexicalScope)
 
     override fun toString() = "mark(${render(element)})"
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt
similarity index 72%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt
index 4dfc2cea46a..bf82dd53116 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineEnterInstruction.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.special
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.special
 
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
 
 public class SubroutineEnterInstruction(
         public val subroutine: JetElement,
@@ -39,4 +39,4 @@ public class SubroutineEnterInstruction(
 
     override fun createCopy(): InstructionImpl =
             SubroutineEnterInstruction(subroutine, lexicalScope)
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt
similarity index 78%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt
index a5c05db4eb3..53ec459e8d7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineExitInstruction.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.special
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.special
 
 import org.jetbrains.jet.lang.psi.JetElement
 import java.util.Collections
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
 
 public class SubroutineExitInstruction(
         public val subroutine: JetElement,
@@ -52,4 +52,4 @@ public class SubroutineExitInstruction(
 
     override fun createCopy(): InstructionImpl =
             SubroutineExitInstruction(subroutine, lexicalScope, isError)
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt
similarity index 75%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt
index 0e86713449f..e65b7d56f8e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/SubroutineSinkInstruction.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.special
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.special
 
 import org.jetbrains.jet.lang.psi.JetElement
 import java.util.Collections
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
 
 public class SubroutineSinkInstruction(
         public val subroutine: JetElement,
@@ -43,4 +43,4 @@ public class SubroutineSinkInstruction(
 
     override fun createCopy(): InstructionImpl =
             SubroutineSinkInstruction(subroutine, lexicalScope, debugLabel)
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt
similarity index 78%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt
index c378d628a80..63d98d3b915 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode.instructions.special
+package org.jetbrains.kotlin.cfg.pseudocode.instructions.special
 
 import org.jetbrains.jet.lang.psi.JetDeclaration
 import org.jetbrains.jet.lang.psi.JetVariableDeclaration
 import org.jetbrains.jet.lang.psi.JetParameter
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl
 
 public class VariableDeclarationInstruction(
         element: JetDeclaration,
@@ -48,4 +48,4 @@ public class VariableDeclarationInstruction(
 
     override fun createCopy(): InstructionImpl =
             VariableDeclarationInstruction(variableDeclarationElement, lexicalScope)
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/pseudocodeUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt
similarity index 96%
rename from compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/pseudocodeUtil.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt
index e80712626ef..adcc308abce 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/pseudocodeUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.cfg.pseudocode
+package org.jetbrains.kotlin.cfg.pseudocode
 
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*
 import org.jetbrains.jet.lang.psi.*
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.*
@@ -175,4 +175,4 @@ fun Pseudocode.getElementValuesRecursively(element: JetElement): List<PseudoValu
 
     collectValues()
     return results
-}
\ No newline at end of file
+}
diff --git a/compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java
similarity index 95%
rename from compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java
rename to compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java
index 569662b8224..a3b6b853a16 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/AbstractControlFlowTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import kotlin.Function3;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeImpl;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 
 import java.util.*;
diff --git a/compiler/tests/org/jetbrains/jet/cfg/AbstractDataFlowTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java
similarity index 86%
rename from compiler/tests/org/jetbrains/jet/cfg/AbstractDataFlowTest.java
rename to compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java
index 27b37d7a209..c927c7ce9c3 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/AbstractDataFlowTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.text.StringUtil;
 import kotlin.Function3;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.cfg.PseudocodeVariablesData;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeImpl;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.Edges;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges;
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 
@@ -31,8 +30,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import static org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableInitState;
-import static org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableUseState;
+import static org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableInitState;
+import static org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState;
 
 public abstract class AbstractDataFlowTest extends AbstractPseudocodeTest {
 
@@ -73,7 +72,7 @@ public abstract class AbstractDataFlowTest extends AbstractPseudocodeTest {
         });
     }
 
-    private <D> int countDataColumnWidth(
+    private static int countDataColumnWidth(
             @NotNull String prefix,
             @NotNull List<Instruction> instructions,
             @NotNull Map<Instruction, Edges<Map<VariableDescriptor, VariableInitState>>> data
@@ -91,13 +90,13 @@ public abstract class AbstractDataFlowTest extends AbstractPseudocodeTest {
     }
 
     @NotNull
-    private <D> String dumpEdgesData(String prefix, @NotNull Edges<Map<VariableDescriptor, D>> edges) {
+    private static <D> String dumpEdgesData(String prefix, @NotNull Edges<Map<VariableDescriptor, D>> edges) {
         return prefix +
                " in: " + renderVariableMap(edges.getIncoming()) +
                " out: " + renderVariableMap(edges.getOutgoing());
     }
 
-    private <D> String renderVariableMap(Map<VariableDescriptor, D> map) {
+    private static <D> String renderVariableMap(Map<VariableDescriptor, D> map) {
         List<String> result = Lists.newArrayList();
         for (Map.Entry<VariableDescriptor, D> entry : map.entrySet()) {
             VariableDescriptor variable = entry.getKey();
diff --git a/compiler/tests/org/jetbrains/jet/cfg/AbstractPseudoValueTest.kt b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt
similarity index 91%
rename from compiler/tests/org/jetbrains/jet/cfg/AbstractPseudoValueTest.kt
rename to compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt
index 3fb6c0a5e86..1e990343b4f 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/AbstractPseudoValueTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cfg
+package org.jetbrains.kotlin.cfg
 
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeImpl
+import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue
+import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid
 import org.jetbrains.jet.lang.resolve.BindingContext
 import java.util.*
-import org.jetbrains.jet.lang.cfg.pseudocode.TypePredicate
-import org.jetbrains.jet.lang.cfg.pseudocode.getExpectedTypePredicate
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.InstructionWithValue
+import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate
+import org.jetbrains.kotlin.cfg.pseudocode.getExpectedTypePredicate
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValue
 
 public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
     override fun dumpInstructions(pseudocode: PseudocodeImpl, out: StringBuilder, bindingContext: BindingContext) {
@@ -79,7 +79,7 @@ public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
 
         val elementColumnWidth = elementToValues.keySet().map { elementText(it).length() }.max() ?: 1
         val valueColumnWidth = allValues.map { valueDecl(it).length() }.max()!!
-        val valueDescColumnWidth = valueDescriptions.values().map { it.length }.max()!!
+        val valueDescColumnWidth = valueDescriptions.values().map { it.length() }.max()!!
 
         for ((ve, description) in valueDescriptions.entrySet()) {
             val (value, element) = ve
diff --git a/compiler/tests/org/jetbrains/jet/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
similarity index 95%
rename from compiler/tests/org/jetbrains/jet/cfg/AbstractPseudocodeTest.java
rename to compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
index a56bbc502d9..093b77f24a9 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/AbstractPseudocodeTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.google.common.collect.Sets;
 import com.intellij.openapi.util.text.StringUtil;
@@ -24,12 +24,12 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeImpl;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeUtil;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl;
+import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
diff --git a/compiler/tests/org/jetbrains/jet/cfg/CFGraphToDotFilePrinter.java b/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java
similarity index 79%
rename from compiler/tests/org/jetbrains/jet/cfg/CFGraphToDotFilePrinter.java
rename to compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java
index c37fd0222cd..087f15820e0 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/CFGraphToDotFilePrinter.java
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.google.common.collect.Sets;
 import com.intellij.openapi.util.io.FileUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode;
-import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeImpl;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.MagicInstruction;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.MagicKind;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.*;
+import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicInstruction;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicKind;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*;
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetNamedDeclaration;
 
@@ -71,11 +71,11 @@ public class CFGraphToDotFilePrinter {
         out.close();
     }
 
-    private static void dumpEdges(List<Instruction> instructions,  final PrintStream out, final int[] count, final Map<Instruction, String> nodeToName) {
+    private static void dumpEdges(List<Instruction> instructions, final PrintStream out, final int[] count, final Map<Instruction, String> nodeToName) {
         for (Instruction fromInst : instructions) {
             fromInst.accept(new InstructionVisitor() {
                 @Override
-                public void visitLocalFunctionDeclarationInstruction(LocalFunctionDeclarationInstruction instruction) {
+                public void visitLocalFunctionDeclarationInstruction(@NotNull LocalFunctionDeclarationInstruction instruction) {
                     int index = count[0];
 //                    instruction.getBody().dumpSubgraph(out, "subgraph cluster_" + index, count, "color=blue;\nlabel = \"f" + index + "\";", nodeToName);
                     printEdge(out, nodeToName.get(instruction), nodeToName.get(instruction.getBody().getInstructionsIncludingDeadCode().get(0)), null);
@@ -83,58 +83,58 @@ public class CFGraphToDotFilePrinter {
                 }
 
                 @Override
-                public void visitUnconditionalJump(UnconditionalJumpInstruction instruction) {
+                public void visitUnconditionalJump(@NotNull UnconditionalJumpInstruction instruction) {
                     printEdge(out, nodeToName.get(instruction), nodeToName.get(instruction.getResolvedTarget()), null);
                 }
 
                 @Override
-                public void visitJump(AbstractJumpInstruction instruction) {
+                public void visitJump(@NotNull AbstractJumpInstruction instruction) {
                     printEdge(out, nodeToName.get(instruction), nodeToName.get(instruction.getResolvedTarget()), null);
                 }
 
                 @Override
-                public void visitNondeterministicJump(NondeterministicJumpInstruction instruction) {
+                public void visitNondeterministicJump(@NotNull NondeterministicJumpInstruction instruction) {
                     for (Instruction nextInstruction : instruction.getNextInstructions()) {
                         printEdge(out, nodeToName.get(instruction), nodeToName.get(nextInstruction), null);
                     }
                 }
 
                 @Override
-                public void visitReturnValue(ReturnValueInstruction instruction) {
+                public void visitReturnValue(@NotNull ReturnValueInstruction instruction) {
                     super.visitReturnValue(instruction);
                 }
 
                 @Override
-                public void visitReturnNoValue(ReturnNoValueInstruction instruction) {
+                public void visitReturnNoValue(@NotNull ReturnNoValueInstruction instruction) {
                     super.visitReturnNoValue(instruction);
                 }
 
                 @Override
-                public void visitConditionalJump(ConditionalJumpInstruction instruction) {
+                public void visitConditionalJump(@NotNull ConditionalJumpInstruction instruction) {
                     String from = nodeToName.get(instruction);
                     printEdge(out, from, nodeToName.get(instruction.getNextOnFalse()), "no");
                     printEdge(out, from, nodeToName.get(instruction.getNextOnTrue()), "yes");
                 }
 
                 @Override
-                public void visitInstructionWithNext(InstructionWithNext instruction) {
+                public void visitInstructionWithNext(@NotNull InstructionWithNext instruction) {
                     printEdge(out, nodeToName.get(instruction), nodeToName.get(instruction.getNext()), null);
                 }
 
                 @Override
-                public void visitSubroutineExit(SubroutineExitInstruction instruction) {
+                public void visitSubroutineExit(@NotNull SubroutineExitInstruction instruction) {
                     if (!instruction.getNextInstructions().isEmpty()) {
                         printEdge(out, nodeToName.get(instruction), nodeToName.get(instruction.getNextInstructions().iterator().next()), null);
                     }
                 }
 
                 @Override
-                public void visitSubroutineSink(SubroutineSinkInstruction instruction) {
+                public void visitSubroutineSink(@NotNull SubroutineSinkInstruction instruction) {
                     // Nothing
                 }
 
                 @Override
-                public void visitInstruction(Instruction instruction) {
+                public void visitInstruction(@NotNull Instruction instruction) {
                     throw new UnsupportedOperationException(instruction.toString());
                 }
             });
diff --git a/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java
index 825d16544fc..2d0c81ee100 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java
index 9b3285c6585..55e2b31626a 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java
index ea3a2ae9d60..762e034b4f9 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.cfg;
+package org.jetbrains.kotlin.cfg;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index f94ef1c84fd..65058d5a09b 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -39,7 +39,7 @@ import org.jetbrains.jet.modules.xml.AbstractModuleXmlParserTest
 import org.jetbrains.jet.jvm.compiler.AbstractWriteSignatureTest
 import org.jetbrains.kotlin.cli.AbstractKotlincExecutableTest
 import org.jetbrains.jet.repl.AbstractReplInterpreterTest
-import org.jetbrains.jet.cfg.AbstractControlFlowTest
+import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
 import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest
 import org.jetbrains.jet.checkers.AbstractJetJsCheckerTest
 import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixTest
@@ -91,7 +91,7 @@ import org.jetbrains.jet.resolve.AbstractReferenceToJavaWithWrongFileStructureTe
 import org.jetbrains.jet.plugin.navigation.AbstractKotlinGotoTest
 import org.jetbrains.jet.plugin.AbstractExpressionSelectionTest
 import org.jetbrains.jet.plugin.refactoring.move.AbstractJetMoveTest
-import org.jetbrains.jet.cfg.AbstractDataFlowTest
+import org.jetbrains.kotlin.cfg.AbstractDataFlowTest
 import org.jetbrains.jet.plugin.imports.AbstractOptimizeImportsTest
 import org.jetbrains.jet.plugin.debugger.AbstractSmartStepIntoTest
 import org.jetbrains.jet.plugin.stubs.AbstractStubBuilderTest
@@ -107,7 +107,7 @@ import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletion
 import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentHighlightingTest
 import org.jetbrains.jet.plugin.stubs.AbstractResolveByStubTest
 import org.jetbrains.jet.plugin.stubs.AbstractMultiFileHighlightingTest
-import org.jetbrains.jet.cfg.AbstractPseudoValueTest
+import org.jetbrains.kotlin.cfg.AbstractPseudoValueTest
 import org.jetbrains.jet.plugin.structureView.AbstractKotlinFileStructureTest
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest
 import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest
diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java
index 6b756683860..3a76254ec6c 100644
--- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java
+++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java
@@ -25,7 +25,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.analyzer.AnalyzerPackage;
-import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider;
+import org.jetbrains.kotlin.cfg.JetFlowInformationProvider;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt
index e96cdb3b235..d954a0fcb6f 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt
@@ -30,9 +30,9 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver
-import org.jetbrains.jet.lang.cfg.pseudocode.*
+import org.jetbrains.kotlin.cfg.pseudocode.*
 import org.jetbrains.jet.lang.resolve.BindingContext
-import org.jetbrains.jet.lang.cfg.Label
+import org.jetbrains.kotlin.cfg.Label
 import org.jetbrains.jet.plugin.refactoring.JetNameValidatorImpl
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil
 import org.jetbrains.jet.plugin.imports.canBeReferencedViaImport
@@ -45,13 +45,13 @@ import com.intellij.util.containers.MultiMap
 import org.jetbrains.jet.lang.diagnostics.Errors
 import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Status
 import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.ErrorMessage
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.*
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*
+import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*
 import kotlin.properties.Delegates
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.traverse
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.traverse
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.getTargetFunctionDescriptor
 import org.jetbrains.jet.lang.resolve.OverridingUtil
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.isUsedAsStatement
@@ -61,7 +61,7 @@ import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Initiali
 import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ParameterUpdate
 import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ExpressionValue
 import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Jump
-import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.traverseFollowingInstructions
+import org.jetbrains.kotlin.cfg.pseudocodeTraverser.traverseFollowingInstructions
 import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValueBoxer.AsList
 import org.jetbrains.jet.plugin.refactoring.getContextForContainingDeclarationBody
 import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers