diff --git a/.idea/runConfigurations/All_Jvm_Backend_Tests.xml b/.idea/runConfigurations/All_Jvm_Backend_Tests.xml
index 4c3cb43b17c..0b7e80749c9 100644
--- a/.idea/runConfigurations/All_Jvm_Backend_Tests.xml
+++ b/.idea/runConfigurations/All_Jvm_Backend_Tests.xml
@@ -9,7 +9,7 @@
     <module name="compiler-tests" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.jet.codegen" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.codegen" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
index b03b64d0667..89aa08274dd 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
@@ -24,9 +24,9 @@ import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.codegen.CodegenTestFiles;
-import org.jetbrains.jet.codegen.GenerationUtils;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.CodegenTestFiles;
+import org.jetbrains.kotlin.codegen.GenerationUtils;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
diff --git a/compiler/backend/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper b/compiler/backend/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper
index 7f1bb1ad3b1..c18a1bdddc1 100644
--- a/compiler/backend/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper
+++ b/compiler/backend/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper
@@ -1 +1 @@
-org.jetbrains.jet.codegen.signature.KotlinToJvmSignatureMapperImpl
\ No newline at end of file
+org.jetbrains.kotlin.codegen.signature.KotlinToJvmSignatureMapperImpl
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodeChunk.java b/compiler/backend/src/org/jetbrains/jet/codegen/CodeChunk.java
deleted file mode 100644
index 293a3fdbfe6..00000000000
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CodeChunk.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.codegen;
-
-public interface CodeChunk {
-    void generate(ExpressionCodegen codegen);
-}
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AbstractClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/AbstractClassBuilder.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java
index d582ef2cba1..224fce67484 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/AbstractClassBuilder.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AccessorForCallableDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/AccessorForCallableDescriptor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java
index 92f9e4e1fc6..7740c4b68d1 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/AccessorForCallableDescriptor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
 
 public interface AccessorForCallableDescriptor<T extends CallableMemberDescriptor> {
-
     @NotNull
     T getCalleeDescriptor();
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AccessorForFunctionDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/AccessorForFunctionDescriptor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java
index 10b5e20aec6..e6d46703b5f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/AccessorForFunctionDescriptor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyBackingFieldInOuterClass.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyBackingFieldInOuterClass.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java
index fe44fd86677..d601ec1829e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyBackingFieldInOuterClass.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyDescriptor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java
index 6e274c36d19..d235c4a38de 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyDescriptor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java
index 5f304040327..bf6d002d8eb 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ArgumentGenerator.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.java
index f1b79869e04..b21f732600c 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ArgumentGenerator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
index 9065f63acbf..b5078f7eb04 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
@@ -24,12 +24,12 @@ import kotlin.Function1;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.binding.CalculatedClosure;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
@@ -56,7 +56,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.isInterface;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*;
 import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.ABI_VERSION_FIELD_NAME;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CallBasedArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/CallBasedArgumentGenerator.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java
index 032f6decb9f..b091e9d1e04 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CallBasedArgumentGenerator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
@@ -28,7 +28,7 @@ import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.pushDefaultValueOnStack;
+import static org.jetbrains.kotlin.codegen.AsmUtil.pushDefaultValueOnStack;
 
 public class CallBasedArgumentGenerator extends ArgumentGenerator {
     private final ExpressionCodegen codegen;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CallGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/CallGenerator.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java
index c3d29ad29cc..8d1d9dd9f55 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CallGenerator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/Callable.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.java
similarity index 88%
rename from compiler/backend/src/org/jetbrains/jet/codegen/Callable.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.java
index 1320a8f9480..d2157755b85 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/Callable.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/Callable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 public interface Callable {
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CallableMethod.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/CallableMethod.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java
index ed101645c25..ca27268661e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CallableMethod.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java
index 566c4f8caa8..5dd22414eab 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.context.ClassContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.ClassContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.enumEntryNeedSubclass;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.enumEntryNeedSubclass;
 
 public abstract class ClassBodyCodegen extends MemberCodegen<JetClassOrObject> {
     protected final JetClassOrObject myClass;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilder.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilder.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilder.java
index d2bf6a15920..737c687f885 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilder.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactories.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactories.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java
index 208251696ed..dd181791be3 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactories.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
@@ -116,7 +116,7 @@ public class ClassBuilderFactories {
         }
 
         @Override
-        protected String getCommonSuperClass(String type1, String type2) {
+        protected String getCommonSuperClass(@NotNull String type1, @NotNull String type2) {
             try {
                 return super.getCommonSuperClass(type1, type2);
             }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactory.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactory.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactory.java
index 1e1ec9e7fc6..4fff259e18e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactory.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderMode.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderMode.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java
index 9a4e61bc43a..d6c73e56322 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderMode.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 public enum ClassBuilderMode {
     /**
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderOnDemand.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderOnDemand.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderOnDemand.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderOnDemand.java
index e0a0e68b9e1..02ca56c4bc9 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderOnDemand.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderOnDemand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
index b4f657c001e..92a047a7269 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -24,7 +24,7 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
 import org.jetbrains.jet.lang.resolve.name.FqName;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
index a02579ad52d..304f51b6854 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.intellij.util.ArrayUtil;
@@ -22,11 +22,11 @@ import kotlin.Function1;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.binding.CalculatedClosure;
-import org.jetbrains.jet.codegen.context.ClassContext;
-import org.jetbrains.jet.codegen.signature.BothSignatureWriter;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
+import org.jetbrains.kotlin.codegen.context.ClassContext;
+import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
 import org.jetbrains.jet.lang.psi.JetElement;
@@ -46,9 +46,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.*;
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.isConst;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
+import static org.jetbrains.kotlin.codegen.AsmUtil.*;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConst;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass;
 import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenStatementVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/CodegenStatementVisitor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java
index 5e40d432ae7..e2e32cf49a2 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenStatementVisitor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenStatementVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.*;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/CollectionStubMethodGenerator.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt
index 307027d1012..78e210d1f08 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CollectionStubMethodGenerator.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen
+package org.jetbrains.kotlin.codegen
 
-import org.jetbrains.jet.codegen.state.GenerationState
+import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.*
 import org.jetbrains.jet.lang.descriptors.impl.*
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CompilationErrorHandler.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationErrorHandler.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/CompilationErrorHandler.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationErrorHandler.java
index 92852e09523..ef5b8fb84ac 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CompilationErrorHandler.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 public interface CompilationErrorHandler {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CompilationException.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationException.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/CompilationException.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationException.java
index a85f98ddc83..5c36ecd125e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CompilationException.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CompilationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.Computable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/DefaultParameterValueLoader.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/DefaultParameterValueLoader.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java
index 1891736837b..76c983cd2ce 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/DefaultParameterValueLoader.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.JetParameter;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/DelegatingClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DelegatingClassBuilder.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/DelegatingClassBuilder.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/DelegatingClassBuilder.java
index da07efa4c1e..35ce0b7ca3b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/DelegatingClassBuilder.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DelegatingClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index 9f36fcce07d..14a82d246bf 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -30,17 +30,17 @@ import kotlin.KotlinPackage;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.binding.CalculatedClosure;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.context.*;
-import org.jetbrains.jet.codegen.inline.*;
-import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethod;
-import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods;
-import org.jetbrains.jet.codegen.signature.BothSignatureWriter;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
-import org.jetbrains.jet.codegen.when.SwitchCodegen;
-import org.jetbrains.jet.codegen.when.SwitchCodegenUtil;
+import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.context.*;
+import org.jetbrains.kotlin.codegen.inline.*;
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethod;
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods;
+import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.when.SwitchCodegen;
+import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
 import org.jetbrains.jet.lang.evaluate.EvaluatePackage;
@@ -80,9 +80,9 @@ import org.jetbrains.org.objectweb.asm.commons.Method;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.AsmUtil.*;
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.*;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
+import static org.jetbrains.kotlin.codegen.AsmUtil.*;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
 import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FieldInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/FieldInfo.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
index b17950814b3..aaa6b0fe87b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FieldInfo.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassKind;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FrameMap.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/FrameMap.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.java
index 70a08739030..d85665f7966 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FrameMap.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.Trinity;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
index f6543f3d860..1f758063ff1 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
@@ -1,6 +1,5 @@
 /*
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.psi.PsiElement;
@@ -25,14 +24,14 @@ import com.intellij.util.containers.ContainerUtil;
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.context.MethodContext;
-import org.jetbrains.jet.codegen.context.PackageContext;
-import org.jetbrains.jet.codegen.context.PackageFacadeContext;
-import org.jetbrains.jet.codegen.optimization.OptimizationMethodVisitor;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.MethodContext;
+import org.jetbrains.kotlin.codegen.context.PackageContext;
+import org.jetbrains.kotlin.codegen.context.PackageFacadeContext;
+import org.jetbrains.kotlin.codegen.optimization.OptimizationMethodVisitor;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
@@ -67,9 +66,9 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.AsmUtil.*;
-import static org.jetbrains.jet.codegen.JvmSerializationBindings.*;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.isLocalNamedFun;
+import static org.jetbrains.kotlin.codegen.AsmUtil.*;
+import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.isLocalNamedFun;
 import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DECLARATION;
 import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.callableDescriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isFunctionLiteral;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java
index 1ce7cf51a67..10bc594f0a6 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionGenerationStrategy.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.context.MethodContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.MethodContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.psi.JetDeclarationWithBody;
 import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/GeneratedClassLoader.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/GeneratedClassLoader.java
index 7cb0affe6d9..52bb7ad57c9 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/GeneratedClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.backend.common.output.OutputFile;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 0accc3640a0..0e3e1ae0157 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.progress.ProcessCanceledException;
@@ -23,11 +23,11 @@ import com.intellij.util.ArrayUtil;
 import kotlin.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.binding.MutableClosure;
-import org.jetbrains.jet.codegen.context.*;
-import org.jetbrains.jet.codegen.signature.BothSignatureWriter;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.binding.MutableClosure;
+import org.jetbrains.kotlin.codegen.context.*;
+import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.descriptors.serialization.BitEncoding;
 import org.jetbrains.jet.descriptors.serialization.ClassData;
 import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
@@ -67,9 +67,9 @@ import org.jetbrains.org.objectweb.asm.commons.Method;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.AsmUtil.*;
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.*;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
+import static org.jetbrains.kotlin.codegen.AsmUtil.*;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver;
 import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.classDescriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JavaSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JavaSerializerExtension.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/JavaSerializerExtension.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/JavaSerializerExtension.java
index eb16a5e1ca0..d3465ac56be 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/JavaSerializerExtension.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JavaSerializerExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
@@ -31,7 +31,7 @@ import org.jetbrains.org.objectweb.asm.commons.Method;
 
 import java.util.Arrays;
 
-import static org.jetbrains.jet.codegen.JvmSerializationBindings.*;
+import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*;
 
 public class JavaSerializerExtension extends SerializerExtension {
     private final JvmSerializationBindings bindings;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java
index 960d6aff212..fc0dbdf671d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.vfs.StandardFileSystems;
 import com.intellij.openapi.vfs.VfsUtilCore;
@@ -23,11 +23,11 @@ import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.binding.CalculatedClosure;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.context.MethodContext;
-import org.jetbrains.jet.codegen.context.PackageContext;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.MethodContext;
+import org.jetbrains.kotlin.codegen.context.PackageContext;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetFile;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JvmRuntimeTypes.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/JvmRuntimeTypes.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java
index 761f1635ce6..4ff98476a18 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/JvmRuntimeTypes.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JvmSerializationBindings.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/JvmSerializationBindings.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java
index a8699333512..6e351ea2122 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/JvmSerializationBindings.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java
index 00f6d17d3a1..4986a511846 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Sets;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetScript;
 import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
@@ -30,7 +30,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.registerClassNameForScript;
 
 public class KotlinCodegenFacade {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index c90b0cd5c47..6116daaffe0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.progress.ProcessCanceledException;
 import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.context.ClassContext;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.context.FieldOwnerContext;
-import org.jetbrains.jet.codegen.inline.InlineCodegenUtil;
-import org.jetbrains.jet.codegen.inline.NameGenerator;
-import org.jetbrains.jet.codegen.inline.ReifiedTypeParametersUsages;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.ClassContext;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.FieldOwnerContext;
+import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil;
+import org.jetbrains.kotlin.codegen.inline.NameGenerator;
+import org.jetbrains.kotlin.codegen.inline.ReifiedTypeParametersUsages;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations;
 import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
@@ -51,7 +51,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
+import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
 import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED;
 import static org.jetbrains.jet.lang.descriptors.SourceElement.NO_SOURCE;
 import static org.jetbrains.jet.lang.resolve.BindingContext.VARIABLE;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MethodKind.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MethodKind.java
similarity index 89%
rename from compiler/backend/src/org/jetbrains/jet/codegen/MethodKind.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/MethodKind.java
index e0d1634880a..83b67ce5805 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/MethodKind.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MethodKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 public enum MethodKind {
     GENERAL,
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/OwnerKind.java
similarity index 89%
rename from compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/OwnerKind.java
index dfc6c93c52e..177f90832b7 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/OwnerKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 public enum OwnerKind {
     PACKAGE,
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
index 61bdd557685..65c80024aaf 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
@@ -28,11 +28,11 @@ import kotlin.Function0;
 import org.jetbrains.annotations.Mutable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.context.FieldOwnerContext;
-import org.jetbrains.jet.codegen.context.MethodContext;
-import org.jetbrains.jet.codegen.context.PackageContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.FieldOwnerContext;
+import org.jetbrains.kotlin.codegen.context.MethodContext;
+import org.jetbrains.kotlin.codegen.context.PackageContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.config.IncrementalCompilation;
 import org.jetbrains.jet.descriptors.serialization.BitEncoding;
 import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
@@ -64,8 +64,8 @@ import org.jetbrains.org.objectweb.asm.commons.Method;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
-import static org.jetbrains.jet.codegen.AsmUtil.method;
+import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
+import static org.jetbrains.kotlin.codegen.AsmUtil.method;
 import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.K_PACKAGE_IMPL_TYPE;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
index ed3144e527d..0a6f72dee27 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PackagePartCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.util.ArrayUtil;
 import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.context.FieldOwnerContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.FieldOwnerContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetNamedFunction;
 import org.jetbrains.jet.lang.psi.JetProperty;
 import org.jetbrains.org.objectweb.asm.Type;
 
-import static org.jetbrains.jet.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation;
+import static org.jetbrains.kotlin.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation;
 import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ParentCodegenAware.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ParentCodegenAware.java
similarity index 87%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ParentCodegenAware.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ParentCodegenAware.java
index 104fb82f70b..c9493e1fd32 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ParentCodegenAware.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ParentCodegenAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 
 public class ParentCodegenAware {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/PlatformStaticGenerator.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt
index 185f43afb90..2d683c88fec 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PlatformStaticGenerator.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen
+package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
-import org.jetbrains.jet.codegen.state.GenerationState
+import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.java.diagnostics.Synthetic
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 import org.jetbrains.org.objectweb.asm.MethodVisitor
 import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature
-import org.jetbrains.jet.codegen.context.MethodContext
+import org.jetbrains.kotlin.codegen.context.MethodContext
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.kotlin.backend.common.CodegenUtil
 import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
index 5c99890a751..244be1f4d45 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.context.*;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.context.*;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
@@ -45,10 +45,10 @@ import org.jetbrains.org.objectweb.asm.commons.Method;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.*;
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.getParentBodyCodegen;
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.isInterface;
-import static org.jetbrains.jet.codegen.JvmSerializationBindings.*;
+import static org.jetbrains.kotlin.codegen.AsmUtil.*;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.getParentBodyCodegen;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface;
+import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.PROPERTY_METADATA_TYPE;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java
index 42039ba7e55..1ace407ff42 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.ImmutableMap;
 import org.jetbrains.annotations.NotNull;
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.types.lang.PrimitiveType;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.isPrimitiveNumberClassDescriptor;
+import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitiveNumberClassDescriptor;
 import static org.jetbrains.jet.lang.types.lang.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME;
 
 public class RangeCodegenUtil {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/SamCodegenUtil.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java
index a7bef2b4c20..1a2a566120d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/SamCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamType.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/SamType.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java
index 24f4b9116ce..8fe33da66ca 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/SamType.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperClasses.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperClasses.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperClasses.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperClasses.java
index 23f13042450..d7dc005b0c0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperClasses.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Maps;
 import com.intellij.openapi.util.Factory;
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.org.objectweb.asm.Type;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java
index d32345b0f04..6295e30d0c2 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl;
 import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
@@ -37,7 +37,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 
 import java.util.Collections;
 
-import static org.jetbrains.jet.codegen.AsmUtil.*;
+import static org.jetbrains.kotlin.codegen.AsmUtil.*;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE;
 import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass;
 import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java
index 457729f94e9..b378a74ded0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.util.ArrayUtil;
 import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.context.MethodContext;
-import org.jetbrains.jet.codegen.context.ScriptContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.MethodContext;
+import org.jetbrains.kotlin.codegen.context.ScriptContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
@@ -38,9 +38,9 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.method;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLASS_FOR_SCRIPT;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.asmTypeForScriptDescriptor;
+import static org.jetbrains.kotlin.codegen.AsmUtil.method;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLASS_FOR_SCRIPT;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForScriptDescriptor;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*;
 import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin;
 import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SignatureCollectingClassBuilderFactory.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/SignatureCollectingClassBuilderFactory.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt
index d4dfb6e6162..5edfa821e52 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/SignatureCollectingClassBuilderFactory.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen
+package org.jetbrains.kotlin.codegen
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.org.objectweb.asm.FieldVisitor
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
index fa5511a1e64..d09a67845ee 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.psi.tree.IElementType;
 import kotlin.Function1;
@@ -22,9 +22,9 @@ import kotlin.Unit;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethod;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethod;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetArrayAccessExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
@@ -45,7 +45,7 @@ import org.jetbrains.org.objectweb.asm.commons.Method;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.*;
+import static org.jetbrains.kotlin.codegen.AsmUtil.*;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/StackValue.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
index 05dfdbb13b4..0f9380a24d0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen
+package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import org.jetbrains.org.objectweb.asm.Label
-import org.jetbrains.jet.codegen.StackValue.StackValueWithSimpleReceiver
 
 class CoercionValue(
         val value: StackValue,
@@ -78,4 +77,3 @@ open class OperationStackValue(val resultType: Type, val lambda: (v: Instruction
 }
 
 class FunctionCallStackValue(resultType: Type, lambda: (v: InstructionAdapter) -> Unit) : OperationStackValue(resultType, lambda)
-
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java
index 29ed40df6f0..8ab17a2c649 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/TailRecursionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.context.MethodContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.MethodContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/TraitImplBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/TraitImplBodyCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java
index cab88d46f38..9bbb816bb4b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/TraitImplBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
+import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.context.ClassContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.ClassContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 
-import static org.jetbrains.jet.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation;
+import static org.jetbrains.kotlin.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation;
 import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
 
@@ -46,7 +47,7 @@ public class TraitImplBodyCodegen extends ClassBodyCodegen {
                       typeMapper.mapTraitImpl(descriptor).getInternalName(),
                       null,
                       "java/lang/Object",
-                      new String[0]
+                      ArrayUtil.EMPTY_STRING_ARRAY
         );
         v.visitSource(myClass.getContainingFile().getName(), null);
     }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CalculatedClosure.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/binding/CalculatedClosure.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java
index bc73695474d..e4e63357737 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CalculatedClosure.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.binding;
+package org.jetbrains.kotlin.codegen.binding;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.context.EnclosedValueDescriptor;
+import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
index ecc4445c49c..a37b28d5185 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.binding;
+package org.jetbrains.kotlin.codegen.binding;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
@@ -23,13 +23,13 @@ import com.intellij.util.containers.Stack;
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AsmUtil;
-import org.jetbrains.jet.codegen.JvmRuntimeTypes;
-import org.jetbrains.jet.codegen.SamCodegenUtil;
-import org.jetbrains.jet.codegen.SamType;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.when.SwitchCodegenUtil;
-import org.jetbrains.jet.codegen.when.WhenByEnumsMapping;
+import org.jetbrains.kotlin.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.JvmRuntimeTypes;
+import org.jetbrains.kotlin.codegen.SamCodegenUtil;
+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.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl;
@@ -55,7 +55,7 @@ import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 import static org.jetbrains.jet.lang.resolve.name.SpecialNames.safeIdentifier;
 import static org.jetbrains.jet.lexer.JetTokens.*;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java
index f7dafed09bd..69ad87121f6 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.binding;
+package org.jetbrains.kotlin.codegen.binding;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.SamType;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.when.WhenByEnumsMapping;
+import org.jetbrains.kotlin.codegen.SamType;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl;
 import org.jetbrains.jet.lang.psi.*;
@@ -39,7 +39,7 @@ import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.isInterface;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface;
 import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/MutableClosure.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/binding/MutableClosure.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java
index 47d78e95493..42dfff34f03 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/MutableClosure.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.binding;
+package org.jetbrains.kotlin.codegen.binding;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.context.EnclosedValueDescriptor;
+import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.types.JetType;
@@ -27,7 +27,7 @@ import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.getDirectMember;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.getDirectMember;
 
 public final class MutableClosure implements CalculatedClosure {
     private final ResolvedCall<ConstructorDescriptor> superCall;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/PsiCodegenPredictor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/binding/PsiCodegenPredictor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java
index 8043fc8ac92..78b84dd0967 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/PsiCodegenPredictor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.binding;
+package org.jetbrains.kotlin.codegen.binding;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.AsmUtil;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java
similarity index 87%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java
index d3c5cbbb612..a0d6bf3faad 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.OwnerKind;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
 public class AnonymousClassContext extends ClassContext {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java
similarity index 87%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java
index 5116ca78745..15c612f81a7 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.OwnerKind;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLOSURE;
 
 public class ClassContext extends FieldOwnerContext<ClassDescriptor> {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java
similarity index 86%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java
index 2d6527f26f0..81b1b6d70fc 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.OwnerKind;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
 class ClosureContext extends ClassContext {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
index 6a1ede559b6..d061510e4cf 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.*;
-import org.jetbrains.jet.codegen.binding.MutableClosure;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.*;
+import org.jetbrains.kotlin.codegen.binding.MutableClosure;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
@@ -33,10 +33,10 @@ import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.AsmUtil.CAPTURED_THIS_FIELD;
-import static org.jetbrains.jet.codegen.AsmUtil.getVisibilityAccessFlag;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.anonymousClassForFunction;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.canHaveOuter;
+import static org.jetbrains.kotlin.codegen.AsmUtil.CAPTURED_THIS_FIELD;
+import static org.jetbrains.kotlin.codegen.AsmUtil.getVisibilityAccessFlag;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.anonymousClassForFunction;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.canHaveOuter;
 import static org.jetbrains.org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.jetbrains.org.objectweb.asm.Opcodes.ACC_PROTECTED;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java
similarity index 87%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java
index f80008d961e..44329c3b9a2 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.OwnerKind;
-import org.jetbrains.jet.codegen.StackValue;
-import org.jetbrains.jet.codegen.binding.MutableClosure;
+import org.jetbrains.kotlin.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
 
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/EnclosedValueDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/EnclosedValueDescriptor.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/EnclosedValueDescriptor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/EnclosedValueDescriptor.java
index 4bcf7303025..ea4ade4db65 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/EnclosedValueDescriptor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/EnclosedValueDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.org.objectweb.asm.Type;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/FieldOwnerContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/FieldOwnerContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java
index 8088c2922cf..25f694695b2 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/FieldOwnerContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.OwnerKind;
-import org.jetbrains.jet.codegen.binding.MutableClosure;
+import org.jetbrains.kotlin.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java
index c3dbbd16882..36c84524c6a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.JvmCodegenUtil;
-import org.jetbrains.jet.codegen.StackValue;
-import org.jetbrains.jet.codegen.binding.MutableClosure;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.JvmCodegenUtil;
+import org.jetbrains.kotlin.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.binding.MutableClosure;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.org.objectweb.asm.Type;
 
-import static org.jetbrains.jet.codegen.AsmUtil.CAPTURED_RECEIVER_FIELD;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
+import static org.jetbrains.kotlin.codegen.AsmUtil.CAPTURED_RECEIVER_FIELD;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
 
 public interface LocalLookup {
     boolean lookupLocal(DeclarationDescriptor descriptor);
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java
index 0f66ddd4669..6464a0a5571 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AsmUtil;
-import org.jetbrains.jet.codegen.JvmCodegenUtil;
-import org.jetbrains.jet.codegen.OwnerKind;
-import org.jetbrains.jet.codegen.StackValue;
-import org.jetbrains.jet.codegen.binding.MutableClosure;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.JvmCodegenUtil;
+import org.jetbrains.kotlin.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.binding.MutableClosure;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.Type;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/PackageContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageContext.java
similarity index 91%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/PackageContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageContext.java
index 4993c1b4574..ad3ad7e60a7 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/PackageContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.OwnerKind;
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.org.objectweb.asm.Type;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/PackageFacadeContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageFacadeContext.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/PackageFacadeContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageFacadeContext.java
index c145c9165cb..359a551673f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/PackageFacadeContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageFacadeContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/RootContext.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/RootContext.java
index 94946f7cdd2..cd4aa600d00 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/RootContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.OwnerKind;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java
similarity index 91%
rename from compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java
index 2a25e2aef96..7731efdffcc 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.context;
+package org.jetbrains.kotlin.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.OwnerKind;
-import org.jetbrains.jet.codegen.binding.MutableClosure;
+import org.jetbrains.kotlin.codegen.OwnerKind;
+import org.jetbrains.kotlin.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectGeneration.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectGeneration.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectGeneration.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectGeneration.java
index 6caa2a77cfe..ea8a7efc4c9 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectGeneration.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectGeneration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectTransformer.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
index 198dde231ac..77d794dcc3f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/AnonymousObjectTransformer.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.*;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.ClassBuilder;
+import org.jetbrains.kotlin.codegen.FieldInfo;
+import org.jetbrains.kotlin.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.org.objectweb.asm.*;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode;
@@ -79,7 +82,7 @@ public class AnonymousObjectTransformer {
     }
 
     @NotNull
-    public InlineResult doTransform(@NotNull final AnonymousObjectGeneration anonymousObjectGen, @NotNull FieldRemapper parentRemapper) {
+    public InlineResult doTransform(@NotNull AnonymousObjectGeneration anonymousObjectGen, @NotNull FieldRemapper parentRemapper) {
         ClassBuilder classBuilder = createClassBuilder();
         final List<MethodNode> methodsToTransform = new ArrayList<MethodNode>();
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamDesc.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamDesc.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamDesc.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamDesc.java
index e8b90a8172e..3aea0ca0867 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamDesc.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.org.objectweb.asm.Type;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamInfo.java
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamInfo.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamInfo.java
index 0bd8f923b5b..ba32c51329b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamInfo.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.org.objectweb.asm.Type;
-import org.jetbrains.jet.codegen.StackValue;
 
 public class CapturedParamInfo extends ParameterInfo {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamOwner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamOwner.java
similarity index 83%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamOwner.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamOwner.java
index 3cae5ef4066..be2d71623f5 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/CapturedParamOwner.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CapturedParamOwner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.org.objectweb.asm.Type;
 
-public interface CapturedParamOwner  {
-
+public interface CapturedParamOwner {
     Type getType();
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/CoveringTryCatchNodeProcessor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/CoveringTryCatchNodeProcessor.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt
index dccae460bea..79e4fc658ca 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/CoveringTryCatchNodeProcessor.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline
+package org.jetbrains.kotlin.codegen.inline
 
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
 import org.jetbrains.org.objectweb.asm.tree.LabelNode
 import com.google.common.collect.LinkedListMultimap
-import org.jetbrains.org.objectweb.asm.Label
 import java.util.ArrayList
 import com.intellij.util.containers.Stack
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode
-import com.google.common.collect.Lists
 import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode
 import java.util.Comparator
 import java.util.Collections
@@ -140,4 +138,4 @@ public class TryCatchBlockNodeWrapper(val node: TryCatchBlockNode) : IntervalWit
         get() = node.handler
     override val type: String?
         get() = node.type
-}
\ No newline at end of file
+}
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldRemapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/FieldRemapper.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldRemapper.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/FieldRemapper.java
index 43d0c462b78..e2d21e7554e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/FieldRemapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/FieldRemapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode;
 import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode;
 import org.jetbrains.org.objectweb.asm.tree.MethodNode;
-import org.jetbrains.jet.codegen.StackValue;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineAdapter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineAdapter.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineAdapter.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineAdapter.java
index b461eb26b63..fc4b25e3ae8 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineAdapter.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
index 4947f82b204..ccf480d1416 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
@@ -1,32 +1,32 @@
 /*
-* Copyright 2010-2013 JetBrains s.r.o.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.*;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.context.MethodContext;
-import org.jetbrains.jet.codegen.context.PackageContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.*;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.MethodContext;
+import org.jetbrains.kotlin.codegen.context.PackageContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
@@ -56,9 +56,9 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
-import static org.jetbrains.jet.codegen.AsmUtil.getMethodAsmFlags;
-import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
-import static org.jetbrains.jet.codegen.inline.InlineCodegenUtil.addInlineMarker;
+import static org.jetbrains.kotlin.codegen.AsmUtil.getMethodAsmFlags;
+import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
+import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil.addInlineMarker;
 
 public class InlineCodegen extends CallGenerator {
     private final GenerationState state;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
index 0fb7cf24a70..196004ae50c 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -23,11 +23,11 @@ import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.context.PackageContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.PackageContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineException.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineException.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineException.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineException.java
index 00334ded8d7..a35836712c4 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineException.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 public class InlineException extends RuntimeException {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineResult.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineResult.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineResult.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineResult.java
index 6afd7e4347a..7890ab45f03 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineResult.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -27,7 +27,6 @@ public class InlineResult {
     private final ReifiedTypeParametersUsages reifiedTypeParametersUsages = new ReifiedTypeParametersUsages();
 
     private InlineResult() {
-
     }
 
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinedLambdaRemapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.java
similarity index 89%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinedLambdaRemapper.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.java
index 5440e72f578..4f28c961c86 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlinedLambdaRemapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlinedLambdaRemapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -32,10 +32,9 @@ public class InlinedLambdaRemapper extends FieldRemapper {
         super(lambdaInternalName, parent, methodParams);
     }
 
-
     @Override
     public boolean canProcess(@NotNull String fieldOwner, String fieldName, boolean isFolding) {
-        return isFolding ? super.canProcess(fieldOwner, fieldName, isFolding) : false;
+        return isFolding && super.canProcess(fieldOwner, fieldName, isFolding);
     }
 
     @Override
@@ -47,7 +46,6 @@ public class InlinedLambdaRemapper extends FieldRemapper {
         return parent.findField(fieldInsnNode, captured);
     }
 
-
     @Override
     public boolean isInsideInliningLambda() {
         return true;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java
index 18723d58dc7..999713b572d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -83,9 +83,8 @@ public class InliningContext {
     ) {
         Map<String, String> newTypeMappings = new HashMap<String, String>(typeMapping);
         newTypeMappings.putAll(additionalTypeMappings);
-        return new RegenetedClassContext(this, expressionMap, state, generator,
-                                   newTypeMappings, reifedTypeInliner, isInliningLambda, anonymousObjectGeneration);
-
+        return new RegeneratedClassContext(this, expressionMap, state, generator,
+                                           newTypeMappings, reifedTypeInliner, isInliningLambda, anonymousObjectGeneration);
     }
 
     public InliningContext subInline(NameGenerator generator, Map<String, String> additionalTypeMappings, boolean isInliningLambda) {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningInstructionAdapter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningInstructionAdapter.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningInstructionAdapter.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningInstructionAdapter.java
index c5cc8cc8e85..6bef8955525 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningInstructionAdapter.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningInstructionAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InternalFinallyBlockInliner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InternalFinallyBlockInliner.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java
index c686d8ca3a0..f03c016b0b1 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InternalFinallyBlockInliner.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.jet.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.AsmUtil;
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.jetbrains.org.objectweb.asm.Type;
@@ -33,7 +33,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.inline.InlineCodegenUtil.*;
+import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil.*;
 
 public class InternalFinallyBlockInliner extends CoveringTryCatchNodeProcessor<TryCatchBlockNodeInfo> {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InvokeCall.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InvokeCall.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/InvokeCall.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InvokeCall.java
index 1eb0d3f9ae9..4f62d9932d4 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InvokeCall.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InvokeCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.Nullable;
 
 class InvokeCall {
-
     private final int index;
-
     public final LambdaInfo lambdaInfo;
 
     InvokeCall(int index, @Nullable LambdaInfo lambdaInfo) {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LabelOwner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LabelOwner.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/LabelOwner.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LabelOwner.java
index 5b8a6fad30a..0a7c7e1268a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LabelOwner.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LabelOwner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 
 public interface LabelOwner {
-
     boolean isMyLabel(@NotNull String name);
 
     LabelOwner SKIP_ALL = new LabelOwner() {
@@ -29,12 +28,10 @@ public interface LabelOwner {
         }
     };
 
-
     LabelOwner NOT_APPLICABLE = new LabelOwner() {
         @Override
         public boolean isMyLabel(@NotNull String name) {
             throw new RuntimeException("This operation not applicable for current context");
         }
     };
-
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java
index 44ed13ec29f..72ba9681e28 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AsmUtil;
-import org.jetbrains.jet.codegen.StackValue;
-import org.jetbrains.jet.codegen.binding.CalculatedClosure;
-import org.jetbrains.jet.codegen.context.EnclosedValueDescriptor;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
+import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
@@ -38,13 +38,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
 
 public class LambdaInfo implements CapturedParamOwner, LabelOwner {
 
     public final JetFunctionLiteralExpression expression;
 
-    @NotNull
     private final JetTypeMapper typeMapper;
 
     @Nullable
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LocalVarRemapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/LocalVarRemapper.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java
index 8ae0ad269ca..155bf81ecd8 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LocalVarRemapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.resolve.java.AsmTypes;
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 
-import static org.jetbrains.jet.codegen.inline.LocalVarRemapper.RemapStatus.*;
+import static org.jetbrains.kotlin.codegen.inline.LocalVarRemapper.RemapStatus.*;
 
 public class LocalVarRemapper {
 
@@ -33,7 +33,7 @@ public class LocalVarRemapper {
     private final Parameters params;
     private final int actualParamsSize;
 
-    private final StackValue [] remapValues;
+    private final StackValue[] remapValues;
 
     private final int additionalShift;
 
@@ -128,11 +128,8 @@ public class LocalVarRemapper {
     }
 
     private static class RemapInfo {
-
         public final StackValue value;
-
         public final ParameterInfo parameterInfo;
-
         public final RemapStatus status;
 
         public RemapInfo(@NotNull StackValue value, @Nullable ParameterInfo info, RemapStatus remapStatus) {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxLocalsCalculator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxLocalsCalculator.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxLocalsCalculator.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxLocalsCalculator.java
index bd34bc7efec..db3803708c3 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxLocalsCalculator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxLocalsCalculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.org.objectweb.asm.Label;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java
index 59e92ae7205..d307569a92b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import com.intellij.openapi.util.Factory;
 import com.intellij.util.containers.ContainerUtil;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
index ed0628e9e28..e8c82115daa 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ClosureCodegen;
-import org.jetbrains.jet.codegen.StackValue;
-import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.ClosureCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
@@ -38,7 +38,7 @@ import org.jetbrains.org.objectweb.asm.tree.analysis.*;
 
 import java.util.*;
 
-import static org.jetbrains.jet.codegen.inline.InlineCodegenUtil.*;
+import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil.*;
 
 public class MethodInliner {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/NameGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/NameGenerator.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/NameGenerator.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/NameGenerator.java
index 13e4c337f6b..54d0f7601d3 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/NameGenerator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/NameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParameterInfo.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParameterInfo.java
index 5a877117321..5f29663c846 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParameterInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.resolve.java.AsmTypes;
 import org.jetbrains.org.objectweb.asm.Type;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/Parameters.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/Parameters.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.java
index d9097718f63..792d952473a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/Parameters.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import com.google.common.collect.Iterables;
 import org.jetbrains.annotations.NotNull;
@@ -26,9 +26,7 @@ import java.util.List;
 
 //All parameters with gaps
 public class Parameters implements Iterable<ParameterInfo> {
-
     private final List<ParameterInfo> real;
-
     private final List<CapturedParamInfo> captured;
 
     public Parameters(List<ParameterInfo> real, List<CapturedParamInfo> captured) {
@@ -93,5 +91,4 @@ public class Parameters implements Iterable<ParameterInfo> {
         }
         return result;
     }
-
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParametersBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParametersBuilder.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/ParametersBuilder.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParametersBuilder.java
index 68543c8d092..cda05b65e61 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParametersBuilder.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParametersBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.FrameMap;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.ArrayList;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RegenetedClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedClassContext.java
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/RegenetedClassContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedClassContext.java
index e5c6f1af58c..49e21d26753 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RegenetedClassContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedClassContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 
 import java.util.Map;
 
-public class RegenetedClassContext extends InliningContext {
-
-    @NotNull
+public class RegeneratedClassContext extends InliningContext {
     private final AnonymousObjectGeneration anonymousObjectGeneration;
 
-    protected RegenetedClassContext(
+    public RegeneratedClassContext(
             @Nullable InliningContext parent,
             @NotNull Map<Integer, LambdaInfo> map,
             @NotNull GenerationState state,
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RegeneratedLambdaFieldRemapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedLambdaFieldRemapper.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/RegeneratedLambdaFieldRemapper.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedLambdaFieldRemapper.java
index 0ed4db4f395..85f41d326c6 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RegeneratedLambdaFieldRemapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RegeneratedLambdaFieldRemapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,26 +14,22 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode;
-import org.jetbrains.jet.codegen.StackValue;
 
 import java.util.Collection;
 import java.util.Map;
 
 public class RegeneratedLambdaFieldRemapper extends FieldRemapper {
-
     private final String oldOwnerType;
-
     private final String newOwnerType;
-
     private final Parameters parameters;
-
     private final Map<String, LambdaInfo> recapturedLambdas;
 
     public RegeneratedLambdaFieldRemapper(
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/ReifiedTypeInliner.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/ReifiedTypeInliner.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
index 6215215bc82..5e1514721c8 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/ReifiedTypeInliner.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,27 +14,22 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline
+package org.jetbrains.kotlin.codegen.inline
 
 import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.tree.InsnList
 import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode
 import org.jetbrains.org.objectweb.asm.Opcodes
-import org.jetbrains.org.objectweb.asm.tree.IntInsnNode
 import org.jetbrains.org.objectweb.asm.tree.TypeInsnNode
-import org.jetbrains.org.objectweb.asm.tree.InsnNode
-import org.jetbrains.org.objectweb.asm.tree.MethodNode
-import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
-import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods
 import kotlin.platform.platformStatic
 import org.jetbrains.org.objectweb.asm.tree.LdcInsnNode
-import java.util.ArrayList
 import org.jetbrains.org.objectweb.asm.signature.SignatureReader
 import org.jetbrains.org.objectweb.asm.signature.SignatureWriter
 import org.jetbrains.org.objectweb.asm.MethodVisitor
 import com.google.common.collect.ImmutableSet
-import org.jetbrains.jet.codegen.context.MethodContext
+import org.jetbrains.kotlin.codegen.context.MethodContext
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
 
 public class ReifiedTypeInliner(private val parametersMapping: ReifiedTypeParameterMappings?) {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RemapVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemapVisitor.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/RemapVisitor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemapVisitor.java
index 990fcc2dba7..14597d78e4f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RemapVisitor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemapVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode;
-import org.jetbrains.jet.codegen.StackValue;
 
 public class RemapVisitor extends InliningInstructionAdapter {
-
     private final LocalVarRemapper remapper;
-
     private final FieldRemapper nodeRemapper;
-
     private final InstructionAdapter instructionAdapter;
 
     protected RemapVisitor(
@@ -102,5 +99,4 @@ public class RemapVisitor extends InliningInstructionAdapter {
     public AnnotationVisitor visitParameterAnnotation(int parameter, @NotNull String desc, boolean visible) {
         return null;
     }
-
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RemappingClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/RemappingClassBuilder.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java
index 01a0d2afcc6..d0d5dadd910 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RemappingClassBuilder.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ClassBuilder;
-import org.jetbrains.jet.codegen.DelegatingClassBuilder;
+import org.jetbrains.kotlin.codegen.ClassBuilder;
+import org.jetbrains.kotlin.codegen.DelegatingClassBuilder;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor;
 import org.jetbrains.org.objectweb.asm.ClassVisitor;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RootInliningContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RootInliningContext.java
similarity index 88%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/RootInliningContext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RootInliningContext.java
index 100fcc86b58..2a1143d4200 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/RootInliningContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RootInliningContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetElement;
 
 import java.util.Collections;
 import java.util.Map;
 
 public class RootInliningContext extends InliningContext {
-
     public final CodegenContext startContext;
-
     private final String classNameToInline;
-
     public final JetElement callElement;
 
     public RootInliningContext(
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/TryBlockClustering.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt
similarity index 87%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/TryBlockClustering.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt
index 48b48cb16e1..4b4be36519f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/TryBlockClustering.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline
+package org.jetbrains.kotlin.codegen.inline
 
-import java.util.ArrayList
 import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode
 import org.jetbrains.org.objectweb.asm.tree.LabelNode
-import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode
-import org.jetbrains.jet.codegen.inline.InlineCodegenUtil.*
-import kotlin.properties.Delegates
+import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil.*
 
 enum class TryCatchPosition {
     START
@@ -37,7 +34,6 @@ trait IntervalWithHandler {
 }
 
 class TryCatchBlockNodeInfo(val node: TryCatchBlockNode, val onlyCopyNotProcess: Boolean) : IntervalWithHandler {
-
     override val startLabel: LabelNode
             get() = node.start
     override val endLabel: LabelNode
@@ -66,6 +62,5 @@ fun <T: IntervalWithHandler> doClustering(blocks: List<T>) : List<TryBlockCluste
         cluster.blocks.add(block)
     }
 
-    return clusters.values().toList();
+    return clusters.values().toList()
 }
-
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/TypeRemapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/inline/TypeRemapper.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.java
index 3817008c5c5..ceed92f5352 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/TypeRemapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.inline;
+package org.jetbrains.kotlin.codegen.inline;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.org.objectweb.asm.commons.Remapper;
@@ -22,8 +22,6 @@ import org.jetbrains.org.objectweb.asm.commons.Remapper;
 import java.util.Map;
 
 public class TypeRemapper extends Remapper {
-
-    @NotNull
     private final Map<String, String> typeMapping;
 
     //typeMapping could be changed outside through method processing
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayGet.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.java
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayGet.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.java
index 74e3ec177e9..9d57a2c3d6a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayGet.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayGet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.org.objectweb.asm.Type;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.correctElementType;
+import static org.jetbrains.kotlin.codegen.AsmUtil.correctElementType;
 
 public class ArrayGet extends LazyIntrinsicMethod {
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java
index 0dfed6520d9..9503c8d2d43 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.psi.JetCallExpression;
@@ -36,7 +36,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 import java.util.Iterator;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
+import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType;
 import static org.jetbrains.jet.lang.resolve.java.mapping.PrimitiveTypesUtil.asmTypeForPrimitive;
 import static org.jetbrains.jet.lang.types.lang.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySet.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySet.java
similarity index 84%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySet.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySet.java
index 98264f6627b..167aaa65095 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySet.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.correctElementType;
+import static org.jetbrains.kotlin.codegen.AsmUtil.correctElementType;
 
 public class ArraySet extends IntrinsicMethod {
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySize.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySize.kt
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySize.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySize.kt
index 85cb4a3a5b1..bb5d5c5adb1 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySize.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArraySize.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.org.objectweb.asm.Type
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.psi.JetExpression
 
 public class ArraySize : LazyIntrinsicMethod() {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/BinaryOp.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/BinaryOp.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt
index 33c048f77cf..e8a2ee85ff6 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/BinaryOp.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/BinaryOp.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.psi.JetExpression
 
 import org.jetbrains.org.objectweb.asm.Opcodes.*
-import org.jetbrains.jet.codegen.AsmUtil.isPrimitive
-import org.jetbrains.jet.codegen.AsmUtil.numberFunctionOperandType
+import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive
+import org.jetbrains.kotlin.codegen.AsmUtil.numberFunctionOperandType
 
 public class BinaryOp(private val opcode: Int) : IntrinsicMethod() {
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Clone.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Clone.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java
index b0b5f3b12a8..599a44c234a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Clone.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetSuperExpression;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CompareTo.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CompareTo.java
index d3f291162d7..370e8f7a44b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CompareTo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.comparisonOperandType;
+import static org.jetbrains.kotlin.codegen.AsmUtil.comparisonOperandType;
 
 public class CompareTo extends IntrinsicMethod {
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java
index 86f845aa0ca..89d6197a16c 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.java.AsmTypes;
 import org.jetbrains.org.objectweb.asm.Type;
@@ -27,8 +27,8 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.genInvokeAppendMethod;
-import static org.jetbrains.jet.codegen.AsmUtil.genStringBuilderConstructor;
+import static org.jetbrains.kotlin.codegen.AsmUtil.genInvokeAppendMethod;
+import static org.jetbrains.kotlin.codegen.AsmUtil.genStringBuilderConstructor;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.JAVA_STRING_TYPE;
 
 public class Concat extends IntrinsicMethod {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CopyToArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CopyToArray.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java
index ead36e9fb9c..d5627f2751b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CopyToArray.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.org.objectweb.asm.Type;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt
index 59757bcb9fb..f1bc1f5e195 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.org.objectweb.asm.Type
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.psi.JetCallExpression
 import org.jetbrains.jet.lang.psi.JetExpression
 import org.jetbrains.jet.lexer.JetTokens
 
-import org.jetbrains.jet.codegen.AsmUtil.genEqualsForExpressionsOnStack
+import org.jetbrains.kotlin.codegen.AsmUtil.genEqualsForExpressionsOnStack
 import org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE
 
 public class Equals : LazyIntrinsicMethod() {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/HashCode.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt
similarity index 87%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/HashCode.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt
index 05e4c7db2dc..ac97ec72aa3 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/HashCode.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.psi.JetExpression
 import org.jetbrains.jet.lang.resolve.java.AsmTypes
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java
similarity index 90%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java
index 7e864e8de28..340a8d393b5 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetBinaryExpression;
 import org.jetbrains.jet.lang.psi.JetCallExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Increment.kt
similarity index 80%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Increment.kt
index 721ff74de09..ce88b23199a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Increment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.psi.JetExpression
 import org.jetbrains.org.objectweb.asm.Type
-
-import org.jetbrains.jet.codegen.AsmUtil.genIncrement
-import org.jetbrains.jet.codegen.AsmUtil.isPrimitive
+import org.jetbrains.kotlin.codegen.AsmUtil.genIncrement
+import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive
 
 public class Increment(private val myDelta: Int) : LazyIntrinsicMethod() {
 
@@ -34,7 +33,7 @@ public class Increment(private val myDelta: Int) : LazyIntrinsicMethod() {
             val operand = arguments.get(0)
             val stackValue = codegen.genQualified(receiver, operand)
             if (stackValue is StackValue.Local && Type.INT_TYPE == stackValue.type) {
-                return StackValue.preIncrementForLocalVar((stackValue as StackValue.Local).index, myDelta)
+                return StackValue.preIncrementForLocalVar(stackValue.index, myDelta)
             }
             else {
                 return StackValue.preIncrement(returnType, stackValue, myDelta, this, null, codegen)
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethod.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethod.java
similarity index 89%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethod.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethod.java
index c0dddf791f3..c4768a5141f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethod.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import kotlin.Function1;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.Callable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.Callable;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java
similarity index 99%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java
index 4dcc10055b9..6f0958d1b84 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.google.common.collect.ImmutableList;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicsMap.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicsMap.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java
index 24f83c36b1e..14fe44d4074 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicsMap.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.google.common.collect.Maps;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Inv.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.java
similarity index 82%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Inv.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.java
index 5a338e23289..c12472f87e2 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Inv.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
-import static org.jetbrains.jet.codegen.AsmUtil.numberFunctionOperandType;
+import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
+import static org.jetbrains.kotlin.codegen.AsmUtil.numberFunctionOperandType;
 
 public class Inv extends IntrinsicMethod {
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java
index ad826487a3e..349e66a58a0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.java.AsmTypes;
 import org.jetbrains.org.objectweb.asm.Type;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java
similarity index 91%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassArray.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java
index ad775e19d28..5240629db4c 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassArray.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetExpression;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java
similarity index 86%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java
index 6d89bd0e0d1..f0efb2c160d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
-import org.jetbrains.jet.codegen.inline.ReifiedTypeInliner;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.inline.ReifiedTypeInliner;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage;
@@ -32,7 +32,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.putJavaLangClassInstance;
+import static org.jetbrains.kotlin.codegen.AsmUtil.putJavaLangClassInstance;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType;
 
 public class JavaClassFunction extends IntrinsicMethod {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java
similarity index 83%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java
index 01779b1afcc..c847aa3cff9 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AsmUtil;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.boxType;
-import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
+import static org.jetbrains.kotlin.codegen.AsmUtil.boxType;
+import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType;
 
 public class JavaClassProperty extends IntrinsicMethod {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/LazyIntrinsicMethod.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/LazyIntrinsicMethod.java
similarity index 91%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/LazyIntrinsicMethod.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/LazyIntrinsicMethod.java
index 17db4c20e78..b9899788ddb 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/LazyIntrinsicMethod.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/LazyIntrinsicMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/MonitorInstruction.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/MonitorInstruction.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java
index ccea4469580..977b9bfa89d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/MonitorInstruction.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.ValueArgument;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NewArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NewArray.java
similarity index 86%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NewArray.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NewArray.java
index 2830e5d4f4c..b9dd1ea7a6d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NewArray.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NewArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetCallExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.org.objectweb.asm.Type;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Not.java
similarity index 87%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Not.java
index 0dfffb3a8df..b0f1c9eb8b6 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Not.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.org.objectweb.asm.Type;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 
 import java.util.List;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NumberCast.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NumberCast.java
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NumberCast.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NumberCast.java
index e56f84e7efa..190fc20a80d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NumberCast.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/NumberCast.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.org.objectweb.asm.Type;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/RangeTo.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/RangeTo.java
index 2671998a4c3..f7b0176a699 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/RangeTo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetBinaryExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.org.objectweb.asm.Type;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringGetChar.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringGetChar.kt
similarity index 87%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringGetChar.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringGetChar.kt
index 3edd258ef39..aae816b6fba 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringGetChar.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringGetChar.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.org.objectweb.asm.Type
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.psi.JetExpression
 
 public class StringGetChar : LazyIntrinsicMethod() {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt
similarity index 89%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt
index 497c00dfb44..b862ad7932d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.psi.JetExpression
 import org.jetbrains.org.objectweb.asm.Type
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ToString.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ToString.kt
similarity index 62%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ToString.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ToString.kt
index ef5b09f380a..c45080346c0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ToString.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ToString.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +14,24 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
+import org.jetbrains.kotlin.codegen.AsmUtil.genToString
 import org.jetbrains.jet.lang.psi.JetExpression
 
-import org.jetbrains.jet.codegen.AsmUtil.genToString
-
 public class ToString : LazyIntrinsicMethod() {
-    override fun generateImpl(codegen: ExpressionCodegen,
-                              returnType: Type,
-                              element: PsiElement?,
-                              arguments: List<JetExpression>,
-                              receiver: StackValue): StackValue {
+    override fun generateImpl(
+            codegen: ExpressionCodegen,
+            returnType: Type,
+            element: PsiElement?,
+            arguments: List<JetExpression>,
+            receiver: StackValue
+    ): StackValue {
         return genToString(receiver, receiver.type)
     }
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryMinus.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryMinus.kt
similarity index 63%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryMinus.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryMinus.kt
index de4b541c331..6aa59cfdf32 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryMinus.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryMinus.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,31 +14,31 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics
+package org.jetbrains.kotlin.codegen.intrinsics
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.org.objectweb.asm.Type
-import org.jetbrains.jet.codegen.ExpressionCodegen
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
+import org.jetbrains.kotlin.codegen.AsmUtil.*
 import org.jetbrains.jet.lang.psi.JetExpression
 
-import org.jetbrains.jet.codegen.AsmUtil.*
-
 public class UnaryMinus : LazyIntrinsicMethod() {
-
-    override fun generateImpl(codegen: ExpressionCodegen,
-                              returnType: Type,
-                              element: PsiElement?,
-                              arguments: List<JetExpression>,
-                              receiver: StackValue): StackValue {
+    override fun generateImpl(
+            codegen: ExpressionCodegen,
+            returnType: Type,
+            element: PsiElement?,
+            arguments: List<JetExpression>,
+            receiver: StackValue
+    ): StackValue {
         assert(isPrimitive(returnType)) { "Return type of UnaryMinus intrinsic should be of primitive type: " + returnType }
 
         val operandType = numberFunctionOperandType(returnType)
 
-        val newreceiver = if (arguments.size() == 1) codegen.gen(arguments.get(0)) else receiver
+        val newReceiver = if (arguments.size() == 1) codegen.gen(arguments.get(0)) else receiver
 
         return StackValue.operation(operandType) {
-            newreceiver.put(operandType, it)
+            newReceiver.put(operandType, it)
             it.neg(operandType)
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryPlus.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryPlus.java
similarity index 85%
rename from compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryPlus.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryPlus.java
index 7fc15b9aead..9647b35b6b1 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryPlus.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/UnaryPlus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.intrinsics;
+package org.jetbrains.kotlin.codegen.intrinsics;
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.org.objectweb.asm.Type;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.StackValue;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.StackValue;
 import org.jetbrains.jet.lang.psi.JetExpression;
 
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
+import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
 
 public class UnaryPlus extends LazyIntrinsicMethod {
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilder.java
similarity index 88%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationClassBuilder.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilder.java
index 878c25f839f..5ff69e44cd6 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationClassBuilder.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization;
+package org.jetbrains.kotlin.codegen.optimization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ClassBuilder;
-import org.jetbrains.jet.codegen.DelegatingClassBuilder;
+import org.jetbrains.kotlin.codegen.ClassBuilder;
+import org.jetbrains.kotlin.codegen.DelegatingClassBuilder;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationClassBuilderFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilderFactory.java
similarity index 86%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationClassBuilderFactory.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilderFactory.java
index d2d441525bb..cb4a77d8de3 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationClassBuilderFactory.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization;
+package org.jetbrains.kotlin.codegen.optimization;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ClassBuilder;
-import org.jetbrains.jet.codegen.ClassBuilderFactory;
-import org.jetbrains.jet.codegen.ClassBuilderMode;
+import org.jetbrains.kotlin.codegen.ClassBuilder;
+import org.jetbrains.kotlin.codegen.ClassBuilderFactory;
+import org.jetbrains.kotlin.codegen.ClassBuilderMode;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
 
 public class OptimizationClassBuilderFactory implements ClassBuilderFactory {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationMethodVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.java
similarity index 91%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationMethodVisitor.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.java
index 7a3f18d1785..8c60a1dc746 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/OptimizationMethodVisitor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization;
+package org.jetbrains.kotlin.codegen.optimization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.inline.InlineCodegenUtil;
-import org.jetbrains.jet.codegen.optimization.boxing.RedundantBoxingMethodTransformer;
-import org.jetbrains.jet.codegen.optimization.boxing.RedundantNullCheckMethodTransformer;
-import org.jetbrains.jet.codegen.optimization.transformer.MethodTransformer;
+import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil;
+import org.jetbrains.kotlin.codegen.optimization.boxing.RedundantBoxingMethodTransformer;
+import org.jetbrains.kotlin.codegen.optimization.boxing.RedundantNullCheckMethodTransformer;
+import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.jetbrains.org.objectweb.asm.tree.LocalVariableNode;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/RedundantGotoMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/RedundantGotoMethodTransformer.kt
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/RedundantGotoMethodTransformer.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/RedundantGotoMethodTransformer.kt
index d13037550ce..1558f7d0f73 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/RedundantGotoMethodTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/RedundantGotoMethodTransformer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization
+package org.jetbrains.kotlin.codegen.optimization
 
-import org.jetbrains.jet.codegen.optimization.transformer.MethodTransformer
+import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode
 import org.jetbrains.org.objectweb.asm.tree.LabelNode
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.tree.JumpInsnNode
 
-
 public class RedundantGotoMethodTransformer : MethodTransformer() {
     /**
      * Removes redundant GOTO's, i.e. to subsequent labels
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/StoreStackBeforeInlineMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/StoreStackBeforeInlineMethodTransformer.kt
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/StoreStackBeforeInlineMethodTransformer.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/StoreStackBeforeInlineMethodTransformer.kt
index ee3bd88f2e9..13f56120358 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/StoreStackBeforeInlineMethodTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/StoreStackBeforeInlineMethodTransformer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization
-
-import org.jetbrains.jet.codegen.optimization.transformer.MethodTransformer
-import org.jetbrains.jet.codegen.optimization.common.OptimizationBasicInterpreter
-import org.jetbrains.jet.codegen.inline.InlineCodegenUtil
+package org.jetbrains.kotlin.codegen.optimization
 
+import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer
+import org.jetbrains.kotlin.codegen.optimization.common.OptimizationBasicInterpreter
+import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode
 import org.jetbrains.org.objectweb.asm.Opcodes
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/BoxedBasicValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxedBasicValue.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/BoxedBasicValue.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxedBasicValue.java
index 5030fe1f089..0623896d3aa 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/BoxedBasicValue.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxedBasicValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.AsmUtil;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode;
 import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/BoxingInterpreter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/BoxingInterpreter.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.java
index 39ac49a3168..dd7cae6ba09 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/BoxingInterpreter.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing;
 
 import com.google.common.collect.ImmutableSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AsmUtil;
-import org.jetbrains.jet.codegen.RangeCodegenUtil;
-import org.jetbrains.jet.codegen.optimization.common.OptimizationBasicInterpreter;
+import org.jetbrains.kotlin.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.RangeCodegenUtil;
+import org.jetbrains.kotlin.codegen.optimization.common.OptimizationBasicInterpreter;
 import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/ProgressionIteratorBasicValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/ProgressionIteratorBasicValue.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/ProgressionIteratorBasicValue.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/ProgressionIteratorBasicValue.java
index afec742efe4..aae5e0c1cb6 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/ProgressionIteratorBasicValue.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/ProgressionIteratorBasicValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing;
 
 import com.google.common.collect.ImmutableMap;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxedValuesCollection.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxedValuesCollection.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxedValuesCollection.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxedValuesCollection.java
index 87d60195e09..5849a988d13 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxedValuesCollection.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxedValuesCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxingInterpreter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingInterpreter.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxingInterpreter.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingInterpreter.java
index 7dc83594335..6f8efcf21df 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxingInterpreter.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingInterpreter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing;
 
 import com.google.common.collect.ImmutableSet;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java
index 61dbdff7a8b..aa5dd6d7a08 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.optimization.transformer.MethodTransformer;
+import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer;
 import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
@@ -253,7 +253,7 @@ public class RedundantBoxingMethodTransformer extends MethodTransformer {
                     new TypeInsnNode(Opcodes.CHECKCAST, iterator.getType().getInternalName())
             );
 
-            //invoke concrete method (kotlin/<T>iteraror.next<T>())
+            //invoke concrete method (kotlin/<T>iterator.next<T>())
             node.instructions.set(
                     value.getBoxingInsn(),
                     new MethodInsnNode(
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantNullCheckMethodTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantNullCheckMethodTransformer.java
similarity index 92%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantNullCheckMethodTransformer.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantNullCheckMethodTransformer.java
index 8772b6baf48..c2212043194 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantNullCheckMethodTransformer.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantNullCheckMethodTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.boxing;
+package org.jetbrains.kotlin.codegen.optimization.boxing;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.optimization.transformer.MethodTransformer;
+import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer;
 import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.jetbrains.org.objectweb.asm.tree.*;
-import org.jetbrains.org.objectweb.asm.tree.analysis.Analyzer;
 import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue;
 import org.jetbrains.org.objectweb.asm.tree.analysis.Frame;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/common/OptimizationBasicInterpreter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/OptimizationBasicInterpreter.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/common/OptimizationBasicInterpreter.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/OptimizationBasicInterpreter.java
index b2abbd80cbb..d91b2679835 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/common/OptimizationBasicInterpreter.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/OptimizationBasicInterpreter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.common;
+package org.jetbrains.kotlin.codegen.optimization.common;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/transformer/MethodTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/optimization/transformer/MethodTransformer.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java
index c95fe66a95d..62b56f1e72a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/optimization/transformer/MethodTransformer.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.optimization.transformer;
+package org.jetbrains.kotlin.codegen.optimization.transformer;
 
 import kotlin.jvm.KotlinSignature;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java
index 04f4d5c3ba1..800f6570fcd 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.signature;
+package org.jetbrains.kotlin.codegen.signature;
 
 import com.intellij.util.containers.Stack;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/signature/KotlinToJvmSignatureMapperImpl.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
similarity index 86%
rename from compiler/backend/src/org/jetbrains/jet/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
index 056d112b395..8cee95cb306 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.signature
+package org.jetbrains.kotlin.codegen.signature
 
-import org.jetbrains.jet.codegen.ClassBuilderMode
-import org.jetbrains.jet.codegen.state.JetTypeMapper
+import org.jetbrains.kotlin.codegen.ClassBuilderMode
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
index 3e976f1eb16..c999cff1997 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.state
+package org.jetbrains.kotlin.codegen.state
 
 import com.intellij.psi.PsiElement
 import com.intellij.util.containers.MultiMap
-import org.jetbrains.jet.codegen.ClassBuilderFactory
-import org.jetbrains.jet.codegen.SignatureCollectingClassBuilderFactory
+import org.jetbrains.kotlin.codegen.ClassBuilderFactory
+import org.jetbrains.kotlin.codegen.SignatureCollectingClassBuilderFactory
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.resolve.java.diagnostics.*
@@ -27,7 +27,7 @@ import java.util.*
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DELEGATION
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERRIDE
 import org.jetbrains.kotlin.utils.addIfNotNull
-import org.jetbrains.jet.codegen.ClassBuilderMode
+import org.jetbrains.kotlin.codegen.ClassBuilderMode
 import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
 import org.jetbrains.jet.lang.diagnostics.DiagnosticSink
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java
index eef4419cbba..5b5ab813345 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/GenerationState.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.state;
+package org.jetbrains.kotlin.codegen.state;
 
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.*;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods;
-import org.jetbrains.jet.codegen.optimization.OptimizationClassBuilderFactory;
-import org.jetbrains.jet.codegen.when.MappingsClassesForWhenByEnum;
+import org.jetbrains.kotlin.codegen.*;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods;
+import org.jetbrains.kotlin.codegen.optimization.OptimizationClassBuilderFactory;
+import org.jetbrains.kotlin.codegen.when.MappingsClassesForWhenByEnum;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticSink;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
similarity index 98%
rename from compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
index 169f7d6f5a6..bc6396f1b8a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.state;
+package org.jetbrains.kotlin.codegen.state;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.*;
-import org.jetbrains.jet.codegen.binding.CalculatedClosure;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor;
-import org.jetbrains.jet.codegen.context.CodegenContext;
-import org.jetbrains.jet.codegen.signature.BothSignatureWriter;
+import org.jetbrains.kotlin.codegen.*;
+import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
@@ -63,10 +63,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static org.jetbrains.jet.codegen.AsmUtil.boxType;
-import static org.jetbrains.jet.codegen.AsmUtil.isStaticMethod;
-import static org.jetbrains.jet.codegen.JvmCodegenUtil.*;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
+import static org.jetbrains.kotlin.codegen.AsmUtil.boxType;
+import static org.jetbrains.kotlin.codegen.AsmUtil.isStaticMethod;
+import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapperWithOutDirectory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapperWithOutDirectory.java
similarity index 91%
rename from compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapperWithOutDirectory.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapperWithOutDirectory.java
index 311e320d6a2..086664d133a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapperWithOutDirectory.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapperWithOutDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.state;
+package org.jetbrains.kotlin.codegen.state;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ClassBuilderMode;
+import org.jetbrains.kotlin.codegen.ClassBuilderMode;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 
 import java.io.File;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/Progress.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/Progress.java
similarity index 93%
rename from compiler/backend/src/org/jetbrains/jet/codegen/state/Progress.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/state/Progress.java
index 0543b5fe985..96c9310fc3b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/Progress.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/Progress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.state;
+package org.jetbrains.kotlin.codegen.state;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/EnumSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java
similarity index 94%
rename from compiler/backend/src/org/jetbrains/jet/codegen/when/EnumSwitchCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java
index b12c195edad..c10377e5cf0 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/EnumSwitchCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.when;
+package org.jetbrains.kotlin.codegen.when;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
 import org.jetbrains.jet.lang.psi.JetWhenExpression;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.jet.lang.resolve.constants.EnumValue;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/IntegralConstantsSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java
similarity index 91%
rename from compiler/backend/src/org/jetbrains/jet/codegen/when/IntegralConstantsSwitchCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java
index 44060c9e462..a20928c79ce 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/IntegralConstantsSwitchCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.when;
+package org.jetbrains.kotlin.codegen.when;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
 import org.jetbrains.jet.lang.psi.JetWhenExpression;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.org.objectweb.asm.Label;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/MappingClassesForWhenByEnumCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java
similarity index 95%
rename from compiler/backend/src/org/jetbrains/jet/codegen/when/MappingClassesForWhenByEnumCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java
index ba111eb5002..800d33c35cf 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/MappingClassesForWhenByEnumCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.when;
+package org.jetbrains.kotlin.codegen.when;
 
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ClassBuilder;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.ClassBuilder;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.constants.EnumValue;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/MappingsClassesForWhenByEnum.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java
similarity index 91%
rename from compiler/backend/src/org/jetbrains/jet/codegen/when/MappingsClassesForWhenByEnum.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java
index c9b167d357e..1c0ff8b7dab 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/MappingsClassesForWhenByEnum.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingsClassesForWhenByEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.when;
+package org.jetbrains.kotlin.codegen.when;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetWhenExpression;
 import org.jetbrains.org.objectweb.asm.Type;
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/StringSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java
similarity index 96%
rename from compiler/backend/src/org/jetbrains/jet/codegen/when/StringSwitchCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java
index 78324811957..f807e34d669 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/StringSwitchCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.when;
+package org.jetbrains.kotlin.codegen.when;
 
 import com.google.common.collect.Maps;
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
 import org.jetbrains.jet.lang.psi.JetWhenExpression;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.jet.lang.resolve.constants.StringValue;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegen.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java
index 204f54fab77..f983aea31f6 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.when;
+package org.jetbrains.kotlin.codegen.when;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.FrameMap;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.FrameMap;
 import org.jetbrains.jet.lang.psi.JetWhenEntry;
 import org.jetbrains.jet.lang.psi.JetWhenExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -190,6 +190,7 @@ abstract public class SwitchCodegen {
         long table_space_cost = 4 + ((long) hi - lo + 1); // words
         long table_time_cost = 3; // comparisons
         long lookup_space_cost = 3 + 2 * (long) nlabels;
+        //noinspection UnnecessaryLocalVariable
         long lookup_time_cost = nlabels;
 
         boolean useTableSwitch = nlabels > 0 &&
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegenUtil.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java
index bf28b6097e9..2443a093226 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.when;
+package org.jetbrains.kotlin.codegen.when;
 
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ExpressionCodegen;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.ExpressionCodegen;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/WhenByEnumsMapping.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/WhenByEnumsMapping.java
similarity index 97%
rename from compiler/backend/src/org/jetbrains/jet/codegen/when/WhenByEnumsMapping.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/when/WhenByEnumsMapping.java
index 6f51b0c582c..366eb0c183f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/WhenByEnumsMapping.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/WhenByEnumsMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.when;
+package org.jetbrains.kotlin.codegen.when;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
index 7f961956192..cb993afd4fa 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
@@ -20,7 +20,7 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import com.intellij.openapi.Disposable;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.CompilationException;
+import org.jetbrains.kotlin.codegen.CompilationException;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.kotlin.config.Services;
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
index 219b03c1a9f..422abfc99aa 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -36,9 +36,9 @@ import kotlin.modules.AllModules;
 import kotlin.modules.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ClassFileFactory;
-import org.jetbrains.jet.codegen.GeneratedClassLoader;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.ClassFileFactory;
+import org.jetbrains.kotlin.codegen.GeneratedClassLoader;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.psi.JetFile;
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
index 72a5b5bb196..25c9663f4ac 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
@@ -31,9 +31,9 @@ import kotlin.modules.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.codegen.*;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.Progress;
+import org.jetbrains.kotlin.codegen.*;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.Progress;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.context.ContextPackage;
 import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java
index a1946e8f96e..4bab5967d01 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java
@@ -32,10 +32,10 @@ import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ClassBuilderFactories;
-import org.jetbrains.jet.codegen.CompilationErrorHandler;
-import org.jetbrains.jet.codegen.KotlinCodegenFacade;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.ClassBuilderFactories;
+import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
+import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.context.ContextPackage;
 import org.jetbrains.jet.context.GlobalContextImpl;
@@ -80,8 +80,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.AsmUtil.asmTypeByFqNameWithoutInnerClasses;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript;
+import static org.jetbrains.kotlin.codegen.AsmUtil.asmTypeByFqNameWithoutInnerClasses;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.registerClassNameForScript;
 import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
 
 public class ReplInterpreter {
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
index 82afe039af2..42c65c9434b 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
@@ -41,12 +41,12 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Stack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.CompilationErrorHandler;
-import org.jetbrains.jet.codegen.KotlinCodegenFacade;
-import org.jetbrains.jet.codegen.PackageCodegen;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.Progress;
+import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
+import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
+import org.jetbrains.kotlin.codegen.PackageCodegen;
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.Progress;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetFile;
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java
index 6cf7f3dc1b1..5183e214f2f 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java
@@ -19,9 +19,9 @@ package org.jetbrains.kotlin.asJava;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.containers.Stack;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.ClassBuilder;
-import org.jetbrains.jet.codegen.ClassBuilderFactory;
-import org.jetbrains.jet.codegen.ClassBuilderMode;
+import org.jetbrains.kotlin.codegen.ClassBuilder;
+import org.jetbrains.kotlin.codegen.ClassBuilderFactory;
+import org.jetbrains.kotlin.codegen.ClassBuilderMode;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
 
 /*package*/ class KotlinLightClassBuilderFactory implements ClassBuilderFactory {
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java
index 7a9e92e63e0..a91bb75ef25 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java
@@ -42,7 +42,7 @@ import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor;
+import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
 import org.jetbrains.jet.lang.psi.*;
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
index 94ef252ce62..a46dccb24da 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
@@ -109,7 +109,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
     }
 
     /**
-     * @see org.jetbrains.jet.codegen.binding.CodegenBinding#ENUM_ENTRY_CLASS_NEED_SUBCLASS
+     * @see org.jetbrains.kotlin.codegen.binding.CodegenBinding#ENUM_ENTRY_CLASS_NEED_SUBCLASS
       */
     @NotNull
     @Override
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java
index b2d050a055b..52d0a0b2aad 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java
@@ -24,7 +24,7 @@ import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.containers.Stack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AbstractClassBuilder;
+import org.jetbrains.kotlin.codegen.AbstractClassBuilder;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
diff --git a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java b/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
index d9e1ed134a6..2e4cd55ed09 100644
--- a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
+++ b/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet;
 
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.junit.Test;
 
 public class CompileCompilerDependenciesTest {
diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
index 7e81dbf3962..b40aeefd69b 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -48,7 +48,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
diff --git a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java b/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java
index d1c96d3d07f..3fa6ab3290b 100644
--- a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java
+++ b/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.io.ZipUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.kotlin.utils.PathUtil;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 import org.jetbrains.kotlin.cli.common.ExitCode;
diff --git a/compiler/tests/org/jetbrains/jet/ProgressionUtilTest.java b/compiler/tests/org/jetbrains/jet/ProgressionUtilTest.java
index 12707f17dcd..0acb488b8db 100644
--- a/compiler/tests/org/jetbrains/jet/ProgressionUtilTest.java
+++ b/compiler/tests/org/jetbrains/jet/ProgressionUtilTest.java
@@ -17,7 +17,7 @@
 package org.jetbrains.jet;
 
 import com.intellij.testFramework.UsefulTestCase;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 
 import java.lang.reflect.Method;
 import java.net.URL;
diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java
index 534d7d65f4a..8759b6527cf 100644
--- a/compiler/tests/org/jetbrains/jet/ScriptTest.java
+++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.CompilationException;
+import org.jetbrains.kotlin.codegen.CompilationException;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt
index f17b9aaee52..7b953f1b5bb 100644
--- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt
+++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt
@@ -26,7 +26,7 @@ import org.jetbrains.jet.JetTestUtils
 import java.io.FileInputStream
 import org.jetbrains.jet.test.util.RecursiveDescriptorComparator
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
 
 public class BuiltInsSerializerTest : TestCaseWithTmpdir() {
     private fun doTest(fileName: String) {
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
index a0264975ba0..16eea2b2bb2 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
@@ -24,10 +24,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.TestJdkKind;
-import org.jetbrains.jet.codegen.ClassFileFactory;
-import org.jetbrains.jet.codegen.GenerationUtils;
-import org.jetbrains.jet.codegen.InlineTestUtil;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.ClassFileFactory;
+import org.jetbrains.kotlin.codegen.GenerationUtils;
+import org.jetbrains.kotlin.codegen.InlineTestUtil;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java
index 94aeb228e61..897a0abd1c7 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.codegen.GenerationUtils;
+import org.jetbrains.kotlin.codegen.GenerationUtils;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
index 90c1f708d7f..3a42292daf2 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.TestCase;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.kotlin.cli.common.ExitCode;
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
index 691d644148c..f753672ab72 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
@@ -28,9 +28,9 @@ import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.TestJdkKind;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.codegen.GenerationUtils;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.GenerationUtils;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java
index 5dff49ee377..3b89465b650 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java
@@ -23,7 +23,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.config.CompilerConfiguration;
 
 import java.io.File;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java
index 9013db329b7..d6974b80c22 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java
index e5049b50d05..d3be8313a95 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.io.Files;
 import com.intellij.openapi.util.Condition;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java
index c4d30503d3c..e21c1ecaff6 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -25,7 +25,7 @@ import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.TestJdkKind;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractScriptCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/AbstractScriptCodegenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java
index fb6a98bb418..93f9438165c 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AbstractScriptCodegenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/AbstractTopLevelMembersInvocationTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java
index f86c776c884..b2c8ddf2e0e 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AbstractTopLevelMembersInvocationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java
index ad5f193a0a0..1d370b4a649 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/BridgeTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/BridgeTest.kt
rename to compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt
index 1cda65e82e2..ad8cc686fd1 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/BridgeTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen
+package org.jetbrains.kotlin.codegen
 
 import junit.framework.TestCase
 import org.jetbrains.kotlin.backend.common.bridges.*
diff --git a/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
index 39a975fa10e..3926a2f8aeb 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java
index 7e713b6971b..ec30529ba8e 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java
index 966a40d8236..aadf19f9d99 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
@@ -26,7 +26,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.findDeclaredMethodByName;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.findDeclaredMethodByName;
 
 public class ClassGenTest extends CodegenTestCase {
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ClassPathInParentClassLoaderTest.java
similarity index 89%
rename from compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/ClassPathInParentClassLoaderTest.java
index c61593ff32d..80cf601200d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ClassPathInParentClassLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
@@ -26,8 +26,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment;
 import java.io.File;
 import java.net.URLClassLoader;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.assertThrows;
-import static org.jetbrains.jet.codegen.CodegenTestUtil.compileJava;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.assertThrows;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.compileJava;
 
 public class ClassPathInParentClassLoaderTest extends CodegenTestCase {
     @NotNull
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
index c9cf3d55322..1401115c9ee 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.io.FileUtil;
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.kotlin.utils.UtilsPackage;
@@ -50,7 +50,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.*;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*;
 import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName;
 
 public abstract class CodegenTestCase extends UsefulTestCase {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
index ca018a30f84..82d346ded6d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.project.Project;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
index 7e32e12cc55..3bb07a915e6 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.base.Predicates;
 import com.intellij.openapi.util.SystemInfo;
@@ -25,9 +25,9 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.Progress;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.Progress;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.BindingTraceContext;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java
index 2919e199d1c..c013bd45f2d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.assertThrows;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.assertThrows;
 
 public class ControlStructuresTest extends CodegenTestCase {
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/codegen/DxChecker.java b/compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/DxChecker.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java
index 8e2c9fe9b95..356793a2286 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/DxChecker.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.android.dx.cf.direct.DirectClassFile;
 import com.android.dx.cf.direct.StdAttributeFactory;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/EnumGenTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/EnumGenTest.java
index 83c2e178200..301ce810804 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/EnumGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/FunctionGenTest.java
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/FunctionGenTest.java
index 73f40fc5ef3..7510813f82b 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/FunctionGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java
index 2e184343a6a..e17f88ead25 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
@@ -38,7 +38,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes;
 
 import java.io.File;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.compileJava;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.compileJava;
 
 public class GenerateNotNullAssertionsTest extends CodegenTestCase {
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java
similarity index 94%
rename from compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java
index d87a7ac6a4e..7d99072678f 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.base.Predicates;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java
index 37930dacf6d..409d5c080fd 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/InnerClassInfoGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/InnerClassInfoGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java
index f64d842542f..0a002fcef75 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/InnerClassInfoGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java
index 952ed92bd33..01af0fe0f80 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/JetValueParameterAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/JetValueParameterAnnotationTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/JetValueParameterAnnotationTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/JetValueParameterAnnotationTest.java
index a95ae091b8d..e223ecc6375 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/JetValueParameterAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/JetValueParameterAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
similarity index 93%
rename from compiler/tests/org/jetbrains/jet/codegen/KotlinClassAnnotationTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
index a5f1fa8ada1..b0c923d8a38 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/KotlinClassAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.descriptors.serialization.ClassData;
@@ -27,7 +27,7 @@ import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.Set;
 
-import static org.jetbrains.jet.codegen.KotlinPackageAnnotationTest.collectCallableNames;
+import static org.jetbrains.kotlin.codegen.KotlinPackageAnnotationTest.collectCallableNames;
 
 public class KotlinClassAnnotationTest extends CodegenTestCase {
     public static final FqName PACKAGE_NAME = new FqName("test");
diff --git a/compiler/tests/org/jetbrains/jet/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/KotlinPackageAnnotationTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
index 01240ba7fc7..caa1f1d42bc 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/KotlinPackageAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java
index 478b936e006..a7e3df6750d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/LineNumberTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java
index e55ef2be0f4..7c1c2957205 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/MethodOrderTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/MethodOrderTest.kt
rename to compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt
index d3803a43e9d..029ad274c36 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/MethodOrderTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen
+package org.jetbrains.kotlin.codegen
 
 import org.jetbrains.jet.ConfigurationKind
 import org.jetbrains.asm4.ClassReader
@@ -118,4 +118,4 @@ public class MethodOrderTest: CodegenTestCase() {
 
         TestCase.assertEquals(expectedOrder, methodNames)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java
index 4a72ed3f266..b4031bd0bbc 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.util.lang.UrlClassLoader;
 import org.intellij.lang.annotations.Language;
@@ -29,7 +29,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes;
 import java.io.File;
 import java.io.InputStream;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.compileJava;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.compileJava;
 import static org.jetbrains.kotlin.utils.UtilsPackage.join;
 
 public class OuterClassGenTest extends CodegenTestCase {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/PackageGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/PackageGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java
index a7366fd3e7c..57db960d90a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/PackageGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.jet.ConfigurationKind;
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.assertIsCurrentTime;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.assertIsCurrentTime;
 
 public class PackageGenTest extends CodegenTestCase {
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PatternMatchingTest.java
similarity index 95%
rename from compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/PatternMatchingTest.java
index 41b08825ed1..6c982b8525d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/PatternMatchingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 
 import java.lang.reflect.Method;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.assertThrows;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.assertThrows;
 
 public class PatternMatchingTest extends CodegenTestCase {
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PrimitiveTypesTest.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/PrimitiveTypesTest.java
index 5240d14ec35..bddb5f40edc 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/PrimitiveTypesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java
index 58aca51ab42..866043ba9d4 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
@@ -23,7 +23,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes;
 
 import java.lang.reflect.*;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.*;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*;
 
 public class PropertyGenTest extends CodegenTestCase {
     @Override
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java
index d68241175b9..5a88ae7890e 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
index e1701f01d20..e46d0e41345 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/SourceInfoGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/codegen/SourceInfoGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java
index 5a2cca22f02..28726c2f35d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/SourceInfoGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.kotlin.backend.common.output.OutputFile;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/StringsTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/StringsTest.java
index bec3d5802cf..11f61d06118 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/StringsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
index 29b08d179fc..54576b2c223 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java
index 6afa25aa01d..5dd97ef4530 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.testFramework.UsefulTestCase;
 import junit.extensions.TestSetup;
@@ -25,9 +25,9 @@ import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.TestJdkKind;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java
index 381cb9e3476..78008a328a1 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/VarArgTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/VarArgTest.java
index eeaa76fb3a1..a8e9057816e 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/VarArgTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen;
+package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java
similarity index 89%
rename from compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java
index 84beafda618..a4bf0153305 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.defaultConstructor;
+package org.jetbrains.kotlin.codegen.defaultConstructor;
 
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.codegen.CodegenTestCase;
+import org.jetbrains.kotlin.codegen.CodegenTestCase;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,7 +42,7 @@ public abstract class AbstractDefaultArgumentsReflectionTest extends CodegenTest
         String className = loadInstructionValue(fileText, "CLASS");
         boolean hasDefaultConstructor = loadInstructionValue(fileText, "HAS_DEFAULT_CONSTRUCTOR").equals("true");
 
-        Class aClass = generateClass(className);
+        Class<?> aClass = generateClass(className);
         assertNotNull("Cannot find class with name " + className, aClass);
         try {
             Constructor constructor = aClass.getDeclaredConstructor();
@@ -63,7 +63,7 @@ public abstract class AbstractDefaultArgumentsReflectionTest extends CodegenTest
         }
     }
 
-    private String loadInstructionValue(String fileContent, String instructionName) {
+    private static String loadInstructionValue(String fileContent, String instructionName) {
         List<String> testedClass = findListWithPrefixes(fileContent, "// " + instructionName + ": ");
         assertTrue("Cannot find " + instructionName + " instruction", !testedClass.isEmpty());
         assertTrue(instructionName + " instruction must have only one element", testedClass.size() == 1);
diff --git a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java
index c0b2c229c5c..c03415de9a0 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.defaultConstructor;
+package org.jetbrains.kotlin.codegen.defaultConstructor;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java
index eab2405de00..b5e3ad9ce6a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.flags;
+package org.jetbrains.kotlin.codegen.flags;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.codegen.GenerationUtils;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment;
+import org.jetbrains.kotlin.codegen.GenerationUtils;
 import org.jetbrains.org.objectweb.asm.*;
 
 import java.io.File;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
index 382f6801cf3..a3845f983c6 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.flags;
+package org.jetbrains.kotlin.codegen.flags;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
similarity index 91%
rename from compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
index 295d239cd6e..6865f851c77 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.forTestCompile;
+package org.jetbrains.kotlin.codegen.forTestCompile;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java
similarity index 95%
rename from compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java
index 4002c0e603b..9a1f7355a48 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.generated;
+package org.jetbrains.kotlin.codegen.generated;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
@@ -24,9 +24,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.TestJdkKind;
-import org.jetbrains.jet.codegen.CodegenTestCase;
-import org.jetbrains.jet.codegen.GenerationUtils;
-import org.jetbrains.jet.codegen.InlineTestUtil;
+import org.jetbrains.kotlin.codegen.CodegenTestCase;
+import org.jetbrains.kotlin.codegen.GenerationUtils;
+import org.jetbrains.kotlin.codegen.InlineTestUtil;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.kotlin.utils.UtilsPackage;
@@ -41,7 +41,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.codegen.CodegenTestUtil.compileJava;
+import static org.jetbrains.kotlin.codegen.CodegenTestUtil.compileJava;
 import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName;
 
 public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java
index 84c7fb6c82b..6e3e3ecbfb5 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.generated;
+package org.jetbrains.kotlin.codegen.generated;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
index f42a4b11631..a6b3a5bd8fd 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.generated;
+package org.jetbrains.kotlin.codegen.generated;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
index eef0f9d2965..cae92a79d1e 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.generated;
+package org.jetbrains.kotlin.codegen.generated;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
index 012a6595fb0..b01853f71f4 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.generated;
+package org.jetbrains.kotlin.codegen.generated;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
index 6c6da766233..38141812870 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.generated;
+package org.jetbrains.kotlin.codegen.generated;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
index 2e91b553951..69a68ea59e3 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.generated;
+package org.jetbrains.kotlin.codegen.generated;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
index c6942050be7..009ec61c26c 100644
--- a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
@@ -32,7 +32,7 @@ import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.test.Tmpdir;
 import org.jetbrains.kotlin.utils.PathUtil;
 import org.jetbrains.kotlin.cli.common.KotlinVersion;
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 37deed464a2..282a1fe84fd 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -26,12 +26,12 @@ import junit.framework.TestCase
 import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest
 import org.jetbrains.jet.resolve.AbstractResolveTest
 import org.jetbrains.jet.parsing.AbstractJetParsingTest
-import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest
-import org.jetbrains.jet.codegen.AbstractBytecodeTextTest
-import org.jetbrains.jet.codegen.AbstractTopLevelMembersInvocationTest
-import org.jetbrains.jet.codegen.AbstractCheckLocalVariablesTableTest
-import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest
-import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultArgumentsReflectionTest
+import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest
+import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest
+import org.jetbrains.kotlin.codegen.AbstractTopLevelMembersInvocationTest
+import org.jetbrains.kotlin.codegen.AbstractCheckLocalVariablesTableTest
+import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest
+import org.jetbrains.kotlin.codegen.defaultConstructor.AbstractDefaultArgumentsReflectionTest
 import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest
 import org.jetbrains.jet.jvm.compiler.AbstractCompileJavaAgainstKotlinTest
 import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest
@@ -114,7 +114,7 @@ import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest
 import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest
 import org.jetbrains.jet.lang.resolve.java.AbstractJavaTypeSubstitutorTest
 import org.jetbrains.jet.plugin.intentions.declarations.AbstractJoinLinesTest
-import org.jetbrains.jet.codegen.AbstractScriptCodegenTest
+import org.jetbrains.kotlin.codegen.AbstractScriptCodegenTest
 import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest
 import org.jetbrains.jet.psi.patternMatching.AbstractJetPsiUnifierTest
 import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest
@@ -138,7 +138,7 @@ import org.jetbrains.kotlin.js.test.semantics.AbstractDynamicTest
 import org.jetbrains.kotlin.js.test.semantics.AbstractMultiModuleTest
 import org.jetbrains.jet.completion.handlers.AbstractBasicCompletionHandlerTest
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.AbstractClsStubBuilderTest
-import org.jetbrains.jet.codegen.AbstractLineNumberTest
+import org.jetbrains.kotlin.codegen.AbstractLineNumberTest
 import org.jetbrains.jet.completion.handlers.AbstractKeywordCompletionHandlerTest
 
 fun main(args: Array<String>) {
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java
index 278b2ee4d6f..ee6e000488f 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java
@@ -36,7 +36,7 @@ import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor;
+import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
 import org.jetbrains.jet.context.ContextPackage;
 import org.jetbrains.jet.context.GlobalContextImpl;
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
index 17306f45932..8e78b4bccb0 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import com.intellij.psi.PsiReference
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
-import org.jetbrains.jet.codegen.PropertyCodegen
+import org.jetbrains.kotlin.codegen.PropertyCodegen
 import org.jetbrains.kotlin.asJava.KotlinLightMethod
 import org.jetbrains.jet.lang.resolve.OverrideResolver
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt
index 2f784819d8d..d9a4d01bc3f 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt
@@ -37,10 +37,10 @@ import com.sun.jdi.ReferenceType
 import com.sun.jdi.request.ClassPrepareRequest
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.jet.analyzer.AnalysisResult
-import org.jetbrains.jet.codegen.AsmUtil
-import org.jetbrains.jet.codegen.ClassBuilderFactories
-import org.jetbrains.jet.codegen.state.GenerationState
-import org.jetbrains.jet.codegen.state.JetTypeMapper
+import org.jetbrains.kotlin.codegen.AsmUtil
+import org.jetbrains.kotlin.codegen.ClassBuilderFactories
+import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.codegen.state.JetTypeMapper
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
@@ -65,7 +65,7 @@ import org.jetbrains.org.objectweb.asm.Type
 
 import java.util.*
 
-import org.jetbrains.jet.codegen.binding.CodegenBinding.asmTypeForAnonymousClass
+import org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass
 import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import com.intellij.psi.stubs.StubElement
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt
index 7ad64d72b66..c10cfdec444 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt
@@ -21,7 +21,7 @@ import com.intellij.debugger.ui.tree.NodeDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.debugger.impl.DebuggerContextImpl
 import com.intellij.debugger.SourcePosition
-import org.jetbrains.jet.codegen.AsmUtil
+import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.jet.lang.psi.JetClassOrObject
 import com.intellij.debugger.impl.DebuggerContextUtil
 import com.sun.jdi.ReferenceType
@@ -101,4 +101,4 @@ public class KotlinSourcePositionProvider: SourcePositionProvider() {
         }
         return null
     }
-}
\ No newline at end of file
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
index 73a300c00c8..ea38f753daf 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -22,9 +22,9 @@ import com.intellij.debugger.SourcePosition
 import com.intellij.debugger.engine.evaluation.*
 import com.intellij.debugger.engine.evaluation.expression.*
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils
-import org.jetbrains.jet.codegen.state.GenerationState
-import org.jetbrains.jet.codegen.ClassBuilderFactories
-import org.jetbrains.jet.codegen.KotlinCodegenFacade
+import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.codegen.ClassBuilderFactories
+import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
 import com.intellij.testFramework.LightVirtualFile
 import org.jetbrains.jet.plugin.JetLanguage
 import org.jetbrains.jet.lang.psi.JetFile
@@ -42,13 +42,13 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.eval4j.jdi.asValue
 import org.jetbrains.jet.lang.psi.JetNamedFunction
-import org.jetbrains.jet.codegen.ClassFileFactory
+import org.jetbrains.kotlin.codegen.ClassFileFactory
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection
 import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.jet.lang.psi.JetCodeFragment
 import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck
 import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.jet.codegen.CompilationErrorHandler
+import org.jetbrains.kotlin.codegen.CompilationErrorHandler
 import org.jetbrains.jet.lang.diagnostics.Severity
 import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages
 import com.sun.jdi.request.EventRequest
@@ -57,7 +57,7 @@ import com.intellij.debugger.engine.SuspendContext
 import org.jetbrains.jet.plugin.debugger.evaluate.KotlinEvaluateExpressionCache.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import com.sun.jdi.VirtualMachine
-import org.jetbrains.jet.codegen.AsmUtil
+import org.jetbrains.kotlin.codegen.AsmUtil
 import com.sun.jdi.InvalidStackFrameException
 import org.jetbrains.jet.plugin.util.application.runReadAction
 import org.jetbrains.jet.lang.psi.analysisContext
@@ -70,7 +70,7 @@ import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension
 import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
-import org.jetbrains.jet.codegen.StackValue
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.jet.lang.types.Flexibility
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.plugin.util.attachment.attachmentByPsiFile
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt b/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt
index 1c337c1ed24..7c6f8b6a93a 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt
@@ -33,9 +33,8 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi
 import com.sun.jdi.Field
 import com.sun.jdi.ReferenceType
 import com.sun.jdi.Type
-import com.sun.jdi.InvocationException
 import com.sun.jdi.Method
-import org.jetbrains.jet.codegen.PropertyCodegen
+import org.jetbrains.kotlin.codegen.PropertyCodegen
 import org.jetbrains.jet.lang.resolve.name.Name
 import com.intellij.debugger.engine.evaluation.EvaluateException
 
@@ -103,4 +102,4 @@ public class KotlinClassWithDelegatedPropertyRenderer : ClassRenderer() {
         val getterName = PropertyCodegen.getterName(Name.identifier(fieldName))
         return objRef.referenceType().methodsByName(getterName)?.firstOrNull()
     }
-}
\ No newline at end of file
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java
index 8e6d4e49412..cf9b491f0ae 100644
--- a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java
+++ b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java
@@ -36,11 +36,11 @@ import com.intellij.ui.content.ContentManager;
 import com.intellij.util.Alarm;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.analyzer.AnalysisResult;
-import org.jetbrains.jet.codegen.ClassBuilderFactories;
-import org.jetbrains.jet.codegen.CompilationErrorHandler;
-import org.jetbrains.jet.codegen.KotlinCodegenFacade;
-import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.Progress;
+import org.jetbrains.kotlin.codegen.ClassBuilderFactories;
+import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
+import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.state.Progress;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticSink;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt
index bcfcc6f0ac4..5da31407c12 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt
@@ -27,7 +27,7 @@ import com.intellij.psi.PsiMethod
 import com.intellij.psi.SyntheticElement
 import com.intellij.refactoring.util.RefactoringUtil
 import com.intellij.refactoring.rename.RenameProcessor
-import org.jetbrains.jet.codegen.PropertyCodegen
+import org.jetbrains.kotlin.codegen.PropertyCodegen
 import org.jetbrains.jet.lang.resolve.name.Name
 import com.intellij.usageView.UsageInfo
 import com.intellij.refactoring.listeners.RefactoringElementListener
diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java b/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java
index a3a8dc68bbe..5be9cbfa9ca 100644
--- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java
@@ -35,7 +35,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes;
 import java.util.Map;
 import java.util.Set;
 
-import static org.jetbrains.jet.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
+import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
 import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.*;
 
 /**
diff --git a/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java b/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java
index 6410a14a297..641d99dca02 100644
--- a/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java
+++ b/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin;
 
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 
 public class JetWithJdkAndRuntimeLightProjectDescriptor extends JetJdkAndLibraryProjectDescriptor {
     protected JetWithJdkAndRuntimeLightProjectDescriptor() {
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java
index e56df07690a..fc1fafcf793 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java
@@ -36,8 +36,8 @@ import com.sun.jdi.Location;
 import com.sun.jdi.ReferenceType;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.GenerationUtils;
-import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.kotlin.codegen.GenerationUtils;
+import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.project.PluginJetFilesProvider;
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
index 5182c1d3ace..775b2f503f5 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.MockLibraryUtil;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
diff --git a/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java b/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java
index 87bad091a6e..e226105b121 100644
--- a/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java
+++ b/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java
@@ -26,7 +26,7 @@ import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEdito
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.VfsUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 
 /**
  * Helper for configuring kotlin runtime in tested project.
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
index d0fa9d3b9ae..10c17122b72 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
@@ -24,7 +24,7 @@ import com.intellij.util.io.ZipUtil;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.AsmUtil;
+import org.jetbrains.kotlin.codegen.AsmUtil;
 import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.kotlin.utils.PathUtil;