diff --git a/.idea/runConfigurations/Js_backend_tests.xml b/.idea/runConfigurations/Js_backend_tests.xml
index 4746f7cefbc..02ae1806c98 100644
--- a/.idea/runConfigurations/Js_backend_tests.xml
+++ b/.idea/runConfigurations/Js_backend_tests.xml
@@ -4,7 +4,7 @@
     <module name="js.tests" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.js.test" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
diff --git a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java
index 96ec7890167..90ee9173cc7 100644
--- a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java
@@ -21,8 +21,8 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
-import org.jetbrains.k2js.test.rhino.RhinoUtils;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 3dbc76889e8..3b9d68303d8 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -120,9 +120,9 @@ import org.jetbrains.jet.psi.patternMatching.AbstractJetPsiUnifierTest
 import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest
 import org.jetbrains.jet.completion.weighers.AbstractSmartCompletionWeigherTest
 import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords
-import org.jetbrains.k2js.test.semantics.AbstractReservedWordTest
+import org.jetbrains.kotlin.js.test.semantics.AbstractReservedWordTest
 import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest
-import org.jetbrains.k2js.test.semantics.AbstractBridgeTest
+import org.jetbrains.kotlin.js.test.semantics.AbstractBridgeTest
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterForWebDemoTest
 import org.jetbrains.jet.plugin.decompiler.textBuilder.AbstractDecompiledTextTest
@@ -134,8 +134,8 @@ import org.jetbrains.jet.renderer.AbstractDescriptorRendererTest
 import org.jetbrains.jet.types.AbstractJetTypeBindingTest
 import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest
 import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest
-import org.jetbrains.k2js.test.semantics.AbstractDynamicTest
-import org.jetbrains.k2js.test.semantics.AbstractMultiModuleTest
+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
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractMultiModuleTest.kt b/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractMultiModuleTest.kt
deleted file mode 100644
index 088eee97b2f..00000000000
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractMultiModuleTest.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.jetbrains.k2js.test.semantics
-
-import org.jetbrains.k2js.test.MultipleModulesTranslationTest
-
-public abstract class AbstractMultiModuleTest : MultipleModulesTranslationTest("multiModule/")
\ No newline at end of file
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java
index 09ab91f1a77..fe46bede2f7 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.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.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import com.google.common.collect.Lists;
 import com.google.dart.compiler.backend.js.ast.JsNode;
@@ -44,10 +44,10 @@ import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.config.EcmaVersion;
 import org.jetbrains.k2js.config.LibrarySourcesConfig;
 import org.jetbrains.k2js.config.LibrarySourcesConfigWithCaching;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
-import org.jetbrains.k2js.test.utils.JsTestUtils;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
 import org.jetbrains.kotlin.js.facade.Status;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.test.utils.JsTestUtils;
 import org.jetbrains.kotlin.js.translate.context.Namer;
 
 import java.io.File;
@@ -57,9 +57,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import static org.jetbrains.k2js.test.rhino.RhinoUtils.runRhinoTest;
-import static org.jetbrains.k2js.test.utils.JsTestUtils.convertFileNameToDotJsFile;
 import static org.jetbrains.kotlin.js.facade.K2JSTranslator.translateWithMainCallParameters;
