diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt
index ec1e0abdeaa..9140e16cc17 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.psi.JetElement
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate
 import com.intellij.codeInsight.intention.IntentionAction
 
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
index d9195a3f8d4..ba8a0f92ec6 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
@@ -27,9 +27,8 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.JetPsiUtil
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.psi.JetPsiFactory
-import com.intellij.psi.PsiElement
 
 public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) {
 
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt
index fb454e444b6..e5c3ac36419 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import com.intellij.codeInspection.SuppressIntentionAction
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.java b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.java
similarity index 66%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.java
index 03f19a89c40..26de55c8e0f 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.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.plugin;
+package org.jetbrains.kotlin.plugin;
 
 import com.intellij.CommonBundle;
 import org.jetbrains.annotations.NonNls;
@@ -29,23 +29,23 @@ public class JetBundle {
     private static Reference<ResourceBundle> ourBundle;
 
     @NonNls
-    private static final String BUNDLE = "org.jetbrains.jet.plugin.JetBundle";
+    private static final String BUNDLE = "org.jetbrains.kotlin.plugin.JetBundle";
 
     private JetBundle() {
     }
 
     @NotNull
-    public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE)String key, Object... params) {
-      return CommonBundle.message(getBundle(), key, params);
+    public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE) String key, Object... params) {
+        return CommonBundle.message(getBundle(), key, params);
     }
 
     private static ResourceBundle getBundle() {
-      ResourceBundle bundle = null;
-      if (ourBundle != null) bundle = ourBundle.get();
-      if (bundle == null) {
-        bundle = ResourceBundle.getBundle(BUNDLE);
-        ourBundle = new SoftReference<ResourceBundle>(bundle);
-      }
-      return bundle;
+        ResourceBundle bundle = null;
+        if (ourBundle != null) bundle = ourBundle.get();
+        if (bundle == null) {
+            bundle = ResourceBundle.getBundle(BUNDLE);
+            ourBundle = new SoftReference<ResourceBundle>(bundle);
+        }
+        return bundle;
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.properties
similarity index 100%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.properties
rename to idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.properties
diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index f5f8feb7363..7c921c8f24c 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templateSet group="Kotlin">
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.main"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.main"
               name="main" toReformat="true" toShortenFQNames="true"
               value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -31,7 +31,7 @@
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.soutp"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.soutp"
               name="soutp" toReformat="true" toShortenFQNames="true" value="println($FORMAT$)">
         <variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;'\&quot;' + _1.collect { it + ' = [${' + it + '}]'}.join(', ') + '\&quot;'&quot;, functionParameters())"
                   name="FORMAT" />
@@ -39,7 +39,7 @@
             <option name="KOTLIN_STATEMENT" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.iter"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.iter"
               name="iter" toReformat="true" toShortenFQNames="true"
               value="for ($VAR$ in $ITERABLE$) {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;iterable&quot;" expression="kotlinIterableVariable()" name="ITERABLE" />
@@ -48,7 +48,7 @@
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.ifn"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.ifn"
               name="ifn" toReformat="true" toShortenFQNames="true"
               value="if ($VAR$ == null) {&#10;$END$&#10;}">
       <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" />
@@ -56,7 +56,7 @@
         <option name="KOTLIN_EXPRESSION" value="true" />
       </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.inn"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.inn"
               name="inn" toReformat="true" toShortenFQNames="true"
               value="if ($VAR$ != null) {&#10;$END$&#10;}">
       <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" />
