From 09942d7c096b8e9d34586fd336b8ef42a3f8c315 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 12 Jan 2015 11:55:44 +0300
Subject: [PATCH] Rename jet -> kotlin in idea tests

org.jetbrains.jet -> org.jetbrains.kotlin (except 'plugin' subpackage)
---
 .../Smart_Completion_Tests.xml                | 14 +++---
 .../kotlin/generators/tests/GenerateTests.kt  | 46 +++++++++----------
 .../JetJdkAndLibraryProjectDescriptor.java    |  2 +-
 .../jet/plugin/JetStdJSProjectDescriptor.java |  4 +-
 .../codeInsight/AbstractJetInspectionTest.kt  |  2 +-
 .../codeInsight/AbstractLineMarkersTest.java  |  8 ++--
 .../AbstractOverrideImplementTest.java        | 10 ++--
 .../debugger/KotlinDebuggerTestCase.java      | 18 ++++----
 ...AbstractEditorForEvaluateExpressionTest.kt |  7 ++-
 .../CodeFragmentCompletionInLibraryTest.kt    |  4 +-
 .../folding/AbstractKotlinFoldingTest.java    |  2 +-
 .../highlighter/AbstractHighlightingTest.java |  6 +--
 .../intentions/AbstractIntentionTest.java     |  6 +--
 .../navigation/AbstractKotlinGotoTest.java    |  4 +-
 .../navigation/NavigationTestUtils.java       |  2 +-
 .../AbstractQuickFixMultiFileTest.java        |  8 ++--
 .../plugin/quickfix/AbstractQuickFixTest.java |  6 +--
 .../AddOpenToClassDeclarationTest.java        |  2 +-
 .../AbstractJetExtractionTest.kt              |  2 +-
 .../refactoring/move/AbstractJetMoveTest.kt   |  2 +-
 .../jet/plugin/run/RunConfigurationTest.kt    |  9 +---
 .../asJava/FakeLightClassForPackageTest.java  |  2 +-
 ...actCompiledKotlinInJavaCompletionTest.java |  4 +-
 .../AbstractJSBasicCompletionTest.java        |  4 +-
 .../AbstractJvmBasicCompletionTest.java       |  6 +--
 .../AbstractJvmSmartCompletionTest.java       |  6 +--
 ...AbstractJvmWithLibBasicCompletionTest.java |  4 +-
 .../AbstractKeywordCompletionTest.kt          |  4 +-
 ...tractKotlinSourceInJavaCompletionTest.java |  4 +-
 ...AbstractMultiFileJvmBasicCompletionTest.kt | 10 ++--
 .../AbstractMultiFileSmartCompletionTest.kt   |  6 +--
 ...edKotlinInJavaCompletionTestGenerated.java |  2 +-
 .../completion/CompletionTestUtil.kt          |  8 ++--
 .../completion/DataFlowValueRenderingTest.kt  |  4 +-
 .../DataFlowValueRenderingTestGenerated.java  |  2 +-
 .../completion/ExpectedCompletionUtils.java   |  6 +--
 .../JSBasicCompletionTestGenerated.java       |  2 +-
 .../JetFixtureCompletionBaseTestCase.java     |  6 +--
 .../JvmBasicCompletionTestGenerated.java      |  2 +-
 .../JvmSmartCompletionTestGenerated.java      |  2 +-
 ...vmWithLibBasicCompletionTestGenerated.java |  2 +-
 .../KeywordCompletionTestGenerated.java       |  2 +-
 ...inSourceInJavaCompletionTestGenerated.java |  2 +-
 ...tiFileJvmBasicCompletionTestGenerated.java |  2 +-
 ...MultiFileSmartCompletionTestGenerated.java |  2 +-
 .../confidence/JetConfidenceTest.java         |  6 +--
 .../AbstractCompletionHandlerTests.kt         |  4 +-
 .../handlers/BasicCompletionHandlerTest.kt    |  6 +--
 .../BasicCompletionHandlerTestGenerated.java  |  2 +-
 .../CompletionCharFilterTestGenerated.java    |  2 +-
 .../handlers/CompletionHandlerTestBase.kt     |  4 +-
 .../CompletionMultifileHandlerTest.java       |  4 +-
 .../handlers/JavaCompletionHandlerTest.java   |  4 +-
 ...KeywordCompletionHandlerTestGenerated.java |  2 +-
 .../SmartCompletionHandlerTestGenerated.java  |  2 +-
 .../SmartCompletionMultifileHandlerTest.java  |  4 +-
 .../weighers/AbstractCompletionWeigherTest.kt |  5 +-
 .../BasicCompletionWeigherTestGenerated.java  |  2 +-
 .../SmartCompletionWeigherTestGenerated.java  |  2 +-
 .../findUsages/AbstractJetFindUsagesTest.java | 10 ++--
 .../JetFindUsagesTestGenerated.java           |  2 +-
 .../formatter/AbstractJetFormatterTest.java   | 10 ++--
 .../AbstractJetTypingIndentationTestBase.java |  6 +--
 .../formatter/JetFormatSettingsUtil.java      |  8 ++--
 .../formatter/JetFormatterTestGenerated.java  |  2 +-
 ...JetTypingIndentationTestBaseGenerated.java |  2 +-
 .../plugin}/editor/JetCommenterTest.java      |  4 +-
 .../plugin}/editor/TypedHandlerTest.kt        |  4 +-
 .../AbstractJetQuickDocProviderTest.java      |  6 +--
 .../JetQuickDocProviderTestGenerated.java     |  2 +-
 .../resolve/AbstractReferenceResolveTest.java |  8 ++--
 ...StringTemplateExpressionManipulatorTest.kt |  8 ++--
 .../psi/injection/StringInjectionHostTest.kt  |  4 +-
 .../AbstractJetPsiUnifierTest.kt              |  9 +---
 .../JetPsiUnifierTestGenerated.java           |  2 +-
 .../safeDelete/AbstractJetSafeDeleteTest.java |  6 +--
 .../JetSafeDeleteTestGenerated.java           |  2 +-
 .../search/AbstractSearcherTest.java          |  8 ++--
 .../search/AnnotatedMembersSearchTest.java    |  6 +--
 .../search/ClassInheritorsSearchTest.java     |  6 +--
 .../search/JUnitMembersSearcherTest.java      |  6 +--
 .../shortenRefs/AbstractShortenRefsTest.kt    |  5 +-
 .../shortenRefs/ShortenRefsTestGenerated.java |  2 +-
 .../test}/ConfigLibraryUtil.java              | 22 ++++-----
 .../test}/LocalFileSystemUtils.java           |  6 +--
 .../test}/ReferenceUtils.java                 |  7 ++-
 .../test}/SettingsConfigurator.java           |  5 +-
 .../test}/TagsTestDataUtil.java               |  4 +-
 88 files changed, 227 insertions(+), 252 deletions(-)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractCompiledKotlinInJavaCompletionTest.java (95%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractJSBasicCompletionTest.java (94%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractJvmBasicCompletionTest.java (94%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractJvmSmartCompletionTest.java (94%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractJvmWithLibBasicCompletionTest.java (95%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractKeywordCompletionTest.kt (94%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractKotlinSourceInJavaCompletionTest.java (96%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractMultiFileJvmBasicCompletionTest.kt (86%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/AbstractMultiFileSmartCompletionTest.kt (92%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/CompiledKotlinInJavaCompletionTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/CompletionTestUtil.kt (94%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/DataFlowValueRenderingTest.kt (96%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/DataFlowValueRenderingTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/ExpectedCompletionUtils.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/JSBasicCompletionTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/JetFixtureCompletionBaseTestCase.java (93%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/JvmBasicCompletionTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/JvmSmartCompletionTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/JvmWithLibBasicCompletionTestGenerated.java (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/KeywordCompletionTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/KotlinSourceInJavaCompletionTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/MultiFileJvmBasicCompletionTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/MultiFileSmartCompletionTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/confidence/JetConfidenceTest.java (97%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/AbstractCompletionHandlerTests.kt (97%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/BasicCompletionHandlerTest.kt (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/BasicCompletionHandlerTestGenerated.java (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/CompletionCharFilterTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/CompletionHandlerTestBase.kt (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/CompletionMultifileHandlerTest.java (96%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/JavaCompletionHandlerTest.java (94%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/KeywordCompletionHandlerTestGenerated.java (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/SmartCompletionHandlerTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/handlers/SmartCompletionMultifileHandlerTest.java (94%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/weighers/AbstractCompletionWeigherTest.kt (94%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/weighers/BasicCompletionWeigherTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/completion/weighers/SmartCompletionWeigherTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/findUsages/AbstractJetFindUsagesTest.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/findUsages/JetFindUsagesTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/formatter/AbstractJetFormatterTest.java (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/formatter/AbstractJetTypingIndentationTestBase.java (95%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/formatter/JetFormatSettingsUtil.java (92%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/formatter/JetFormatterTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/formatter/JetTypingIndentationTestBaseGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/editor/JetCommenterTest.java (95%)
 rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/editor/TypedHandlerTest.kt (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/editor/quickDoc/AbstractJetQuickDocProviderTest.java (97%)
 rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/editor/quickDoc/JetQuickDocProviderTestGenerated.java (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/psi/StringTemplateExpressionManipulatorTest.kt (91%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/psi/injection/StringInjectionHostTest.kt (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/psi/patternMatching/AbstractJetPsiUnifierTest.kt (87%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/psi/patternMatching/JetPsiUnifierTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/safeDelete/AbstractJetSafeDeleteTest.java (98%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/safeDelete/JetSafeDeleteTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/search/AbstractSearcherTest.java (97%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/search/AnnotatedMembersSearchTest.java (96%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/search/ClassInheritorsSearchTest.java (96%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/search/JUnitMembersSearcherTest.java (97%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/shortenRefs/AbstractShortenRefsTest.kt (95%)
 rename idea/tests/org/jetbrains/{jet => kotlin}/shortenRefs/ShortenRefsTestGenerated.java (99%)
 rename idea/tests/org/jetbrains/{jet/testing => kotlin/test}/ConfigLibraryUtil.java (86%)
 rename idea/tests/org/jetbrains/{jet/testing => kotlin/test}/LocalFileSystemUtils.java (90%)
 rename idea/tests/org/jetbrains/{jet/testing => kotlin/test}/ReferenceUtils.java (95%)
 rename idea/tests/org/jetbrains/{jet/testing => kotlin/test}/SettingsConfigurator.java (97%)
 rename idea/tests/org/jetbrains/{jet/testing => kotlin/test}/TagsTestDataUtil.java (98%)

diff --git a/.idea/runConfigurations/Smart_Completion_Tests.xml b/.idea/runConfigurations/Smart_Completion_Tests.xml
index a987ed3950e..9d2418c0c05 100644
--- a/.idea/runConfigurations/Smart_Completion_Tests.xml
+++ b/.idea/runConfigurations/Smart_Completion_Tests.xml
@@ -2,14 +2,14 @@
   <configuration default="false" name="Smart Completion Tests" type="JUnit" factoryName="JUnit">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
       <pattern>
-        <option name="PATTERN" value="org.jetbrains.jet.completion.handlers.*" />
+        <option name="PATTERN" value="org.jetbrains.kotlin.completion.handlers.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
     <module name="idea" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="org.jetbrains.jet.completion.handlers" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.completion.handlers" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="pattern" />
@@ -23,11 +23,11 @@
     </option>
     <envs />
     <patterns>
-      <pattern testClass="org.jetbrains.jet.completion.JvmSmartCompletionTestGenerated" />
-      <pattern testClass="org.jetbrains.jet.completion.handlers.SmartCompletionHandlerTestGenerated" />
-      <pattern testClass="org.jetbrains.jet.completion.handlers.SmartCompletionMultifileHandlerTest" />
-      <pattern testClass="org.jetbrains.jet.completion.weighers.SmartCompletionWeigherTestGenerated" />
-      <pattern testClass="org.jetbrains.jet.completion.MultiFileSmartCompletionTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.completion.JvmSmartCompletionTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.completion.handlers.SmartCompletionHandlerTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.completion.handlers.SmartCompletionMultifileHandlerTest" />
+      <pattern testClass="org.jetbrains.kotlin.completion.weighers.SmartCompletionWeigherTestGenerated" />
+      <pattern testClass="org.jetbrains.kotlin.completion.MultiFileSmartCompletionTestGenerated" />
     </patterns>
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 1456c7d72da..9d6897ffedd 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -43,11 +43,11 @@ import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
 import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest
 import org.jetbrains.kotlin.checkers.AbstractJetJsCheckerTest
 import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixTest
-import org.jetbrains.jet.completion.AbstractJSBasicCompletionTest
-import org.jetbrains.jet.completion.AbstractKeywordCompletionTest
-import org.jetbrains.jet.completion.AbstractJvmSmartCompletionTest
-import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest
-import org.jetbrains.jet.completion.AbstractJvmWithLibBasicCompletionTest
+import org.jetbrains.kotlin.completion.AbstractJSBasicCompletionTest
+import org.jetbrains.kotlin.completion.AbstractKeywordCompletionTest
+import org.jetbrains.kotlin.completion.AbstractJvmSmartCompletionTest
+import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest
+import org.jetbrains.kotlin.completion.AbstractJvmWithLibBasicCompletionTest
 import org.jetbrains.jet.plugin.navigation.AbstractGotoSuperTest
 import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixMultiFileTest
 import org.jetbrains.jet.plugin.highlighter.AbstractHighlightingTest
@@ -59,16 +59,16 @@ import org.jetbrains.jet.plugin.hierarchy.AbstractHierarchyTest
 import org.jetbrains.jet.plugin.codeInsight.moveUpDown.AbstractCodeMoverTest
 import org.jetbrains.jet.plugin.refactoring.inline.AbstractInlineTest
 import org.jetbrains.jet.plugin.codeInsight.unwrap.AbstractUnwrapRemoveTest
-import org.jetbrains.jet.editor.quickDoc.AbstractJetQuickDocProviderTest
-import org.jetbrains.jet.safeDelete.AbstractJetSafeDeleteTest
+import org.jetbrains.kotlin.plugin.editor.quickDoc.AbstractJetQuickDocProviderTest
+import org.jetbrains.kotlin.safeDelete.AbstractJetSafeDeleteTest
 import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveTest
 import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveWithLibTest
-import org.jetbrains.jet.findUsages.AbstractJetFindUsagesTest
+import org.jetbrains.kotlin.findUsages.AbstractJetFindUsagesTest
 import org.jetbrains.jet.plugin.configuration.AbstractConfigureProjectByChangingFileTest
-import org.jetbrains.jet.formatter.AbstractJetFormatterTest
+import org.jetbrains.kotlin.formatter.AbstractJetFormatterTest
 import org.jetbrains.jet.plugin.highlighter.AbstractDiagnosticMessageTest
 import org.jetbrains.jet.plugin.codeInsight.AbstractOutOfBlockModificationTest
-import org.jetbrains.jet.completion.AbstractDataFlowValueRenderingTest
+import org.jetbrains.kotlin.completion.AbstractDataFlowValueRenderingTest
 import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationParameterTest
 import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractEvaluateExpressionTest
 import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest
@@ -76,14 +76,14 @@ import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
 import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel
 import org.jetbrains.kotlin.generators.tests.generator.TestClassModel
 import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
-import org.jetbrains.jet.shortenRefs.AbstractShortenRefsTest
-import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest
+import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest
+import org.jetbrains.kotlin.completion.handlers.AbstractSmartCompletionHandlerTest
 import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil
 import org.jetbrains.kotlin.plugin.resolve.AbstractAdditionalResolveDescriptorRendererTest
 import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInLibrarySourcesTest
 import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest
-import org.jetbrains.jet.completion.AbstractCompiledKotlinInJavaCompletionTest
-import org.jetbrains.jet.completion.AbstractKotlinSourceInJavaCompletionTest
+import org.jetbrains.kotlin.completion.AbstractCompiledKotlinInJavaCompletionTest
+import org.jetbrains.kotlin.completion.AbstractKotlinSourceInJavaCompletionTest
 import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithStdLib
 import org.jetbrains.jet.plugin.codeInsight.AbstractInsertImportOnPasteTest
 import org.jetbrains.jet.plugin.codeInsight.AbstractLineMarkersTest
@@ -98,9 +98,9 @@ import org.jetbrains.jet.plugin.stubs.AbstractStubBuilderTest
 import org.jetbrains.jet.plugin.codeInsight.AbstractJetInspectionTest
 import org.jetbrains.jet.plugin.debugger.AbstractKotlinSteppingTest
 import org.jetbrains.jet.plugin.debugger.AbstractJetPositionManagerTest
-import org.jetbrains.jet.completion.AbstractMultiFileJvmBasicCompletionTest
+import org.jetbrains.kotlin.completion.AbstractMultiFileJvmBasicCompletionTest
 import org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable.AbstractJetExtractionTest
-import org.jetbrains.jet.formatter.AbstractJetTypingIndentationTestBase
+import org.jetbrains.kotlin.formatter.AbstractJetTypingIndentationTestBase
 import org.jetbrains.jet.plugin.debugger.evaluate.AbstractKotlinEvaluateExpressionTest
 import org.jetbrains.jet.plugin.debugger.evaluate.AbstractSelectExpressionForDebuggerTest
 import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionTest
@@ -116,9 +116,9 @@ import org.jetbrains.kotlin.load.java.AbstractJavaTypeSubstitutorTest
 import org.jetbrains.jet.plugin.intentions.declarations.AbstractJoinLinesTest
 import org.jetbrains.kotlin.codegen.AbstractScriptCodegenTest
 import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest
-import org.jetbrains.jet.psi.patternMatching.AbstractJetPsiUnifierTest
-import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest
-import org.jetbrains.jet.completion.weighers.AbstractSmartCompletionWeigherTest
+import org.jetbrains.kotlin.psi.patternMatching.AbstractJetPsiUnifierTest
+import org.jetbrains.kotlin.completion.weighers.AbstractBasicCompletionWeigherTest
+import org.jetbrains.kotlin.completion.weighers.AbstractSmartCompletionWeigherTest
 import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords
 import org.jetbrains.kotlin.js.test.semantics.AbstractReservedWordTest
 import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInJavaTest
@@ -126,8 +126,8 @@ 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
-import org.jetbrains.jet.completion.AbstractMultiFileSmartCompletionTest
-import org.jetbrains.jet.completion.handlers.AbstractCompletionCharFilterTest
+import org.jetbrains.kotlin.completion.AbstractMultiFileSmartCompletionTest
+import org.jetbrains.kotlin.completion.handlers.AbstractCompletionCharFilterTest
 import org.jetbrains.kotlin.plugin.resolve.AbstractPartialBodyResolveTest
 import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib
 import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest
@@ -136,10 +136,10 @@ import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletion
 import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest
 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.kotlin.completion.handlers.AbstractBasicCompletionHandlerTest
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.AbstractClsStubBuilderTest
 import org.jetbrains.kotlin.codegen.AbstractLineNumberTest
-import org.jetbrains.jet.completion.handlers.AbstractKeywordCompletionHandlerTest
+import org.jetbrains.kotlin.completion.handlers.AbstractKeywordCompletionHandlerTest
 
 fun main(args: Array<String>) {
     System.setProperty("java.awt.headless", "true")
diff --git a/idea/tests/org/jetbrains/jet/plugin/JetJdkAndLibraryProjectDescriptor.java b/idea/tests/org/jetbrains/jet/plugin/JetJdkAndLibraryProjectDescriptor.java
index 249e018ab40..93e4d6eefe9 100644
--- a/idea/tests/org/jetbrains/jet/plugin/JetJdkAndLibraryProjectDescriptor.java
+++ b/idea/tests/org/jetbrains/jet/plugin/JetJdkAndLibraryProjectDescriptor.java
@@ -29,7 +29,7 @@ import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.testing.ConfigLibraryUtil;
+import org.jetbrains.kotlin.test.ConfigLibraryUtil;
 
 import java.io.File;
 
diff --git a/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java b/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java
index 097ffa54c00..35458a6f2db 100644
--- a/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java
+++ b/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEdito
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.framework.JSLibraryStdDescription;
-import org.jetbrains.jet.testing.ConfigLibraryUtil;
+import org.jetbrains.kotlin.test.ConfigLibraryUtil;
 
 public class JetStdJSProjectDescriptor implements LightProjectDescriptor {
     public static final JetStdJSProjectDescriptor INSTANCE = new JetStdJSProjectDescriptor();
@@ -53,4 +53,4 @@ public class JetStdJSProjectDescriptor implements LightProjectDescriptor {
 
         ConfigLibraryUtil.addLibrary(editor, model);
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt
index 417b1a7b9d9..25b4689f6eb 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt
@@ -30,7 +30,7 @@ import com.intellij.testFramework.InspectionTestUtil
 import com.intellij.codeInspection.InspectionManager
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
 import org.jetbrains.kotlin.test.JetTestCaseBuilder
-import org.jetbrains.jet.testing.ConfigLibraryUtil
+import org.jetbrains.kotlin.test.ConfigLibraryUtil
 import com.intellij.testFramework.IdeaTestUtil
 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.Sdk
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java
index 7ae5de306e5..dbe5eca86d7 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java
@@ -29,14 +29,14 @@ import com.intellij.rt.execution.junit.FileComparisonFailure;
 import com.intellij.testFramework.ExpectedHighlightingData;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.JetTestUtils;
-import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerNavigationHandler;
 import org.jetbrains.jet.plugin.navigation.NavigationTestUtils;
-import org.jetbrains.jet.testing.ReferenceUtils;
-import org.jetbrains.jet.testing.TagsTestDataUtil;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.ReferenceUtils;
+import org.jetbrains.kotlin.test.TagsTestDataUtil;
 import org.junit.Assert;
 
 import java.io.File;
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
index 961dafc27c3..9c60f9619b9 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
@@ -31,16 +31,16 @@ import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
+import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.psi.JetClassOrObject;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.OverrideResolver;
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
-import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
-import org.jetbrains.jet.testing.TagsTestDataUtil;
+import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.TagsTestDataUtil;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 import org.junit.Assert;
 
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
index cd8335550be..b30e46ba4d2 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
@@ -33,18 +33,18 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
+import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage;
+import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage;
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
+import org.jetbrains.kotlin.name.FqName;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.test.ConfigLibraryUtil;
 import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.MockLibraryUtil;
-import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
-import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
-import org.jetbrains.jet.testing.ConfigLibraryUtil;
-import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage;
-import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt
index 7a5add5c74c..c9d6b215565 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.debugger.evaluate
 
 import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest
-import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest
+import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
 import com.intellij.psi.PsiElement
 import com.intellij.openapi.util.io.FileUtil
@@ -33,11 +33,10 @@ import org.jetbrains.jet.plugin.caches.resolve.analyzeFully
 import org.jetbrains.kotlin.psi.JetTypeReference
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.jet.completion.ExpectedCompletionUtils
+import org.jetbrains.kotlin.completion.ExpectedCompletionUtils
 import org.jetbrains.kotlin.psi.JetElement
-import org.jetbrains.jet.completion.handlers.AbstractCompletionHandlerTest
+import org.jetbrains.kotlin.completion.handlers.AbstractCompletionHandlerTest
 import com.intellij.codeInsight.completion.CompletionType
-import org.jetbrains.kotlin.test.JetTestUtils
 
 public abstract class AbstractCodeFragmentHighlightingTest : AbstractJetPsiCheckerTest() {
     override fun doTest(filePath: String) {
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt
index 99ad61e7fe8..b65bdecf3e2 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt
@@ -16,13 +16,13 @@
 
 package org.jetbrains.jet.plugin.debugger.evaluate
 
-import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest
+import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.psi.PsiManager
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.JetFunction
 import org.jetbrains.kotlin.psi.JetPsiFactory
-import org.jetbrains.jet.completion.util.testCompletion
+import org.jetbrains.kotlin.completion.util.testCompletion
 import org.jetbrains.jet.plugin.project.TargetPlatform
 import com.intellij.codeInsight.completion.CompletionType
 import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor
diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/AbstractKotlinFoldingTest.java b/idea/tests/org/jetbrains/jet/plugin/folding/AbstractKotlinFoldingTest.java
index 1e2c5d19c42..0d7faa0c85e 100644
--- a/idea/tests/org/jetbrains/jet/plugin/folding/AbstractKotlinFoldingTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/folding/AbstractKotlinFoldingTest.java
@@ -28,7 +28,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
-import org.jetbrains.jet.testing.SettingsConfigurator;
+import org.jetbrains.kotlin.test.SettingsConfigurator;
 import org.junit.Assert;
 
 import javax.annotation.Nullable;
diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java
index 20633c7e926..5f251a50df9 100644
--- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java
@@ -22,10 +22,10 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.rt.execution.junit.FileComparisonFailure;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
-import org.jetbrains.jet.testing.TagsTestDataUtil;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
+import org.jetbrains.kotlin.test.TagsTestDataUtil;
 
 import java.io.File;
 import java.util.List;
@@ -63,4 +63,4 @@ public abstract class AbstractHighlightingTest extends JetLightCodeInsightFixtur
     protected String getTestDataPath() {
         return "";
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java
index a2640018d49..b36d0a43ece 100644
--- a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java
@@ -24,11 +24,11 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.LightCodeInsightTestCase;
 import com.intellij.util.PathUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.plugin.DirectiveBasedActionUtils;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.testing.ConfigLibraryUtil;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.test.ConfigLibraryUtil;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.junit.Assert;
 
 import java.io.File;
diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java
index d30ee0580bd..c60f5def7fb 100644
--- a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java
@@ -30,10 +30,10 @@ import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
+import org.jetbrains.kotlin.test.ReferenceUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.jet.testing.ReferenceUtils;
 import org.junit.Assert;
 
 import java.util.ArrayList;
diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java b/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java
index 9e01ca152e8..14a93581236 100644
--- a/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java
+++ b/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java
@@ -35,7 +35,7 @@ import junit.framework.TestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.jet.testing.ReferenceUtils;
+import org.jetbrains.kotlin.test.ReferenceUtils;
 import org.junit.Assert;
 
 import java.util.*;
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java
index cb9555a29fc..7f99d361658 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java
@@ -31,13 +31,13 @@ import junit.framework.ComparisonFailure;
 import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
-import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.plugin.DirectiveBasedActionUtils;
 import org.jetbrains.jet.plugin.KotlinDaemonAnalyzerTestCase;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.testing.ConfigLibraryUtil;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.test.ConfigLibraryUtil;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
+import org.jetbrains.kotlin.test.JetTestCaseBuilder;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java
index 280306387fc..844b9b1b7ca 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java
@@ -29,13 +29,13 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiElement;
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.plugin.DirectiveBasedActionUtils;
 import org.jetbrains.jet.plugin.KotlinLightQuickFixTestCase;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.test.ConfigLibraryUtil;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.jet.testing.ConfigLibraryUtil;
 import org.junit.Assert;
 
 import java.io.File;
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java
index 9906295a17b..67499ebd868 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.testFramework.PsiTestUtil;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.testing.LocalFileSystemUtils;
+import org.jetbrains.kotlin.test.LocalFileSystemUtils;
 
 public class AddOpenToClassDeclarationTest extends AbstractQuickFixMultiFileTest {
     @Override
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
index 61d604ecffb..1d4f8bd5143 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
@@ -36,7 +36,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractKotlinFunctionHandlerHelper
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionGeneratorOptions
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractableCodeDescriptor
-import org.jetbrains.jet.testing.ConfigLibraryUtil
+import org.jetbrains.kotlin.test.ConfigLibraryUtil
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionData
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionOptions
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
index b30ef168b4a..bc77f6b846f 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
@@ -53,7 +53,7 @@ import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKo
 import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.plugin.search.allScope
-import org.jetbrains.jet.testing.ConfigLibraryUtil
+import org.jetbrains.kotlin.test.ConfigLibraryUtil
 import org.jetbrains.jet.plugin.util.application.runWriteAction
 
 public abstract class AbstractJetMoveTest : MultiFileTestCase() {
diff --git a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt
index 21a2ec7ff03..fa3a75635cd 100644
--- a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt
@@ -40,19 +40,12 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil
 import org.jetbrains.jet.plugin.search.allScope
 import org.jetbrains.jet.plugin.util.application.runWriteAction
 import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex
-import org.jetbrains.kotlin.psi.JetNamedFunction
 import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
 import org.jetbrains.kotlin.psi.JetNamedDeclaration
 import java.util.ArrayList
 import com.intellij.psi.PsiComment
-import org.jetbrains.kotlin.psi.psiUtil.siblings
-import org.jetbrains.kotlin.psi.JetClass
-import org.jetbrains.kotlin.psi.JetObjectDeclaration
-import org.jetbrains.kotlin.psi.JetClassOrObject
 import com.intellij.psi.PsiManager
-import org.jetbrains.jet.testing.ConfigLibraryUtil
-import com.intellij.psi.util.PsiTreeUtil
-import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
+import org.jetbrains.kotlin.test.ConfigLibraryUtil
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
 private val RUN_PREFIX = "// RUN: "
diff --git a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java
index 36b1e9dedaa..fe779d4d940 100644
--- a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java
+++ b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.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.
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java
similarity index 95%
rename from idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java
index c37726163bf..00fb431214d 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractJSBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java
similarity index 94%
rename from idea/tests/org/jetbrains/jet/completion/AbstractJSBasicCompletionTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java
index 4bf9933f472..31f4fdb185d 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractJSBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractJvmBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java
similarity index 94%
rename from idea/tests/org/jetbrains/jet/completion/AbstractJvmBasicCompletionTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java
index a4751d18516..19ed9ed3216 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractJvmBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
@@ -39,4 +39,4 @@ public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletio
     protected LookupElement[] complete(int invocationCount) {
         return myFixture.complete(CompletionType.BASIC, invocationCount);
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractJvmSmartCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java
similarity index 94%
rename from idea/tests/org/jetbrains/jet/completion/AbstractJvmSmartCompletionTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java
index cb743cc7b5e..a8305de91fc 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractJvmSmartCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
@@ -39,4 +39,4 @@ public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletio
     protected LookupElement[] complete(int invocationCount) {
         return myFixture.complete(CompletionType.SMART, invocationCount);
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractJvmWithLibBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java
similarity index 95%
rename from idea/tests/org/jetbrains/jet/completion/AbstractJvmWithLibBasicCompletionTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java
index 34e8d3a29a5..3b478d9a492 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractJvmWithLibBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractKeywordCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt
similarity index 94%
rename from idea/tests/org/jetbrains/jet/completion/AbstractKeywordCompletionTest.kt
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt
index 2df02162092..c5f0c208b19 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractKeywordCompletionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion
+package org.jetbrains.kotlin.completion
 
 import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.lookup.LookupElement
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java
similarity index 96%
rename from idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java
index 983924863fa..3ed13ede6a0 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt
similarity index 86%
rename from idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.kt
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt
index 91ac7f0734e..c1ea323d580 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion
+package org.jetbrains.kotlin.completion
 
-import com.intellij.codeInsight.lookup.LookupElement
-import kotlin.Function0
-import kotlin.Function1
-import kotlin.Unit
-import org.jetbrains.jet.completion.util.*
+import org.jetbrains.kotlin.completion.util.*
 import org.jetbrains.jet.plugin.KotlinCompletionTestCase
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import org.jetbrains.jet.plugin.project.TargetPlatform
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileSmartCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt
similarity index 92%
rename from idea/tests/org/jetbrains/jet/completion/AbstractMultiFileSmartCompletionTest.kt
rename to idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt
index 6778ce7e45a..38dc139ac60 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileSmartCompletionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion
+package org.jetbrains.kotlin.completion
 
-import org.jetbrains.jet.completion.util.*
+import org.jetbrains.kotlin.completion.util.*
 import org.jetbrains.jet.plugin.KotlinCompletionTestCase
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import org.jetbrains.jet.plugin.project.TargetPlatform
diff --git a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/CompiledKotlinInJavaCompletionTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/CompiledKotlinInJavaCompletionTestGenerated.java
index b1e81c429ac..dd597b6f5f8 100644
--- a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/CompiledKotlinInJavaCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/CompletionTestUtil.kt b/idea/tests/org/jetbrains/kotlin/completion/CompletionTestUtil.kt
similarity index 94%
rename from idea/tests/org/jetbrains/jet/completion/CompletionTestUtil.kt
rename to idea/tests/org/jetbrains/kotlin/completion/CompletionTestUtil.kt
index cd6a006c116..b377863958a 100644
--- a/idea/tests/org/jetbrains/jet/completion/CompletionTestUtil.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/CompletionTestUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.util
+package org.jetbrains.kotlin.completion.util
 
 import com.intellij.codeInsight.lookup.LookupElement
 import org.jetbrains.jet.plugin.project.TargetPlatform
 import org.junit.Assert
-import org.jetbrains.jet.completion.ExpectedCompletionUtils
+import org.jetbrains.kotlin.completion.ExpectedCompletionUtils
 import com.intellij.codeInsight.CodeInsightSettings
 
 fun testCompletion(fileText: String, platform: TargetPlatform?, complete: (Int) -> Array<LookupElement>?, defaultInvocationCount: Int = 0) {
@@ -59,4 +59,4 @@ private fun testWithAutoCompleteSetting(fileText: String, doTest: () -> Unit) {
         settings.AUTOCOMPLETE_ON_CODE_COMPLETION = oldValue1
         settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = oldValue2
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt
similarity index 96%
rename from idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt
rename to idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt
index 027aac4bcbc..fd8fee2d923 100644
--- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion
+package org.jetbrains.kotlin.completion
 
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import org.jetbrains.kotlin.psi.JetFile
diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTestGenerated.java
index 6c89cd86729..5b69545e6f6 100644
--- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java
rename to idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java
index de6bdaf1e0d..ab7abc4127d 100644
--- a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
@@ -31,9 +31,9 @@ import com.intellij.ui.JBColor;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.project.TargetPlatform;
 import org.jetbrains.jet.plugin.stubs.AstAccessControl;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.junit.Assert;
 
 import java.awt.*;
diff --git a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java
index 556ebb63eb7..243ab878e16 100644
--- a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java
similarity index 93%
rename from idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java
rename to idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java
index aeb59cff042..feffb6c5d08 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.openapi.util.io.FileUtil;
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.completion.util.UtilPackage;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.caches.resolve.LibraryModificationTracker;
 import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.jetbrains.kotlin.completion.util.UtilPackage;
 
 import java.io.File;
 
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java
index f422fec0aa9..30a25c9ab44 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JvmSmartCompletionTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/JvmSmartCompletionTestGenerated.java
index dc7b2046def..71584be8a13 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/JvmSmartCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JvmWithLibBasicCompletionTestGenerated.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/JvmWithLibBasicCompletionTestGenerated.java
index 42ad3313847..75c4f4431f6 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/JvmWithLibBasicCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/KeywordCompletionTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/KeywordCompletionTestGenerated.java
index f533ee986f9..bc5b5c660d2 100644
--- a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/KeywordCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/KotlinSourceInJavaCompletionTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/KotlinSourceInJavaCompletionTestGenerated.java
index 28107511928..61b76a921e3 100644
--- a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/KotlinSourceInJavaCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/MultiFileJvmBasicCompletionTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/MultiFileJvmBasicCompletionTestGenerated.java
index 89b10cb3a82..8caff0bdc5c 100644
--- a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/MultiFileJvmBasicCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/MultiFileSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/MultiFileSmartCompletionTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/MultiFileSmartCompletionTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/MultiFileSmartCompletionTestGenerated.java
index 20127fdee2d..a6f1b46cb42 100644
--- a/idea/tests/org/jetbrains/jet/completion/MultiFileSmartCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/MultiFileSmartCompletionTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion;
+package org.jetbrains.kotlin.completion;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java b/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java
similarity index 97%
rename from idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java
index 9436ffddd0e..e273c2d329b 100644
--- a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.confidence;
+package org.jetbrains.kotlin.completion.confidence;
 
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.completion.CodeCompletionHandlerBase;
@@ -101,4 +101,4 @@ public class JetConfidenceTest extends LightCompletionTestCase {
         new CodeCompletionHandlerBase(CompletionType.BASIC, false, true, true).invokeCompletion(
                 getProject(), getEditor(), 0, false, false);
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/AbstractCompletionHandlerTests.kt b/idea/tests/org/jetbrains/kotlin/completion/handlers/AbstractCompletionHandlerTests.kt
similarity index 97%
rename from idea/tests/org/jetbrains/jet/completion/handlers/AbstractCompletionHandlerTests.kt
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/AbstractCompletionHandlerTests.kt
index 864d1b6db09..0ea11ca0237 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/AbstractCompletionHandlerTests.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/AbstractCompletionHandlerTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers
+package org.jetbrains.kotlin.completion.handlers
 
 import com.intellij.codeInsight.completion.CompletionType
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt
similarity index 98%
rename from idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt
index 287f209593b..4d94160ab88 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers
+package org.jetbrains.kotlin.completion.handlers
 
 import com.intellij.codeInsight.completion.CompletionType
 import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings
@@ -170,4 +170,4 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
     fun testImportedEnumMember() { doTest(1, "AAA", null, null, '\n') }
 
     fun testInnerClass() { doTest(1, "Inner", null, null, '\n') }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java
index 1620974319f..e9f000444aa 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers;
+package org.jetbrains.kotlin.completion.handlers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionCharFilterTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionCharFilterTestGenerated.java
index 750d017e6f1..48c7d616219 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionCharFilterTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers;
+package org.jetbrains.kotlin.completion.handlers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt
similarity index 98%
rename from idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt
index 366c95f966a..7995bd861e2 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers
+package org.jetbrains.kotlin.completion.handlers
 
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
 import com.intellij.codeInsight.completion.CompletionType
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionMultifileHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java
similarity index 96%
rename from idea/tests/org/jetbrains/jet/completion/handlers/CompletionMultifileHandlerTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java
index 6c8a0bf02e8..d41bf5c3e98 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionMultifileHandlerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers;
+package org.jetbrains.kotlin.completion.handlers;
 
 import org.jetbrains.jet.plugin.KotlinCompletionTestCase;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/JavaCompletionHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java
similarity index 94%
rename from idea/tests/org/jetbrains/jet/completion/handlers/JavaCompletionHandlerTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java
index ec8a84ad60e..107b03d22c7 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/JavaCompletionHandlerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers;
+package org.jetbrains.kotlin.completion.handlers;
 
 import org.jetbrains.jet.plugin.KotlinCompletionTestCase;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/KeywordCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/KeywordCompletionHandlerTestGenerated.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/completion/handlers/KeywordCompletionHandlerTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/KeywordCompletionHandlerTestGenerated.java
index f1d40fe9817..e988ecacd29 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/KeywordCompletionHandlerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/KeywordCompletionHandlerTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers;
+package org.jetbrains.kotlin.completion.handlers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionHandlerTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionHandlerTestGenerated.java
index 8631581c3a1..922416f609a 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionHandlerTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers;
+package org.jetbrains.kotlin.completion.handlers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionMultifileHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java
similarity index 94%
rename from idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionMultifileHandlerTest.java
rename to idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java
index 1cb67519697..61550eb06dd 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionMultifileHandlerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.handlers;
+package org.jetbrains.kotlin.completion.handlers;
 
 import com.intellij.codeInsight.completion.CompletionType;
 import org.jetbrains.jet.plugin.KotlinCompletionTestCase;
diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt b/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt
similarity index 94%
rename from idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt
rename to idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt
index 7a3d79e4a21..f354513c26c 100644
--- a/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.weighers
+package org.jetbrains.kotlin.completion.weighers
 
 import com.intellij.codeInsight.completion.CompletionType
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
@@ -23,7 +23,6 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase
 import org.testng.Assert
 import org.jetbrains.kotlin.test.util.configureWithExtraFile
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
-import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor
 
 public abstract class AbstractCompletionWeigherTest(val completionType: CompletionType, val relativeTestDataPath: String) : JetLightCodeInsightFixtureTestCase() {
diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/BasicCompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/weighers/BasicCompletionWeigherTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/weighers/BasicCompletionWeigherTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/weighers/BasicCompletionWeigherTestGenerated.java
index 206725f308c..d9d97db797b 100644
--- a/idea/tests/org/jetbrains/jet/completion/weighers/BasicCompletionWeigherTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/weighers/BasicCompletionWeigherTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.weighers;
+package org.jetbrains.kotlin.completion.weighers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/SmartCompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/completion/weighers/SmartCompletionWeigherTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java
index 5a44b38e88a..dc9f93957df 100644
--- a/idea/tests/org/jetbrains/jet/completion/weighers/SmartCompletionWeigherTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.completion.weighers;
+package org.jetbrains.kotlin.completion.weighers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
rename to idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java
index f349eca2e62..a7271365a75 100644
--- a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.findUsages;
+package org.jetbrains.kotlin.findUsages;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -48,15 +48,15 @@ import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.test.JetTestUtils;
-import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions;
 import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions;
 import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions;
+import org.jetbrains.kotlin.psi.*;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
+import org.jetbrains.kotlin.test.JetTestUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java
index 25ab487e72c..74d7780811e 100644
--- a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.findUsages;
+package org.jetbrains.kotlin.findUsages;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java
rename to idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java
index ec0b12a0b19..19993b03b42 100644
--- a/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.formatter;
+package org.jetbrains.kotlin.formatter;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
@@ -32,11 +32,11 @@ import com.intellij.testFramework.LightIdeaTestCase;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.JetTestUtils;
-import org.jetbrains.kotlin.plugin.JetLanguage;
-import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.testing.SettingsConfigurator;
+import org.jetbrains.kotlin.test.SettingsConfigurator;
 
 import java.io.File;
 import java.util.EnumMap;
diff --git a/idea/tests/org/jetbrains/jet/formatter/AbstractJetTypingIndentationTestBase.java b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetTypingIndentationTestBase.java
similarity index 95%
rename from idea/tests/org/jetbrains/jet/formatter/AbstractJetTypingIndentationTestBase.java
rename to idea/tests/org/jetbrains/kotlin/formatter/AbstractJetTypingIndentationTestBase.java
index bb28de55f43..98e1fe00e6d 100644
--- a/idea/tests/org/jetbrains/jet/formatter/AbstractJetTypingIndentationTestBase.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetTypingIndentationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.formatter;
+package org.jetbrains.kotlin.formatter;
 
 import com.intellij.openapi.editor.CaretModel;
 import com.intellij.openapi.util.io.FileUtil;
@@ -24,7 +24,7 @@ import com.intellij.testFramework.EditorTestUtil;
 import com.intellij.testFramework.LightCodeInsightTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.test.JetTestUtils;
-import org.jetbrains.jet.testing.SettingsConfigurator;
+import org.jetbrains.kotlin.test.SettingsConfigurator;
 
 import java.io.File;
 
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatSettingsUtil.java b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
similarity index 92%
rename from idea/tests/org/jetbrains/jet/formatter/JetFormatSettingsUtil.java
rename to idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
index d65e2ec3be2..cb42d46b796 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetFormatSettingsUtil.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.formatter;
+package org.jetbrains.kotlin.formatter;
 
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.testFramework.LightPlatformTestCase;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings;
-import org.jetbrains.jet.testing.SettingsConfigurator;
+import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.test.SettingsConfigurator;
 
 public class JetFormatSettingsUtil {
     private JetFormatSettingsUtil() {
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java
index 9b11997a4a2..3d6d137a42e 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.formatter;
+package org.jetbrains.kotlin.formatter;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/JetTypingIndentationTestBaseGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java
rename to idea/tests/org/jetbrains/kotlin/formatter/JetTypingIndentationTestBaseGenerated.java
index c8e8dbb3867..1a36813be47 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/JetTypingIndentationTestBaseGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.formatter;
+package org.jetbrains.kotlin.formatter;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/editor/JetCommenterTest.java b/idea/tests/org/jetbrains/kotlin/plugin/editor/JetCommenterTest.java
similarity index 95%
rename from idea/tests/org/jetbrains/jet/editor/JetCommenterTest.java
rename to idea/tests/org/jetbrains/kotlin/plugin/editor/JetCommenterTest.java
index c7d17fa2a73..f366ae28a16 100644
--- a/idea/tests/org/jetbrains/jet/editor/JetCommenterTest.java
+++ b/idea/tests/org/jetbrains/kotlin/plugin/editor/JetCommenterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.editor;
+package org.jetbrains.kotlin.plugin.editor;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.EditorTestUtil;
diff --git a/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/plugin/editor/TypedHandlerTest.kt
similarity index 99%
rename from idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.kt
rename to idea/tests/org/jetbrains/kotlin/plugin/editor/TypedHandlerTest.kt
index 0a1cd5680fb..43dd5abe558 100644
--- a/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/plugin/editor/TypedHandlerTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.editor
+package org.jetbrains.kotlin.plugin.editor
 
 import com.intellij.testFramework.EditorTestUtil
 import com.intellij.testFramework.LightCodeInsightTestCase
diff --git a/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java b/idea/tests/org/jetbrains/kotlin/plugin/editor/quickDoc/AbstractJetQuickDocProviderTest.java
similarity index 97%
rename from idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java
rename to idea/tests/org/jetbrains/kotlin/plugin/editor/quickDoc/AbstractJetQuickDocProviderTest.java
index ddd198e2a04..eaa8f51d6ed 100644
--- a/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java
+++ b/idea/tests/org/jetbrains/kotlin/plugin/editor/quickDoc/AbstractJetQuickDocProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.editor.quickDoc;
+package org.jetbrains.kotlin.plugin.editor.quickDoc;
 
 import com.intellij.codeInsight.documentation.DocumentationManager;
 import com.intellij.codeInsight.navigation.CtrlMouseHandler;
@@ -24,9 +24,9 @@ import com.intellij.psi.PsiElement;
 import com.intellij.rt.execution.junit.FileComparisonFailure;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.util.UtilPackage;
 import org.junit.Assert;
 
diff --git a/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/plugin/editor/quickDoc/JetQuickDocProviderTestGenerated.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/plugin/editor/quickDoc/JetQuickDocProviderTestGenerated.java
index 54d02cbfaec..26d5950c20b 100644
--- a/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/plugin/editor/quickDoc/JetQuickDocProviderTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.editor.quickDoc;
+package org.jetbrains.kotlin.plugin.editor.quickDoc;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java
index 9ad77fe41dc..c4c9b14a067 100644
--- a/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java
+++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java
@@ -28,13 +28,13 @@ import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.test.JetTestCaseBuilder;
-import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
+import org.jetbrains.kotlin.test.JetTestCaseBuilder;
+import org.jetbrains.kotlin.test.ReferenceUtils;
 import org.jetbrains.kotlin.test.util.UtilPackage;
-import org.jetbrains.jet.testing.ReferenceUtils;
 import org.junit.Assert;
 
 import java.util.List;
diff --git a/idea/tests/org/jetbrains/jet/psi/StringTemplateExpressionManipulatorTest.kt b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt
similarity index 91%
rename from idea/tests/org/jetbrains/jet/psi/StringTemplateExpressionManipulatorTest.kt
rename to idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt
index a3a96d55222..d382b0df3b6 100644
--- a/idea/tests/org/jetbrains/jet/psi/StringTemplateExpressionManipulatorTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.psi
+package org.jetbrains.kotlin.psi
 
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
 import org.jetbrains.jet.plugin.JetLightProjectDescriptor
-import org.jetbrains.kotlin.psi.JetStringTemplateExpression
-import org.jetbrains.kotlin.psi.JetPsiFactory
 import com.intellij.psi.ElementManipulators
 import org.junit.Assert.*
 import com.intellij.openapi.util.TextRange
 
-public class StringTemplateExpressionManipulatorTest: JetLightCodeInsightFixtureTestCase() {
+public class StringTemplateExpressionManipulatorTest : JetLightCodeInsightFixtureTestCase() {
     public fun testSingleQuoted() {
         doTestContentChange("\"a\"", "b", "\"b\"")
         doTestContentChange("\"\"", "b", "\"b\"")
diff --git a/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt
similarity index 98%
rename from idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt
rename to idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt
index e296f2fc601..803b6063cfd 100644
--- a/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.psi.injection
+package org.jetbrains.kotlin.psi.injection
 
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.kotlin.psi.JetStringTemplateExpression
diff --git a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt
similarity index 87%
rename from idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt
rename to idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt
index d5a49a376a9..eee61600674 100644
--- a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.psi.patternMatching
+package org.jetbrains.kotlin.psi.patternMatching
 
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
 import com.intellij.testFramework.LightProjectDescriptor
-import org.jetbrains.jet.plugin.JetLightProjectDescriptor
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.psiUtil.parents
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.psi.JetElement
 import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier
-import org.jetbrains.jet.plugin.caches.resolve.analyzeFully
 import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange
 import java.io.File
 import org.jetbrains.kotlin.test.JetTestUtils
@@ -32,9 +30,6 @@ import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.kotlin.psi.JetTypeReference
 import org.jetbrains.kotlin.psi.JetWhenCondition
 import org.jetbrains.jet.plugin.DirectiveBasedActionUtils
-import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.jet.testing.ConfigLibraryUtil
-import org.jetbrains.jet.plugin.PluginTestCaseBase
 
 public abstract class AbstractJetPsiUnifierTest: JetLightCodeInsightFixtureTestCase() {
     public fun doTest(filePath: String) {
diff --git a/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java
index cc85ab34f7c..1f3d19fe0ca 100644
--- a/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.psi.patternMatching;
+package org.jetbrains.kotlin.psi.patternMatching;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java
rename to idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java
index 912ca9a5f7e..aeb16c1ee03 100644
--- a/idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java
+++ b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.safeDelete;
+package org.jetbrains.kotlin.safeDelete;
 
 import com.intellij.codeInsight.TargetElementUtilBase;
 import com.intellij.openapi.editor.Editor;
@@ -26,10 +26,10 @@ import com.intellij.refactoring.BaseRefactoringProcessor;
 import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.kotlin.psi.*;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java
index 883b5081aa0..b68af1b3c8c 100644
--- a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.safeDelete;
+package org.jetbrains.kotlin.safeDelete;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java
similarity index 97%
rename from idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java
rename to idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java
index 940b08528f4..5fcd74bd19e 100644
--- a/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java
+++ b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.search;
+package org.jetbrains.kotlin.search;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.JavaPsiFacade;
@@ -24,8 +24,8 @@ import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import com.intellij.util.Query;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -73,4 +73,4 @@ public abstract class AbstractSearcherTest extends LightCodeInsightFixtureTestCa
     protected LightProjectDescriptor getProjectDescriptor() {
         return JetLightProjectDescriptor.INSTANCE;
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java b/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java
similarity index 96%
rename from idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java
rename to idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java
index 3c80e3c16af..337406b9611 100644
--- a/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java
+++ b/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.search;
+package org.jetbrains.kotlin.search;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.searches.AnnotatedMembersSearch;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java b/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java
similarity index 96%
rename from idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java
rename to idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java
index 605475294cc..4ac6c4b6423 100644
--- a/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java
+++ b/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.search;
+package org.jetbrains.kotlin.search;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
similarity index 97%
rename from idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java
rename to idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
index 6a50e451f0e..45610ddb049 100644
--- a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java
+++ b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.search;
+package org.jetbrains.kotlin.search;
 
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.util.io.FileUtil;
@@ -23,9 +23,9 @@ import com.intellij.psi.search.searches.AnnotatedMembersSearch;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt b/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt
similarity index 95%
rename from idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt
rename to idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt
index b3a5b62912a..220baa9911f 100644
--- a/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.shortenRefs
+package org.jetbrains.kotlin.shortenRefs
 
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor
 import com.intellij.openapi.application.ApplicationManager
diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
similarity index 99%
rename from idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java
rename to idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
index 55c28250c17..cd73cf01686 100644
--- a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.shortenRefs;
+package org.jetbrains.kotlin.shortenRefs;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java b/idea/tests/org/jetbrains/kotlin/test/ConfigLibraryUtil.java
similarity index 86%
rename from idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java
rename to idea/tests/org/jetbrains/kotlin/test/ConfigLibraryUtil.java
index e226105b121..b30ec83243c 100644
--- a/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java
+++ b/idea/tests/org/jetbrains/kotlin/test/ConfigLibraryUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.testing;
+package org.jetbrains.kotlin.test;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
@@ -58,19 +58,17 @@ public class ConfigLibraryUtil {
         addLibrary(libraryEditor, module);
     }
 
-    public static void unConfigureLibrary(final Module module, final Sdk sdk, String libraryName) {
+    public static void unConfigureLibrary(Module module, Sdk sdk, String libraryName) {
         configureSdk(module, sdk);
         removeLibrary(module, libraryName);
     }
 
-    public static void configureSdk(
-            @NotNull final Module module,
-            @NotNull final Sdk sdk) {
+    public static void configureSdk(@NotNull final Module module, @NotNull final Sdk sdk) {
         ApplicationManager.getApplication().runWriteAction(new Runnable() {
             @Override
             public void run() {
-                final ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
-                final ModifiableRootModel rootModel = rootManager.getModifiableModel();
+                ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
+                ModifiableRootModel rootModel = rootManager.getModifiableModel();
 
                 rootModel.setSdk(sdk);
                 rootModel.commit();
@@ -82,7 +80,7 @@ public class ConfigLibraryUtil {
         return ApplicationManager.getApplication().runWriteAction(new Computable<Library>() {
             @Override
             public Library compute() {
-                final ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
+                ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
                 ModifiableRootModel model = rootManager.getModifiableModel();
 
                 Library library = addLibrary(editor, model);
@@ -97,7 +95,7 @@ public class ConfigLibraryUtil {
     public static Library addLibrary(NewLibraryEditor editor, ModifiableRootModel model) {
         Library library = model.getModuleLibraryTable().createLibrary(editor.getName());
 
-        final Library.ModifiableModel libModel = library.getModifiableModel();
+        Library.ModifiableModel libModel = library.getModifiableModel();
         editor.applyTo((LibraryEx.ModifiableModelEx) libModel);
 
         libModel.commit();
@@ -110,8 +108,8 @@ public class ConfigLibraryUtil {
         ApplicationManager.getApplication().runWriteAction(new Runnable() {
             @Override
             public void run() {
-                final ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
-                final ModifiableRootModel model = rootManager.getModifiableModel();
+                ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
+                ModifiableRootModel model = rootManager.getModifiableModel();
 
                 for (OrderEntry orderEntry : model.getOrderEntries()) {
                     if (orderEntry instanceof LibraryOrderEntry) {
diff --git a/idea/tests/org/jetbrains/jet/testing/LocalFileSystemUtils.java b/idea/tests/org/jetbrains/kotlin/test/LocalFileSystemUtils.java
similarity index 90%
rename from idea/tests/org/jetbrains/jet/testing/LocalFileSystemUtils.java
rename to idea/tests/org/jetbrains/kotlin/test/LocalFileSystemUtils.java
index 17717dc323c..f37a1d115a0 100644
--- a/idea/tests/org/jetbrains/jet/testing/LocalFileSystemUtils.java
+++ b/idea/tests/org/jetbrains/kotlin/test/LocalFileSystemUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.testing;
+package org.jetbrains.kotlin.test;
 
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
 public class LocalFileSystemUtils {
-    private LocalFileSystemUtils(){
+    private LocalFileSystemUtils() {
     }
 
     public static void refreshPath(@NotNull String path) {
diff --git a/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java
similarity index 95%
rename from idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java
rename to idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java
index e9f8a198c30..1b90452e842 100644
--- a/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java
+++ b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.testing;
+package org.jetbrains.kotlin.test;
 
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.NavigationItem;
@@ -25,10 +25,9 @@ import com.intellij.util.PathUtil;
 import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
+import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.kotlin.psi.JetClass;
 import org.jetbrains.kotlin.psi.JetObjectDeclaration;
-import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.junit.Assert;
 
 import java.util.List;
diff --git a/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java b/idea/tests/org/jetbrains/kotlin/test/SettingsConfigurator.java
similarity index 97%
rename from idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java
rename to idea/tests/org/jetbrains/kotlin/test/SettingsConfigurator.java
index fd7a6f827a9..78ca5513be3 100644
--- a/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java
+++ b/idea/tests/org/jetbrains/kotlin/test/SettingsConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.testing;
+package org.jetbrains.kotlin.test;
 
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import kotlin.Pair;
-import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
diff --git a/idea/tests/org/jetbrains/jet/testing/TagsTestDataUtil.java b/idea/tests/org/jetbrains/kotlin/test/TagsTestDataUtil.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/testing/TagsTestDataUtil.java
rename to idea/tests/org/jetbrains/kotlin/test/TagsTestDataUtil.java
index 7ea7a8f7ab8..a7d2178781e 100644
--- a/idea/tests/org/jetbrains/jet/testing/TagsTestDataUtil.java
+++ b/idea/tests/org/jetbrains/kotlin/test/TagsTestDataUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.testing;
+package org.jetbrains.kotlin.test;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;