+import static org.jetbrains.kotlin.js.test.rhino.RhinoUtils.runRhinoTest;
+import static org.jetbrains.kotlin.js.test.utils.JsTestUtils.convertFileNameToDotJsFile;
 
 public abstract class BasicTest extends KotlinTestWithEnvironment {
     // predictable order of ecma version in tests
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleFilesTranslationTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleFilesTranslationTest.java
index a8415b57ea9..58475c0d6e9 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleFilesTranslationTest.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.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir;
+import static org.jetbrains.kotlin.js.test.utils.JsTestUtils.getAllFilesInDir;
 
 public abstract class MultipleFilesTranslationTest extends BasicTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt
index 6113bc7700c..bd8f0862704 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.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.k2js.test
+package org.jetbrains.kotlin.js.test
 
 import org.jetbrains.k2js.config.EcmaVersion
 import org.jetbrains.kotlin.js.facade.MainCallParameters
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker
-
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker
+import org.jetbrains.kotlin.js.test.utils.JsTestUtils.getAllFilesInDir
 import java.io.File
 import java.util.ArrayList
-
-import org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir
 import java.util.LinkedHashMap
 
 public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/OutputPrefixPostfixTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/OutputPrefixPostfixTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTest.java
index a2b7da99e73..8f1125fbdb8 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/OutputPrefixPostfixTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTest.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.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.semantics.TranslatorTestCaseBuilder;
+import org.jetbrains.kotlin.js.test.semantics.TranslatorTestCaseBuilder;
 
 import java.io.File;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationTest.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationTest.java
index 3631ef48c83..c4f48e5eccd 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationTest.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.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
-import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoSystemOutputChecker;
 
-import static org.jetbrains.k2js.test.utils.JsTestUtils.readFile;
+import static org.jetbrains.kotlin.js.test.utils.JsTestUtils.readFile;
 
 @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors")
 public abstract class SingleFileTranslationTest extends BasicTest {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationWithDirectivesTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationWithDirectivesTest.java
similarity index 86%
rename from js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationWithDirectivesTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationWithDirectivesTest.java
index 211bc528dcb..9872292d34a 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationWithDirectivesTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/SingleFileTranslationWithDirectivesTest.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.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import com.google.dart.compiler.backend.js.ast.JsNode;
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.utils.DirectiveTestUtils;
-import org.jetbrains.k2js.test.utils.JsTestUtils;
-import org.jetbrains.k2js.test.utils.MemoizeConsumer;
+import org.jetbrains.kotlin.js.test.utils.DirectiveTestUtils;
+import org.jetbrains.kotlin.js.test.utils.JsTestUtils;
+import org.jetbrains.kotlin.js.test.utils.MemoizeConsumer;
 
 public abstract class SingleFileTranslationWithDirectivesTest extends SingleFileTranslationTest {
     private final MemoizeConsumer<JsNode> nodeConsumer = new MemoizeConsumer<JsNode>();
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/SourceMapTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/SourceMapTest.java
index 368270865ce..39c9361b8cc 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/SourceMapTest.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.k2js.test;
+package org.jetbrains.kotlin.js.test;
 
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.semantics.TranslatorTestCaseBuilder;
+import org.jetbrains.kotlin.js.test.semantics.TranslatorTestCaseBuilder;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public final class SourceMapTest extends SingleFileTranslationTest {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/ast/JsScopeTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ast/JsScopeTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/ast/JsScopeTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/ast/JsScopeTest.java
index 198884325bf..de1da452067 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/ast/JsScopeTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ast/JsScopeTest.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.k2js.test.ast;
+package org.jetbrains.kotlin.js.test.ast;
 
 import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsScope;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/CompositeRhinoResultsChecker.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/CompositeRhinoResultsChecker.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/rhino/CompositeRhinoResultsChecker.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/CompositeRhinoResultsChecker.java
index f59861a9020..4766fdf5b12 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/CompositeRhinoResultsChecker.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/CompositeRhinoResultsChecker.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.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionNativeObjectResultChecker.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionNativeObjectResultChecker.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionNativeObjectResultChecker.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionNativeObjectResultChecker.java
index 56898278323..4160e0b2eb1 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionNativeObjectResultChecker.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionNativeObjectResultChecker.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.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionResultChecker.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionResultChecker.java
index 75584496b2d..49b2f09a821 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionResultChecker.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.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 
-import static org.jetbrains.k2js.test.rhino.RhinoUtils.flushSystemOut;
+import static org.jetbrains.kotlin.js.test.rhino.RhinoUtils.flushSystemOut;
 import static org.junit.Assert.assertEquals;
 
 public class RhinoFunctionResultChecker implements RhinoResultChecker {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoQUnitResultChecker.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoQUnitResultChecker.java
similarity index 84%
rename from js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoQUnitResultChecker.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoQUnitResultChecker.java
index aee7b3e50b7..580f0da711f 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoQUnitResultChecker.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoQUnitResultChecker.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.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.NativeArray;
 import org.mozilla.javascript.Scriptable;
 
-import static org.jetbrains.k2js.test.rhino.RhinoUtils.flushSystemOut;
+import static org.jetbrains.kotlin.js.test.rhino.RhinoUtils.flushSystemOut;
 import static org.junit.Assert.fail;
 
 /**
@@ -37,9 +37,8 @@ public class RhinoQUnitResultChecker implements RhinoResultChecker {
     protected void assertResultValid(Object result) {
         if (result instanceof NativeArray) {
             NativeArray array = (NativeArray) result;
-            StringBuffer buffer = new StringBuffer();
-            for (int i = 0, size = array.size(); i < size; i++) {
-                Object value = array.get(i);
+            StringBuilder buffer = new StringBuilder();
+            for (Object value : array) {
                 String text = value.toString();
                 System.out.println(text);
 
@@ -54,7 +53,7 @@ public class RhinoQUnitResultChecker implements RhinoResultChecker {
                 fail(buffer.toString());
             }
         } else {
-            fail("Uknown QUnit result: " + result);
+            fail("Unknown QUnit result: " + result);
         }
     }
 
@@ -65,5 +64,4 @@ public class RhinoQUnitResultChecker implements RhinoResultChecker {
     protected String functionCallString() {
         return "runQUnitSuite()";
     }
-
 }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoResultChecker.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoResultChecker.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoResultChecker.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoResultChecker.java
index 577c9e77ed2..981fc4bf99f 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoResultChecker.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoResultChecker.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.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoSystemOutputChecker.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoSystemOutputChecker.java
index 022e9602be5..7d0789a851f 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoSystemOutputChecker.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.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.js.facade.K2JSTranslator;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java
similarity index 98%
rename from js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java
index a0a9cae547c..9142c4114a9 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.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.k2js.test.rhino;
+package org.jetbrains.kotlin.js.test.rhino;
 
 import com.google.common.collect.Sets;
 import com.intellij.openapi.util.io.FileUtil;
@@ -34,8 +34,8 @@ import java.util.Set;
 
 import static org.jetbrains.jet.utils.UtilsPackage.rethrow;
 import static org.jetbrains.k2js.config.LibrarySourcesConfig.*;
-import static org.jetbrains.k2js.test.BasicTest.DIST_DIR_PATH;
-import static org.jetbrains.k2js.test.BasicTest.TEST_DATA_DIR_PATH;
+import static org.jetbrains.kotlin.js.test.BasicTest.DIST_DIR_PATH;
+import static org.jetbrains.kotlin.js.test.BasicTest.TEST_DATA_DIR_PATH;
 
 public final class RhinoUtils {
     private static final String KOTLIN_JS_LIB_ECMA_5 = TEST_DATA_DIR_PATH + "kotlin_lib_ecma5.js";
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractBridgeTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractBridgeTest.kt
similarity index 82%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractBridgeTest.kt
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractBridgeTest.kt
index 8d212cba0e8..6bbcb48971c 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractBridgeTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractBridgeTest.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,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics
+package org.jetbrains.kotlin.js.test.semantics
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
 
 public abstract class AbstractBridgeTest : SingleFileTranslationTest("bridges/") {
-
     override fun doTest(filename: String) = checkBlackBoxIsOkByPath(filename)
-}
\ No newline at end of file
+}
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractCallableReferenceTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractCallableReferenceTest.java
similarity index 84%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractCallableReferenceTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractCallableReferenceTest.java
index dc8255f0ac2..bc09ae9e1b5 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractCallableReferenceTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractCallableReferenceTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public abstract class AbstractCallableReferenceTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractDynamicTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDynamicTest.kt
similarity index 78%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractDynamicTest.kt
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDynamicTest.kt
index d1cd8f58820..366e9789bbe 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractDynamicTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDynamicTest.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,8 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics
+package org.jetbrains.kotlin.js.test.semantics
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
 
-public abstract class AbstractDynamicTest : SingleFileTranslationTest("dynamic/")
\ No newline at end of file
+public abstract class AbstractDynamicTest : SingleFileTranslationTest("dynamic/")
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractExpressionTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractExpressionTest.java
similarity index 83%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractExpressionTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractExpressionTest.java
index dd43291e709..682f660d315 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractExpressionTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractExpressionTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public abstract class AbstractExpressionTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractListTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractListTest.java
similarity index 89%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractListTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractListTest.java
index 200039a5323..bbe96eeec5d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractListTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractListTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class AbstractListTest extends JavaClassesTest {
 
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractMultiModuleTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractMultiModuleTest.kt
new file mode 100644
index 00000000000..5e07397a6ea
--- /dev/null
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractMultiModuleTest.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.js.test.semantics
+
+import org.jetbrains.kotlin.js.test.MultipleModulesTranslationTest
+
+public abstract class AbstractMultiModuleTest : MultipleModulesTranslationTest("multiModule/")
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractReservedWordTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractReservedWordTest.kt
similarity index 81%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractReservedWordTest.kt
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractReservedWordTest.kt
index c14f082c4a5..045cb123c9d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AbstractReservedWordTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractReservedWordTest.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,8 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics
+package org.jetbrains.kotlin.js.test.semantics
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
 
 public abstract class AbstractReservedWordTest : SingleFileTranslationTest("reservedWords/")
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AnnotationTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AnnotationTest.java
similarity index 83%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/AnnotationTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AnnotationTest.java
index 9e6cf67cc5f..c133ae7d1da 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/AnnotationTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AnnotationTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class AnnotationTest extends SingleFileTranslationTest {
     public AnnotationTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ArrayListTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ArrayListTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ArrayListTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ArrayListTest.java
index 4e9c6a32999..13c8f7778e8 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ArrayListTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ArrayListTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.mozilla.javascript.JavaScriptException;
 
@@ -61,7 +61,7 @@ public final class ArrayListTest extends JavaClassesTest {
             fooBoxTest();
             fail();
         } catch (JavaScriptException e) {
-
+            // Ignored
         }
     }
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/BridgeTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java
similarity index 99%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/BridgeTestGenerated.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java
index 0d75ce37999..a0d389fd64c 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/BridgeTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CastTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CastTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/CastTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CastTest.java
index 84a795ec856..26d69eeceaf 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CastTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CastTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 /**
  * A messy class where all new tests go before they are sorted which never happens.
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CharTest.java
similarity index 89%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CharTest.java
index a9132d24718..238d6dc1203 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CharTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class CharTest extends SingleFileTranslationTest {
     public CharTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassInheritanceTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassInheritanceTest.java
index 49e4c59163d..cd829431b1c 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassInheritanceTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassInheritanceTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ClassInheritanceTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassObjectTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassObjectTest.java
similarity index 88%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassObjectTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassObjectTest.java
index 5c7595dd840..dd0c11aaa88 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClassObjectTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClassObjectTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ClassObjectTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClosureTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClosureTest.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ClosureTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClosureTest.java
index cb78ee283cc..b5d2873ee7b 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ClosureTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ClosureTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ClosureTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompareToTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompareToTest.java
similarity index 89%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/CompareToTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompareToTest.java
index c5bd194fa8e..8712a57444a 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompareToTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompareToTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class CompareToTest extends AbstractExpressionTest {
 
@@ -25,4 +25,4 @@ public final class CompareToTest extends AbstractExpressionTest {
     public void testCustomCompareToMethod() throws Exception {
         checkFooBoxIsOk();
     }
-}
\ No newline at end of file
+}
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java
index 9a075e3094c..f19e1c0e3b6 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import com.intellij.util.ArrayUtil;
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.js.K2JSCompiler;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DataClassTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DataClassTest.java
similarity index 89%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/DataClassTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DataClassTest.java
index a96b279698f..f83317acb48 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DataClassTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DataClassTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class DataClassTest extends SingleFileTranslationTest {
     public DataClassTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DefaultArgumentsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultArgumentsTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/DefaultArgumentsTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultArgumentsTest.java
index bfbc0e08cfe..cae8c0853dd 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DefaultArgumentsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultArgumentsTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class DefaultArgumentsTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DelegatePropertyTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DelegatePropertyTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/DelegatePropertyTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DelegatePropertyTest.java
index 63c7b7bba0a..99bbb5760ea 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DelegatePropertyTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DelegatePropertyTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class DelegatePropertyTest extends SingleFileTranslationTest {
     public DelegatePropertyTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DelegationTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DelegationTest.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/DelegationTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DelegationTest.java
index 622c0b76326..73de79c1147 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DelegationTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DelegationTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class DelegationTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DollarParameterTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DollarParameterTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/DollarParameterTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DollarParameterTest.java
index 6963761057b..e024732ed8d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DollarParameterTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DollarParameterTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class DollarParameterTest extends AbstractExpressionTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DynamicTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java
similarity index 99%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/DynamicTestGenerated.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java
index 75abf85d9b1..13b4fc9aeae 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/DynamicTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/EnumTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EnumTest.java
similarity index 85%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/EnumTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EnumTest.java
index 33b840861a3..69a5cec55e1 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/EnumTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EnumTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
-public class EnumTest  extends SingleFileTranslationTest {
+public class EnumTest extends SingleFileTranslationTest {
     public EnumTest() {
         super("enum/");
     }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/EqualsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EqualsTest.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/EqualsTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EqualsTest.java
index 07c0d5e8776..740c2bd33c2 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/EqualsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EqualsTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class EqualsTest extends AbstractExpressionTest {
 
@@ -53,4 +53,4 @@ public final class EqualsTest extends AbstractExpressionTest {
     public void testCompareNullableListWithNull() throws Exception {
         checkFooBoxIsOk();
     }
-}
\ No newline at end of file
+}
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/EvaluationOrderTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EvaluationOrderTest.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/EvaluationOrderTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EvaluationOrderTest.java
index b7c867a0d63..8fe15651b06 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/EvaluationOrderTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/EvaluationOrderTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class EvaluationOrderTest extends AbstractExpressionTest {
     public EvaluationOrderTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExamplesTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExamplesTest.java
index 180a5b6854d..e6e04058007 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExamplesTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 import org.jetbrains.kotlin.js.translate.context.Namer;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionFunctionTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExtensionFunctionTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionFunctionTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExtensionFunctionTest.java
index 99db7283d6e..3d475d1aca5 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionFunctionTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExtensionFunctionTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ExtensionFunctionTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionPropertyTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExtensionPropertyTest.java
similarity index 86%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionPropertyTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExtensionPropertyTest.java
index 04db2e73ade..0cc54b2a6df 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ExtensionPropertyTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ExtensionPropertyTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ExtensionPropertyTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ForeachTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ForeachTest.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ForeachTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ForeachTest.java
index ef35e822491..74987888e8d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ForeachTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ForeachTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class ForeachTest extends AbstractExpressionTest {
 
@@ -57,4 +57,4 @@ public final class ForeachTest extends AbstractExpressionTest {
     public void testLabeledForWithWhile() throws Exception {
         checkFooBoxIsOk();
     }
-}
\ No newline at end of file
+}
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionCallableReferenceTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionCallableReferenceTest.java
similarity index 98%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionCallableReferenceTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionCallableReferenceTest.java
index 35919e6e170..60efbcdfdb0 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionCallableReferenceTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionCallableReferenceTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class FunctionCallableReferenceTest extends AbstractCallableReferenceTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionTest.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionTest.java
index 3d12de19bba..fa8a8ab14e3 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class FunctionTest extends AbstractExpressionTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/IdentifierClashTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IdentifierClashTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/IdentifierClashTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IdentifierClashTest.java
index 7dd723c44e9..ddcf2feb66e 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/IdentifierClashTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IdentifierClashTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class IdentifierClashTest extends AbstractExpressionTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/IdentityEqualsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IdentityEqualsTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/IdentityEqualsTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IdentityEqualsTest.java
index 78a6d8a64d5..d26f874cec8 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/IdentityEqualsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IdentityEqualsTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class IdentityEqualsTest extends AbstractExpressionTest {
     public IdentityEqualsTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/IfExpressionTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IfExpressionTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/IfExpressionTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IfExpressionTest.java
index 4e1eab8cfa8..410ae66019a 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/IfExpressionTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IfExpressionTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.mozilla.javascript.JavaScriptException;
 
@@ -30,6 +30,7 @@ public class IfExpressionTest extends AbstractExpressionTest {
             fail();
         }
         catch (JavaScriptException e) {
+            // Ignored
         }
     }
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InitializerTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InitializerTest.java
similarity index 87%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/InitializerTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InitializerTest.java
index 22ac8006c84..7d5b1724f74 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InitializerTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InitializerTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class InitializerTest extends SingleFileTranslationTest {
     public InitializerTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineMultiFileTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineMultiFileTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineMultiFileTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineMultiFileTest.java
index cb7cf153394..bead9a8660a 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineMultiFileTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineMultiFileTest.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,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.dart.compiler.backend.js.ast.JsNode;
 import com.intellij.util.Consumer;
-import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
-import org.jetbrains.k2js.test.utils.DirectiveTestUtils;
-import org.jetbrains.k2js.test.utils.JsTestUtils;
-import org.jetbrains.k2js.test.utils.MemoizeConsumer;
+import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
+import org.jetbrains.kotlin.js.test.utils.DirectiveTestUtils;
+import org.jetbrains.kotlin.js.test.utils.JsTestUtils;
+import org.jetbrains.kotlin.js.test.utils.MemoizeConsumer;
 
 import java.util.List;
 
-import static org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir;
+import static org.jetbrains.kotlin.js.test.utils.JsTestUtils.getAllFilesInDir;
 
 public final class InlineMultiFileTest extends MultipleFilesTranslationTest {
     private final MemoizeConsumer<JsNode> nodeConsumer = new MemoizeConsumer<JsNode>();
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineTest.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineTest.java
index d9467f1e70c..cf2fdbb90b6 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InlineTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationWithDirectivesTest;
 import org.jetbrains.kotlin.js.inline.exception.InlineRecursionException;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationWithDirectivesTest;
 
 public final class InlineTest extends SingleFileTranslationWithDirectivesTest {
     public InlineTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InvokeConventionTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InvokeConventionTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/InvokeConventionTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InvokeConventionTest.java
index bfb64e236ec..2c010d27514 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/InvokeConventionTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InvokeConventionTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class InvokeConventionTest extends AbstractExpressionTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JavaClassesTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JavaClassesTest.java
similarity index 83%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/JavaClassesTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JavaClassesTest.java
index 482b060675e..887a978322c 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JavaClassesTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JavaClassesTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public abstract class JavaClassesTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsCodeTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/JsCodeTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTest.java
index aeca65d1ce9..d14f07245d1 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsCodeTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationWithDirectivesTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationWithDirectivesTest;
 
 public final class JsCodeTest extends SingleFileTranslationWithDirectivesTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.java
index b621abf0947..639c578677f 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsUnitTestBase.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
-import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker;
-import org.jetbrains.k2js.test.rhino.RhinoUtils;
-import org.jetbrains.k2js.test.utils.JsUnitTestReporter;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
+import org.jetbrains.kotlin.js.test.rhino.RhinoSystemOutputChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoUtils;
+import org.jetbrains.kotlin.js.test.utils.JsUnitTestReporter;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsonTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsonTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/JsonTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsonTest.java
index a3dfaf96459..f8f3e57c328 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/JsonTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsonTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/LabelTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/LabelTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTest.java
index 5edebf3c637..94e8adf0327 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/LabelTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationWithDirectivesTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationWithDirectivesTest;
 
 public class LabelTest extends SingleFileTranslationWithDirectivesTest {
     public LabelTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MiscTest.java
similarity index 98%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MiscTest.java
index 01cd911589d..1f892bc20a5 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MiscTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.kotlin.js.translate.context.Namer;
 import org.mozilla.javascript.JavaScriptException;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiDeclarationTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiDeclarationTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiDeclarationTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiDeclarationTest.java
index 77edd506e15..5e48cd700c4 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiDeclarationTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiDeclarationTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class MultiDeclarationTest extends SingleFileTranslationTest {
     public MultiDeclarationTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiFileTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiFileTest.java
similarity index 88%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiFileTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiFileTest.java
index 0675cee70ee..331e621dba8 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiFileTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiFileTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
+import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
 
 public final class MultiFileTest extends MultipleFilesTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiModuleTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java
similarity index 97%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiModuleTestGenerated.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java
index 2ce88a977fe..d228a5e0110 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiModuleTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiPackageTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiPackageTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiPackageTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiPackageTest.java
index a92567d8306..97af5457450 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiPackageTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiPackageTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
+import org.jetbrains.kotlin.js.test.MultipleFilesTranslationTest;
 
 public class MultiPackageTest extends MultipleFilesTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NameClashesTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NameClashesTest.java
similarity index 88%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/NameClashesTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NameClashesTest.java
index 5874ea854bb..42d75da4937 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NameClashesTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NameClashesTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class NameClashesTest extends SingleFileTranslationTest {
 
@@ -44,4 +44,4 @@ public final class NameClashesTest extends SingleFileTranslationTest {
     public void testExtensionFunctionAndProperty() throws Exception {
         checkFooBoxIsOk();
     }
-}
\ No newline at end of file
+}
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NativeInteropTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NativeInteropTest.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/NativeInteropTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NativeInteropTest.java
index 6e8c7443f1d..8210d128313 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NativeInteropTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NativeInteropTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.JavaScript;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 import java.io.File;
 import java.util.List;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NumberTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NumberTest.java
index c18deb40ebe..aa3367012ac 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/NumberTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
 import org.jetbrains.kotlin.js.facade.exceptions.TranslationInternalException;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 import org.junit.Assert;
 
 public final class NumberTest extends SingleFileTranslationTest {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ObjectTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ObjectTest.java
index cf22cc95160..f1a2f0d9cc8 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ObjectTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ObjectTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class ObjectTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/OperatorOverloadingTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OperatorOverloadingTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/OperatorOverloadingTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OperatorOverloadingTest.java
index baca9bb9718..3cd8598d496 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/OperatorOverloadingTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OperatorOverloadingTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class OperatorOverloadingTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PackageTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PackageTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/PackageTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PackageTest.java
index ef6c99236fe..ca24e61dd0d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PackageTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PackageTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class PackageTest extends SingleFileTranslationTest {
     public PackageTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyAccessTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyAccessTest.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyAccessTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyAccessTest.java
index fc605d7710e..5f78394f31b 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyAccessTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyAccessTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 import java.util.List;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyCallableReferenceTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyCallableReferenceTest.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyCallableReferenceTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyCallableReferenceTest.java
index 10d58a0068c..3048e8977aa 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyCallableReferenceTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyCallableReferenceTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class PropertyCallableReferenceTest extends AbstractCallableReferenceTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyOverrideTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyOverrideTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyOverrideTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyOverrideTest.java
index 4569357f048..16abd0e20ae 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyOverrideTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/PropertyOverrideTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class PropertyOverrideTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/RTTITest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RTTITest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/RTTITest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RTTITest.java
index aeafd1d943e..c5ecad0ff51 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/RTTITest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RTTITest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class RTTITest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/RangeTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RangeTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/RangeTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RangeTest.java
index b48fcaa1e58..e85c9e78681 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/RangeTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RangeTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class RangeTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/RegressionTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RegressionTest.java
similarity index 83%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/RegressionTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RegressionTest.java
index 95e05b4ed56..827f37f8b38 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/RegressionTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/RegressionTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class RegressionTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ReservedWordTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java
similarity index 99%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/ReservedWordTestGenerated.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java
index 966e5e60b25..c5611b97c60 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ReservedWordTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/SafeCallTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SafeCallTest.java
similarity index 89%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/SafeCallTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SafeCallTest.java
index 4d9490a0b4b..b784c78b7f3 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/SafeCallTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SafeCallTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class SafeCallTest extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/SimpleTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SimpleTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/SimpleTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SimpleTest.java
index 68335d6fe9a..cd4e6a1ff8f 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/SimpleTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SimpleTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public final class SimpleTest extends SingleFileTranslationTest {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StandardClassesTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StandardClassesTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StandardClassesTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StandardClassesTest.java
index 1d489de4ae1..4dd47475015 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StandardClassesTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StandardClassesTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class StandardClassesTest extends SingleFileTranslationTest {
 
@@ -74,4 +74,4 @@ public final class StandardClassesTest extends SingleFileTranslationTest {
     public void testHashMapTypeOfElement() throws Exception {
         checkFooBoxIsOk();
     }
-}
\ No newline at end of file
+}
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibArraysTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibArraysTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibArraysTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibArraysTest.java
index a7a912d6a96..bdc81445737 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibArraysTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibArraysTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibBitwiseOperationsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibBitwiseOperationsTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibBitwiseOperationsTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibBitwiseOperationsTest.java
index d6da13bb521..6e139329393 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibBitwiseOperationsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibBitwiseOperationsTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibGetOtElseTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibGetOtElseTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibGetOtElseTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibGetOtElseTest.java
index 9a8842d69a2..992a4acbce0 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibGetOtElseTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibGetOtElseTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIterableTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibIterableTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIterableTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibIterableTest.java
index 318173c01cc..df245d39338 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIterableTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibIterableTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIteratorsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibIteratorsTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIteratorsTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibIteratorsTest.java
index 01973e5dd23..cdd23b8f481 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIteratorsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibIteratorsTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJavaUtilCollectionsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJavaUtilCollectionsTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJavaUtilCollectionsTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJavaUtilCollectionsTest.java
index b4c0298274c..f5e5b082d60 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJavaUtilCollectionsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJavaUtilCollectionsTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayScriptTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsArrayScriptTest.java
similarity index 71%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayScriptTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsArrayScriptTest.java
index d23885f61a1..a446bf64dbe 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayScriptTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsArrayScriptTest.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,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.test.rhino.CompositeRhinoResultsChecker;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.CompositeRhinoResultsChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
 
-/**
- */
 public class StdLibJsArrayScriptTest extends StdLibTestBase {
     public void testArrayScriptTest() throws Exception {
-        performStdLibTest(DEFAULT_ECMA_VERSIONS,
-                          "libraries/stdlib/test",
-                          "js/JsArrayScript.kt");
+        performStdLibTest(DEFAULT_ECMA_VERSIONS, "libraries/stdlib/test", "js/JsArrayScript.kt");
     }
 
     @NotNull
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibListTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibListTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibListTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibListTest.java
index e4ba148b70d..b2edf79481b 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibListTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibListTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibMapJsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibMapJsTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibMapJsTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibMapJsTest.java
index c9e50ec4388..93d3c10bfe0 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibMapJsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibMapJsTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibMapTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibMapTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibMapTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibMapTest.java
index 6bafdf740d1..f02cb91f540 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibMapTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibMapTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibQUnitTestSupport.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibQUnitTestSupport.java
similarity index 80%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibQUnitTestSupport.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibQUnitTestSupport.java
index 84b4f28dd0a..c94d15efade 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibQUnitTestSupport.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibQUnitTestSupport.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,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.rhino.RhinoQUnitResultChecker;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoQUnitResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -40,7 +39,7 @@ public abstract class StdLibQUnitTestSupport extends StdLibTestBase {
     @NotNull
     @Override
     protected List<String> additionalJsFiles(@NotNull EcmaVersion ecmaVersion) {
-        ArrayList<String> files = Lists.newArrayList(super.additionalJsFiles(ecmaVersion));
+        List<String> files = Lists.newArrayList(super.additionalJsFiles(ecmaVersion));
         files.add("js/js.translator/qunit/qunit.js");
         files.add("js/js.translator/qunit/headless.js");
         return files;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibSetJsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibSetJsTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibSetJsTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibSetJsTest.java
index d4ea5dd2fa0..68015cb5602 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibSetJsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibSetJsTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibStringBuilderTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibStringBuilderTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibStringBuilderTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibStringBuilderTest.java
index ee3d0329841..b35a80d46e0 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibStringBuilderTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibStringBuilderTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibStringTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibStringTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibStringTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibStringTest.java
index 878fae819c6..1eafe04c477 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibStringTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibStringTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTest.java
index 46a9140af51..779b367fe64 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
-import org.jetbrains.k2js.test.rhino.RhinoFunctionNativeObjectResultChecker;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionNativeObjectResultChecker;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.java
index 7caa9c9c4d4..b5fee9ae15d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestBase.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,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.google.common.collect.Lists;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
 import org.jetbrains.kotlin.js.facade.MainCallParameters;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
 
 import java.io.File;
 import java.util.List;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestToJSTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestToJSTest.java
index 9127ec1edfd..f10cee18ad9 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestToJSTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
 
 /**
  */
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibToJSTest.java
similarity index 85%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibToJSTest.java
index 53e2d80254a..f0e894f845f 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibToJSTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
+import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker;
 
 public class StdLibToJSTest extends StdLibTestBase {
     public void testCompileJavaScriptFiles() throws Exception {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTemplatesTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTemplatesTest.java
similarity index 90%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTemplatesTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTemplatesTest.java
index 4286ead9124..498e9c12f50 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTemplatesTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTemplatesTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public final class StringTemplatesTest extends AbstractExpressionTest {
 
@@ -29,4 +29,4 @@ public final class StringTemplatesTest extends AbstractExpressionTest {
     public void testStringValues() throws Exception {
         fooBoxTest();
     }
-}
\ No newline at end of file
+}
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.java
index 43138cfc9fc..1b577c32e42 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StringTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StringTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.k2js.config.EcmaVersion;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/SuperCallTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SuperCallTest.java
similarity index 86%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/SuperCallTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SuperCallTest.java
index 7fba5df477e..e65ffcd773d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/SuperCallTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SuperCallTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public class SuperCallTest extends SingleFileTranslationTest {
     public SuperCallTest() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TraitTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TraitTest.java
index 1bb95e6e51f..ccf5235158d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TraitTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TraitTest.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class TraitTest extends SingleFileTranslationTest {
 
@@ -28,37 +28,30 @@ public final class TraitTest extends SingleFileTranslationTest {
         fooBoxTest();
     }
 
-
     public void testClassDerivesFromClassAndTrait() throws Exception {
         fooBoxTest();
     }
 
-
     public void testClassDerivesFromTraitAndClass() throws Exception {
         fooBoxTest();
     }
 
-
     public void testExample() throws Exception {
         fooBoxTest();
     }
 
-
     public void testTraitExtendsTrait() throws Exception {
         fooBoxTest();
     }
 
-
     public void testTraitExtendsTwoTraits() throws Exception {
         fooBoxTest();
     }
 
-
     public void testFunDelegation() throws Exception {
         checkFooBoxIsOk("funDelegation.kt");
     }
 
-
     public void testDefinitionOrder() throws Exception {
         fooBoxTest();
     }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TranslatorTestCaseBuilder.java
similarity index 86%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TranslatorTestCaseBuilder.java
index 55fa01cd113..7dedd05dcca 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TranslatorTestCaseBuilder.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -30,7 +30,7 @@ import java.util.List;
 public abstract class TranslatorTestCaseBuilder {
     public static FilenameFilter emptyFilter = new FilenameFilter() {
         @Override
-        public boolean accept(File file, String name) {
+        public boolean accept(@NotNull File file, @NotNull String name) {
             return true;
         }
     };
@@ -60,7 +60,7 @@ public abstract class TranslatorTestCaseBuilder {
         final String extensionKt = ".kt";
         final FilenameFilter extensionFilter = new FilenameFilter() {
             @Override
-            public boolean accept(File dir, String name) {
+            public boolean accept(@NotNull File dir, @NotNull String name) {
                 return name.endsWith(extensionKt);
             }
         };
@@ -68,7 +68,7 @@ public abstract class TranslatorTestCaseBuilder {
         if (filter != emptyFilter) {
             resultFilter = new FilenameFilter() {
                 @Override
-                public boolean accept(File file, String s) {
+                public boolean accept(@NotNull File file, @NotNull String s) {
                     return extensionFilter.accept(file, s) && filter.accept(file, s);
                 }
             };
@@ -79,7 +79,7 @@ public abstract class TranslatorTestCaseBuilder {
         File dir = new File(dataPath);
         FileFilter dirFilter = new FileFilter() {
             @Override
-            public boolean accept(File pathname) {
+            public boolean accept(@NotNull File pathname) {
                 return pathname.isDirectory();
             }
         };
@@ -89,15 +89,13 @@ public abstract class TranslatorTestCaseBuilder {
             List<File> subdirs = Arrays.asList(files);
             Collections.sort(subdirs);
             for (File subdir : subdirs) {
-                suite.addTest(suiteForDirectory(dataPath + "/" + subdir.getName(), recursive, filter, factory));
+                suite.addTest(suiteForDirectory(dataPath + "/" + subdir.getName(), true, filter, factory));
             }
         }
         List<File> files = Arrays.asList(dir.listFiles(resultFilter));
         Collections.sort(files);
         for (File file : files) {
-            String fileName = file.getName();
-            assert fileName != null;
-            suite.addTest(factory.createTest(fileName));
+            suite.addTest(factory.createTest(file.getName()));
         }
     }
 }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TryCatchTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TryCatchTest.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/TryCatchTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TryCatchTest.java
index d7c8b3605b6..6313aacb1ce 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TryCatchTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/TryCatchTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class TryCatchTest extends AbstractExpressionTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoCanvasExamplesTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoCanvasExamplesTest.java
similarity index 91%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoCanvasExamplesTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoCanvasExamplesTest.java
index 24a979f9920..e932c3a3cc8 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoCanvasExamplesTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoCanvasExamplesTest.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,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.k2js.config.EcmaVersion;
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 import org.mozilla.javascript.EcmaError;
 
 /*
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples1Test.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoExamples1Test.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples1Test.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoExamples1Test.java
index c6bae65659a..b2b063507af 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples1Test.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoExamples1Test.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class WebDemoExamples1Test extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples2Test.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoExamples2Test.java
similarity index 88%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples2Test.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoExamples2Test.java
index 59ab9beceeb..dd48f0cc87c 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WebDemoExamples2Test.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoExamples2Test.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.jetbrains.kotlin.js.test.SingleFileTranslationTest;
 
 public final class WebDemoExamples2Test extends SingleFileTranslationTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WhenTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WhenTest.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/WhenTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WhenTest.java
index cc0fd7b5118..302e731925c 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WhenTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WhenTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 import org.mozilla.javascript.JavaScriptException;
 
@@ -70,6 +70,7 @@ public final class WhenTest extends AbstractExpressionTest {
             fail();
         }
         catch (JavaScriptException e) {
+            // Ignored
         }
     }
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WhileTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WhileTest.java
similarity index 93%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/WhileTest.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WhileTest.java
index 2814fb0f74d..458e611d82d 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/WhileTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WhileTest.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.k2js.test.semantics;
+package org.jetbrains.kotlin.js.test.semantics;
 
 public class WhileTest extends AbstractExpressionTest {
 
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/AstSearchUtil.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/AstSearchUtil.java
similarity index 94%
rename from js/js.tests/test/org/jetbrains/k2js/test/utils/AstSearchUtil.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/AstSearchUtil.java
index 79c767b3eff..3f466141b63 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/utils/AstSearchUtil.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/AstSearchUtil.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.k2js.test.utils;
+package org.jetbrains.kotlin.js.test.utils;
 
 import com.google.dart.compiler.backend.js.ast.JsFunction;
 import com.google.dart.compiler.backend.js.ast.JsName;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/CallCounter.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/utils/CallCounter.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java
index 3a13b4644ff..0b181e175d2 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/utils/CallCounter.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.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.k2js.test.utils;
+package org.jetbrains.kotlin.js.test.utils;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import org.jetbrains.annotations.NotNull;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/DirectiveTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java
similarity index 99%
rename from js/js.tests/test/org/jetbrains/k2js/test/utils/DirectiveTestUtils.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java
index 7293572d3da..930166cc2f7 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/utils/DirectiveTestUtils.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.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.k2js.test.utils;
+package org.jetbrains.kotlin.js.test.utils;
 
 import com.google.dart.compiler.backend.js.ast.JsFunction;
 import com.google.dart.compiler.backend.js.ast.JsLabel;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/JsTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsTestUtils.java
similarity index 96%
rename from js/js.tests/test/org/jetbrains/k2js/test/utils/JsTestUtils.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsTestUtils.java
index ed49bf8d57f..83c91ce6363 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/utils/JsTestUtils.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsTestUtils.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.k2js.test.utils;
+package org.jetbrains.kotlin.js.test.utils;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.Function;
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/JsUnitTestReporter.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsUnitTestReporter.java
similarity index 95%
rename from js/js.tests/test/org/jetbrains/k2js/test/utils/JsUnitTestReporter.java
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsUnitTestReporter.java
index 4c9c640e625..03dece638b4 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/utils/JsUnitTestReporter.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsUnitTestReporter.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.k2js.test.utils;
+package org.jetbrains.kotlin.js.test.utils;
 
 import com.intellij.util.containers.ContainerUtil;
 import junit.framework.TestCase;
@@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -77,7 +76,7 @@ public class JsUnitTestReporter {
 
     @NotNull
     private Collection<String> getNewFinishedTests() {
-        ArrayList<String> finishedTests = ContainerUtil.newArrayList(this.finishedTests.keySet());
+        List<String> finishedTests = ContainerUtil.newArrayList(this.finishedTests.keySet());
         finishedTests.removeAll(processedTests);
         return finishedTests;
     }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/MemoizeConsumer.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/MemoizeConsumer.kt
similarity index 79%
rename from js/js.tests/test/org/jetbrains/k2js/test/utils/MemoizeConsumer.kt
rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/MemoizeConsumer.kt
index 0ed550ecc99..825778d587b 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/utils/MemoizeConsumer.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/MemoizeConsumer.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,15 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.k2js.test.utils
+package org.jetbrains.kotlin.js.test.utils
 
 import com.intellij.util.Consumer
-import com.google.dart.compiler.backend.js.ast.JsNode
 
-class MemoizeConsumer<T: Any> : Consumer<T> {
+class MemoizeConsumer<T : Any> : Consumer<T> {
     var lastValue: T? = null
 
     override fun consume(value: T?) {
         lastValue = value
     }
-}
\ No newline at end of file
+}
diff --git a/js/js.translator/testData/expression/misc/cases/safecallComputesExpressionOnlyOnce.kt b/js/js.translator/testData/expression/misc/cases/safeCallComputesExpressionOnlyOnce.kt
similarity index 100%
rename from js/js.translator/testData/expression/misc/cases/safecallComputesExpressionOnlyOnce.kt
rename to js/js.translator/testData/expression/misc/cases/safeCallComputesExpressionOnlyOnce.kt