@@ -64,7 +64,7 @@
         <option name="KOTLIN_EXPRESSION" value="true" />
       </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.void"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.void"
               name="void" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAMS$) {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="" expression="" name="PARAMS" />
@@ -74,7 +74,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun0"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun0"
               name="fun0" toReformat="true" toShortenFQNames="true" value="fun $NAME$() : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
@@ -84,7 +84,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun1"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun1"
               name="fun1" toReformat="true" toShortenFQNames="true"
               value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -97,7 +97,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun2"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun2"
               name="fun2" toReformat="true" toShortenFQNames="true"
               value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -113,7 +113,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.interface"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.interface"
               name="interface" toReformat="true" toShortenFQNames="true" value="trait $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
@@ -122,7 +122,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.singleton"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.singleton"
               name="singleton" toReformat="true" toShortenFQNames="true" value="object $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
@@ -132,7 +132,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.closure"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.closure"
               name="closure" toReformat="true" toShortenFQNames="true" value="{$PARAM$ -> $PARAM_COPY$}">
         <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM" />
         <variable alwaysStopAt="true" defaultValue="" expression="PARAM" name="PARAM_COPY" />
@@ -141,7 +141,7 @@
             <option name="KOTLIN_EXPRESSION" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.anonymous"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.anonymous"
               name="anonymous" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
         <context>
@@ -150,7 +150,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exfun"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exfun"
               name="exfun" toReformat="true" toShortenFQNames="true"
               value="fun $RECEIVER$.$NAME$($PARAMS$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -162,7 +162,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exval"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exval"
               name="exval" toReformat="true" toShortenFQNames="true"
               value="val $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -173,7 +173,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exvar"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exvar"
               name="exvar" toReformat="true" toShortenFQNames="true"
               value="var $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}&#10;set(value) {&#10; &#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -189,7 +189,7 @@
     <!-- Synonyms -->
 
     <!-- Synonym for main -->
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.main"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.main"
               name="psvm" toReformat="true" toShortenFQNames="true"
               value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -198,7 +198,7 @@
     </template>
 
     <!-- Synonym for anonymous -->
-    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.anonymous"
+    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.anonymous"
               name="object" id="kt-object" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
         <context>
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
index 9b9c0794af8..deec85f539a 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction;
 import org.jetbrains.kotlin.psi.JetPsiFactory;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java
index ead761f3969..d00dc78d51b 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java
@@ -34,7 +34,7 @@ import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
 
 import javax.swing.*;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
index 2d27a87e624..17b282e894e 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
@@ -30,7 +30,7 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.plugin.JetIcons;
 import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java
index 17bf3c9337f..50d4b16cc62 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.resolve.OverrideResolver;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 import java.util.Collection;
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java
index 7d79b3324fc..ed15a8a4400 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.resolve.OverrideResolver;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import java.util.Set;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java
index 0ef897170a8..205bbb9ec0c 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetBlockExpression;
 import org.jetbrains.kotlin.psi.JetExpression;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt
index 3e27dddee5b..b0b529f97d7 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt
@@ -42,7 +42,7 @@ import org.jetbrains.jet.plugin.caches.resolve.analyzeFully
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 
 public class KotlinRuntimeTypeCastSurrounder: KotlinExpressionSurrounder() {
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
index c15be8220f9..a0e13003dce 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetConstantExpression;
 import org.jetbrains.kotlin.psi.JetExpression;
 import org.jetbrains.kotlin.psi.JetStringTemplateEntry;
 import org.jetbrains.kotlin.psi.JetStringTemplateExpression;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
index 403e4bfd28a..cd6ea3b3975 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetWhenCondition;
 import org.jetbrains.kotlin.psi.JetWhenEntry;
 import org.jetbrains.kotlin.psi.JetWhenExpression;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
index c5f23b8c745..f94067ecc60 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils;
 import org.jetbrains.jet.plugin.codeInsight.surroundWith.MoveDeclarationsOutHelper;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java
index cb0cefcad74..b0e57c85187 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/unwrap/KotlinUnwrapRemoveBase.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.JetBlockExpression;
 import org.jetbrains.kotlin.psi.JetElement;
 import org.jetbrains.kotlin.psi.JetExpression;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
 
 import java.util.List;
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
index 205cfa97832..a40d0aa8f74 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -27,7 +27,7 @@
             </constraints>
             <properties>
               <selected value="false"/>
-              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/>
+              <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/>
             </properties>
           </component>
           <component id="ba279" class="javax.swing.JLabel" binding="additionalArgsLabel">
@@ -35,7 +35,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
+              <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
             </properties>
           </component>
           <component id="7a827" class="com.intellij.ui.RawCommandLineEditor" binding="additionalArgsOptionsField">
@@ -45,7 +45,7 @@
               </grid>
             </constraints>
             <properties>
-              <dialogCaption resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters.dialog.title"/>
+              <dialogCaption resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters.dialog.title"/>
             </properties>
           </component>
         </children>
@@ -61,7 +61,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title-resource-bundle="org/jetbrains/jet/plugin/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
+        <border type="etched" title-resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
         <children>
           <component id="c6928" class="javax.swing.JCheckBox" binding="incrementalCompilationCheckBox">
             <constraints>
@@ -84,14 +84,14 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title-resource-bundle="org/jetbrains/jet/plugin/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/>
+        <border type="etched" title-resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/>
         <children>
           <component id="1fbe0" class="javax.swing.JCheckBox" binding="generateSourceMapsCheckBox" default-binding="true">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
+              <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
             </properties>
           </component>
           <component id="3ac8f" class="javax.swing.JLabel" binding="labelForOutputPrefixFile">
@@ -101,7 +101,7 @@
               </grid>
             </constraints>
             <properties>
-              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.output.prefix"/>
+              <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.output.prefix"/>
             </properties>
           </component>
           <component id="2d5b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPrefixFile">
@@ -117,7 +117,7 @@
               </grid>
             </constraints>
             <properties>
-              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.output.postfix"/>
+              <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.output.postfix"/>
             </properties>
           </component>
           <component id="1292b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPostfixFile">
@@ -131,7 +131,7 @@
               <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.output.copy.dir"/>
+              <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.output.copy.dir"/>
             </properties>
           </component>
           <component id="f1f6b" class="javax.swing.JTextField" binding="outputDirectory">
@@ -149,7 +149,7 @@
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.output.copy.files"/>
+              <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="kotlin.compiler.js.option.output.copy.files"/>
             </properties>
           </component>
         </children>
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
index c1566f3cafd..e676caeba62 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments;
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.kotlin.config.CompilerSettings;
 
 import javax.swing.*;
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.form b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.form
index 67eedf758a0..43c15eb8955 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.form
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.form
@@ -14,7 +14,7 @@
         </constraints>
         <properties>
           <selected value="false"/>
-          <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="debugger.filter.ignore.internal.classes"/>
+          <text resource-bundle="org/jetbrains/kotlin/plugin/JetBundle" key="debugger.filter.ignore.internal.classes"/>
         </properties>
       </component>
       <vspacer id="c37da">
diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt
index d139f333416..3778b37a387 100644
--- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt
+++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.usages.UsageTarget
 import com.intellij.usages.impl.rules.UsageType
 import com.intellij.usages.impl.rules.UsageTypeProviderEx
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum.*
 
 public object JetUsageTypeProvider : UsageTypeProviderEx {
diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java
index 3b9d6456a18..ec7fd1c116b 100644
--- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java
+++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java
@@ -26,7 +26,7 @@ import com.intellij.psi.PsiClass;
 import com.intellij.ui.SimpleColoredComponent;
 import com.intellij.ui.StateRestoringCheckBox;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
 import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration;
diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
index dead1312dfc..df702f0899f 100644
--- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
+++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
@@ -24,8 +24,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiMethod;
 import com.intellij.ui.SimpleColoredComponent;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.psi.JetNamedFunction;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
index 62e11ab3bee..02de530d277 100644
--- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
+++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
@@ -28,7 +28,7 @@ import com.intellij.ui.StateRestoringCheckBox;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.JetNamedDeclaration;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions;
 
 import javax.swing.*;
diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
index a20bbb09bd9..f5f801bfe6b 100644
--- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
+++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
@@ -22,7 +22,7 @@ import javax.swing.JPanel
 import com.intellij.ide.hierarchy.HierarchyTreeStructure
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import com.intellij.ide.hierarchy.method.MethodHierarchyBrowser
 import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod
 import com.intellij.psi.PsiMethod
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
index d4b905ca6a5..0a60b70cbf8 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
 import com.intellij.openapi.options.colors.ColorSettingsPage;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.JetIcons;
 import org.jetbrains.jet.plugin.JetLanguage;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt
index 6493fc25cdc..37051fc6ef4 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.highlighter.markers
 import org.jetbrains.kotlin.psi.JetProperty
 import com.intellij.psi.search.PsiElementProcessor
 import com.intellij.psi.PsiClass
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import com.intellij.psi.search.searches.OverridingMethodsSearch
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import com.intellij.psi.PsiMethod
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt
index 02f098bfbe0..53a53bb8d46 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt
@@ -28,7 +28,7 @@ import java.awt.event.MouseEvent
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.jet.plugin.codeInsight.JetFunctionPsiElementCellRenderer
 import org.jetbrains.annotations.TestOnly
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
index afd40b01d8b..0a17fd6e883 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.kotlin.psi.JetConstantExpression
 import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 import java.util.LinkedList
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 
 public class ConvertNegatedExpressionWithDemorgansLawIntention : JetSelfTargetingIntention<JetPrefixExpression>(
         "convert.negated.expression.with.demorgans.law", javaClass()
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt
index 018e0b4c7df..d592dca4c70 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt
index 18b4faac9f8..8830c60995a 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.lexer.JetTokens
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java
index 2add2335591..c64f4bac0ac 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt
index c0559b91170..360b9829b38 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt
@@ -26,7 +26,7 @@ import com.intellij.util.IncorrectOperationException
 import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.kotlin.psi.JetParenthesizedExpression
 import org.jetbrains.kotlin.psi.JetPsiUtil
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 
 public class RemoveUnnecessaryParenthesesIntention : JetSelfTargetingIntention<JetParenthesizedExpression>(
         "remove.unnecessary.parentheses", javaClass()
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt
index fe400de7235..f35eae52976 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt
@@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.refactoring.rename.RenameProcessor
 import com.intellij.usageView.UsageInfo
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import com.intellij.psi.codeStyle.CodeStyleManager
 import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor
 import org.jetbrains.jet.plugin.references.JetReference
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
index 604e51e1697..3907c231e8e 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
@@ -25,7 +25,7 @@ import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler
 import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.psi.JetFunctionLiteral
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt
index ccaad037916..bdfd0b69c83 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt
@@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
 import org.jetbrains.jet.plugin.caches.resolve.analyzeFully
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.psi.JetValueArgument
 import org.jetbrains.kotlin.psi.JetPsiUnparsingUtils
 import org.jetbrains.kotlin.psi.JetPsiFactory
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
index d297d063bcf..08b8f71c3f2 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.types.ErrorUtils;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.TypeUtils;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt
index 3cc60ca3ddc..78a0764ba92 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt
@@ -24,7 +24,7 @@ import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.psi.ValueArgument
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument
 import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument
 import org.jetbrains.jet.plugin.util.Maybe
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
index f3959fc4a5a..e572d91f7f9 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
@@ -26,7 +26,7 @@ import org.jetbrains.jet.plugin.intentions.JetTypeLookupExpression
 import com.intellij.codeInsight.template.TemplateEditingAdapter
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 import com.intellij.codeInsight.template.Template
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
index 787a52b717d..c15de215432 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetPostfixExpression
 import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineBaseExpressionIfApplicableWithPrompt
 import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle
 import org.jetbrains.kotlin.psi.JetThrowExpression
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpressionOrEmptyBlock
 import org.jetbrains.jet.plugin.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments
 import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStatement
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
index df24346d1c5..4d567165f2d 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 import java.util.List;
diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java
index adef5d305e3..de220630b93 100644
--- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java
+++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java
@@ -41,7 +41,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPackage;
 import org.jetbrains.kotlin.load.java.structure.impl.JavaConstructorImpl;
 import org.jetbrains.kotlin.load.java.structure.impl.JavaFieldImpl;
 import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.JetIcons;
 import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java
index 2e98d416706..664be616f26 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 import java.util.ArrayList;
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
index 398cef6688f..71e968697a0 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class JetAnyVariableMacro extends BaseJetVariableMacro {
     @Override
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java
index 60db6ab7bf8..34d1b7b6e22 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java
@@ -24,7 +24,7 @@ import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.JetFunction;
 import org.jetbrains.kotlin.psi.JetParameter;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java
index fca67aaee79..5ad73bb47a3 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class JetIterableVariableMacro extends BaseJetVariableMacro {
 
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java
index 59047edabca..ca1c6dd1b96 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class JetSuggestVariableNameMacro extends BaseJetVariableMacro {
     @Override
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java
index 91f68c6395e..c8d829d399c 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetFunction;
 import org.jetbrains.kotlin.psi.JetPsiFactory;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
index 70ad05402ab..f58efb52035 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.ValueArgument;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.refactoring.JetNameValidator;
 import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
index 6f3b447ca93..e531f9dc67f 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.TypeUtils;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java
index ae5a85153d8..d7626546996 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetModifierListOwner;
 import org.jetbrains.kotlin.psi.JetPropertyAccessor;
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.lexer.JetTokens.ABSTRACT_KEYWORD;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java
index 2b7fa0b35ef..0b126c46dfe 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage;
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.JetIcons;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java
index ecc64de8f7a..60ebb76c871 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetSimpleNameExpression;
 import org.jetbrains.kotlin.psi.JetTypeReference;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<JetTypeReference> {
     private JetClass classDeclaration;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
index 6f7530ea75b..445ec9b9a50 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.Errors;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.project.PluginJetFilesProvider;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java
index 67758f0b83f..a7b9442335f 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java
index 1db91e21cfa..e2307e1e457 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2;
 import org.jetbrains.kotlin.diagnostics.Errors;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java
index 0b5edbd4e12..7eaa8bc77d1 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetPsiFactory;
 import org.jetbrains.kotlin.psi.JetWhenEntry;
 import org.jetbrains.kotlin.psi.JetWhenExpression;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt
index 769c57c9f5b..189f319e1e7 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.ImportPath
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.jet.plugin.actions.JetAddImportAction
 import org.jetbrains.jet.plugin.caches.JetShortNamesCache
 import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java
index c6294ced419..261788f1fd6 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java
index 577c63a0f34..e2fb9d228ff 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java
index 45c37f2af87..08dc2aa93d2 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.TypeProjection;
 import org.jetbrains.kotlin.types.TypeUtils;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
index 6c8b9c20a27..6fb7d51cf29 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetFunctionLiteral;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator;
 import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
index bb6e4a9eec1..841a866b422 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.types.ErrorUtils;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java
index 2cd8c96e7f7..952ad101676 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
 import org.jetbrains.jet.plugin.refactoring.JetNameValidator;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java
index 0b63ba42001..6228fe207d8 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java
@@ -47,7 +47,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.TypeUtils;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java
index 7ed19c8c1dd..90aa6160866 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetNamedDeclaration;
 import org.jetbrains.kotlin.psi.JetParameter;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java
index c43e765c996..d54575fc81f 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java
@@ -23,7 +23,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java
index aea6631a5cf..3a005babc0b 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.TypeUtils;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 import java.util.List;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java
index 0e1e0c54ee9..f0070ea723f 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.JetExpression;
 import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java
index 1c3e5a77670..d7bf41c0adf 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java
@@ -23,7 +23,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java
index 5bff77f95b9..f1c16b27265 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetTypeElement;
 import org.jetbrains.kotlin.psi.JetTypeReference;
 import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java
index cd0f9989a88..38340fa5c4f 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetParameter;
 import org.jetbrains.kotlin.psi.JetTypeReference;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java
index 2dbea5bdefc..1b1627f88a7 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.BindingContextUtils;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
index 82b6ae9dcf4..b7a05722aee 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.types.ErrorUtils;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java
index e2366c40943..a99e236bfdf 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.JetParameter;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
index a94a664ba03..2d6a0250032 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetPostfixExpression;
 import org.jetbrains.kotlin.psi.JetPsiFactory;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java
index 2ee3ca3a613..d0ce7ff51e0 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.lexer.JetTokens.ANNOTATION_KEYWORD;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java
index fd745fc6e0f..995c5352fa4 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.JetCallableDeclaration;
 import org.jetbrains.kotlin.psi.JetDeclaration;
 import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 import java.util.*;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
index 7ee1ac530ed..77cb7ecef28 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1;
 import org.jetbrains.kotlin.diagnostics.Errors;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java
index 18101e1741b..25c3a4baee8 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetPsiUtil;
 import org.jetbrains.kotlin.psi.JetWhenEntry;
 import org.jetbrains.kotlin.psi.JetWhenExpression;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java
index cfc8f7e7e52..d4c15d55470 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetExpression;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetFunction;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class RemoveFunctionBodyFix extends JetIntentionAction<JetFunction> {
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java
index 8acffa7d614..468bda63526 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration;
 import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureData;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java
index 79396d4874f..577aff435eb 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.types.Variance;
 import org.jetbrains.kotlin.lexer.JetKeywordToken;
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class RemoveModifierFix extends JetIntentionAction<JetModifierListOwner> {
     private final JetModifierKeywordToken modifier;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java
index d664328459e..25ace4ff2e0 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetNullableType;
 import org.jetbrains.kotlin.psi.JetTypeElement;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class RemoveNullableFix extends JetIntentionAction<JetNullableType> {
     public enum NullableKind {
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java
index 75cf16a1e08..56e56a48f19 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction;
 
 public class RemovePartsFromPropertyFix extends JetIntentionAction<JetProperty> {
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java
index a4bfa84b502..1e1bae4bec2 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java
index 6f3abcb6898..c6ae8159f03 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression;
 import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS;
 import org.jetbrains.kotlin.psi.JetExpression;
 import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> extends JetIntentionAction<T> {
     private final String message;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java
index da31778bc7c..fb1ff857bfd 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.JetDelegationSpecifier;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class RemoveSupertypeFix extends JetIntentionAction<JetDelegationSpecifier> {
     private final JetDelegationSpecifier superClass;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java
index 23fe8ddbe51..708ddabe232 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetParameter;
 import org.jetbrains.kotlin.psi.JetPsiUtil;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 public class RemoveValVarFromParameterFix extends JetIntentionAction<JetParameter> {
     private final String varOrVal;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java
index f27407c5de7..38f4d2f747d 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetParameter;
 import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 public class RenameParameterToMatchOverriddenMethodFix extends JetIntentionAction<JetParameter>{
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java
index c9453db93ea..c2bef632202 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java
@@ -25,7 +25,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java
index 587bee3fc76..2863a0e8097 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression;
 import org.jetbrains.kotlin.psi.JetExpression;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetQualifiedExpression;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java
index 16bb2c60556..f19050a5f28 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java
@@ -22,7 +22,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java
index 29fc796ad5f..43d0917edf6 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java
@@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 
 import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.addTypeAnnotation;
 import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.getTypeForDeclaration;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt
index f3c5db11268..c74fe36a6af 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.quickfix.createFromUsage
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.jet.plugin.quickfix.JetIntentionAction
 
 public abstract class CreateFromUsageFixBase(element: PsiElement) : JetIntentionAction<PsiElement>(element) {
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt
index 1dd10dff6ee..ba852d813f5 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt
@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass
 
 import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
 import org.jetbrains.kotlin.psi.JetElement
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.psi.JetFile
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt
index 17e092c25a3..1fa756cdcb0 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt
@@ -26,7 +26,7 @@ import com.intellij.codeInsight.intention.IntentionAction
 import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix
 import org.jetbrains.jet.plugin.quickfix.DelegatingIntentionAction
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import com.intellij.psi.PsiPackage
 import org.jetbrains.jet.plugin.refactoring.canRefactor
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt
index 2f0f6350a6a..b673e9c5bc8 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt
@@ -3,7 +3,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction
 import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
 import org.jetbrains.kotlin.psi.JetFile
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.command.CommandProcessor
 import org.jetbrains.kotlin.resolve.DescriptorUtils
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
index baa9214c42e..2c87b469b30 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
@@ -1,7 +1,7 @@
 package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable
 
 import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.psi.JetFile
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt
index 92b3a09fa5a..2b45b016963 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt
@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable
 
 import org.jetbrains.kotlin.psi.JetElement
 import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.psi.JetFile
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
index 63b0d7e8c98..e67adc82633 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
@@ -48,7 +48,7 @@ import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt
index 5716962ddaa..772bd31ddb8 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt
@@ -25,7 +25,7 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import java.util.*
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java
index efb5f20a76f..c63dfcd1d16 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.psi.JetClassOrObject;
 import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.kotlin.asJava.KotlinLightClass;
 import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration;
 import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java
index 4c8703452a3..c7e77e68c24 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java
@@ -41,7 +41,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction;
 import org.jetbrains.kotlin.psi.JetProperty;
 import org.jetbrains.kotlin.psi.JetPsiUtil;
 import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
 import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
index 7360f2c68c1..6db00c60a52 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.kotlin.plugin.JetBundle
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil
 import org.jetbrains.jet.plugin.references.JetReference
 import java.util.*