diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/actions/internal/KotlinInternalMode.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt
similarity index 92%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/actions/internal/KotlinInternalMode.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt
index dd0ec75e6d4..6866ad5cc5e 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/actions/internal/KotlinInternalMode.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions.internal
+package org.jetbrains.kotlin.idea.actions.internal
 
 import com.intellij.ide.util.PropertiesComponent
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java
index 0a2c1bc861f..d3ce699ed62 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java
@@ -38,10 +38,6 @@ import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.plugin.project.ResolveSessionForBodies;
-import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelClassByPackageIndex;
-import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil;
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.asJava.*;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
@@ -49,6 +45,10 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.PackageViewDescriptor;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
 import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper;
+import org.jetbrains.kotlin.idea.project.ResolveSessionForBodies;
+import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.JetTopLevelClassByPackageIndex;
+import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
 import org.jetbrains.kotlin.name.FqName;
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt
index 916cdc3fc08..1d5547bb45c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.idea.caches.resolve
 
-import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModule
 import com.intellij.openapi.project.Project
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt
index ff567c31fcc..4df516da13e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.caches.resolve
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.module.ModuleManager
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil
 import kotlin.platform.platformStatic
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.CachedValueProvider
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
index db6fb9f6a7d..34e00592a6b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
@@ -26,11 +26,11 @@ import com.intellij.psi.util.PsiModificationTracker
 import com.intellij.psi.util.CachedValueProvider
 import org.jetbrains.kotlin.resolve.BindingContext
 import com.intellij.openapi.components.ServiceManager
-import org.jetbrains.jet.plugin.project.AnalyzerFacadeProvider
-import org.jetbrains.jet.plugin.project.TargetPlatform
-import org.jetbrains.jet.plugin.project.TargetPlatform.*
-import org.jetbrains.jet.plugin.project.ResolveSessionForBodies
-import org.jetbrains.jet.plugin.project.TargetPlatformDetector
+import org.jetbrains.kotlin.idea.project.AnalyzerFacadeProvider
+import org.jetbrains.kotlin.idea.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform.*
+import org.jetbrains.kotlin.idea.project.ResolveSessionForBodies
+import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
 import org.jetbrains.kotlin.psi.JetCodeFragment
 import org.jetbrains.kotlin.utils.keysToMap
 import com.intellij.openapi.roots.ProjectRootModificationTracker
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
index 05c9becb6eb..2dff5f1d02b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
@@ -33,8 +33,8 @@ import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.psi.util.CachedValueProvider
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.resolve.LibrarySourceHacks
-import org.jetbrains.jet.plugin.project.TargetPlatform
-import org.jetbrains.jet.plugin.project.ResolveSessionForBodies
+import org.jetbrains.kotlin.idea.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.ResolveSessionForBodies
 import java.util.HashMap
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.resolve.BindingContext
@@ -61,7 +61,7 @@ import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.resolve.scopes.ChainedScope
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
 import org.jetbrains.kotlin.di.InjectorForLazyBodyResolve
-import org.jetbrains.jet.plugin.project.TargetPlatformDetector
+import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
 import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
 import org.jetbrains.kotlin.resolve.scopes.JetScope
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
index 93c6f933e86..ff02cad63ff 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
@@ -21,7 +21,7 @@ import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.module.ModuleManager
 import org.jetbrains.kotlin.utils.keysToMap
 import com.intellij.openapi.roots.LibraryOrderEntry
-import org.jetbrains.jet.plugin.project.ResolveSessionForBodies
+import org.jetbrains.kotlin.idea.project.ResolveSessionForBodies
 import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
 import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
 import com.intellij.openapi.roots.JdkOrderEntry
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java
index e901dfe170d..ce7a3e7182a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java
@@ -21,9 +21,9 @@ import com.intellij.lang.annotation.Annotator;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode;
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.checkers.DebugInfoUtil;
+import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.psi.JetCodeFragment;
 import org.jetbrains.kotlin.psi.JetFile;
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java
index 927b6490374..659fd9c3a95 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java
@@ -22,11 +22,11 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
-import org.jetbrains.jet.plugin.project.TargetPlatformDetector;
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.asJava.AsJavaPackage;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
+import org.jetbrains.kotlin.idea.project.TargetPlatformDetector;
 import org.jetbrains.kotlin.psi.JetDeclaration;
 import org.jetbrains.kotlin.psi.JetElement;
 import org.jetbrains.kotlin.psi.JetFile;
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
index 8b75ee5cfab..73b159a3969 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.psi.JetReferenceExpression
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil
-import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode
+import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
 import org.jetbrains.kotlin.idea.caches.resolve.*
 import org.jetbrains.kotlin.idea.quickfix.QuickFixes
 import kotlin.platform.platformStatic
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/AnalyzerFacadeProvider.kt
similarity index 94%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/AnalyzerFacadeProvider.kt
index 1c68e3abb9c..27c31272213 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/AnalyzerFacadeProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.project
+package org.jetbrains.kotlin.idea.project
 
 import org.jetbrains.kotlin.analyzer.AnalyzerFacade
 import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java
similarity index 98%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java
index d4557a259bd..5aa047b14fb 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.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.project;
+package org.jetbrains.kotlin.idea.project;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
@@ -35,9 +35,9 @@ import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.framework.JsLibraryStdDetectionUtil;
 import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil;
 import org.jetbrains.kotlin.idea.JetFileType;
+import org.jetbrains.kotlin.idea.framework.JsLibraryStdDetectionUtil;
 import org.jetbrains.kotlin.psi.JetFile;
 
 import java.util.HashSet;
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java
similarity index 98%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java
index ab611d973bb..a86c807fcb6 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.project;
+package org.jetbrains.kotlin.idea.project;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.util.CachedValue;
@@ -24,13 +24,13 @@ import com.intellij.psi.util.PsiModificationTracker;
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingFunctionShortNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingPropertyShortNameIndex;
 import org.jetbrains.kotlin.psi.JetElement;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.lazy.*;
-import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingFunctionShortNameIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingPropertyShortNameIndex;
 import org.jetbrains.kotlin.storage.LazyResolveStorageManager;
 import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull;
 
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveSessionForBodies.java
similarity index 98%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveSessionForBodies.java
index 697ae4d3590..d4746986309 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveSessionForBodies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.project;
+package org.jetbrains.kotlin.idea.project;
 
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.ReadOnly;
 import org.jetbrains.kotlin.descriptors.*;
+import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.BindingContextUtils;
@@ -29,7 +30,6 @@ import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer;
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession;
 import org.jetbrains.kotlin.resolve.lazy.ScopeProvider;
 import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor;
-import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.storage.ExceptionTracker;
 import org.jetbrains.kotlin.storage.StorageManager;
 
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java
similarity index 94%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java
index f3ebe5ef3ef..86a32d10069 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.project;
+package org.jetbrains.kotlin.idea.project;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
+import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider;
 import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider;
+import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
 import org.jetbrains.kotlin.types.DynamicTypesAllowed;
 import org.jetbrains.kotlin.types.DynamicTypesSettings;
-import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider;
 
 public interface TargetPlatform {
     @NotNull
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformDetector.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java
similarity index 95%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformDetector.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java
index ba4882ef104..9d64749e8d3 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformDetector.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.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.project;
+package org.jetbrains.kotlin.idea.project;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformImpl.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformImpl.java
similarity index 95%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformImpl.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformImpl.java
index 870042f2231..e653fc1c691 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformImpl.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformImpl.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.project;
+package org.jetbrains.kotlin.idea.project;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 9bf76506d79..35d750421a8 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -19,7 +19,7 @@
 
   <project-components>
     <component>
-      <implementation-class>org.jetbrains.jet.plugin.compiler.JetCompilerManager</implementation-class>
+      <implementation-class>org.jetbrains.kotlin.idea.compiler.JetCompilerManager</implementation-class>
     </component>
     <component>
       <implementation-class>org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver</implementation-class>
@@ -50,16 +50,16 @@
 
   <module-components>
     <component>
-      <implementation-class>org.jetbrains.jet.plugin.project.K2JSModuleComponent</implementation-class>
+      <implementation-class>org.jetbrains.kotlin.idea.project.K2JSModuleComponent</implementation-class>
     </component>
   </module-components>
 
   <actions>
-    <action id="Kotlin.NewFile" class="org.jetbrains.jet.plugin.actions.NewKotlinFileAction">
+    <action id="Kotlin.NewFile" class="org.jetbrains.kotlin.idea.actions.NewKotlinFileAction">
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFromTemplate"/>
     </action>
 
-    <action id="ShowKotlinExpressionType" class="org.jetbrains.jet.plugin.actions.ShowExpressionTypeAction"
+    <action id="ShowKotlinExpressionType" class="org.jetbrains.kotlin.idea.actions.ShowExpressionTypeAction"
             text="Show Expression Type">
       <keyboard-shortcut keymap="$default" first-keystroke="alt EQUALS"/>
 
@@ -70,7 +70,7 @@
       <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="alt EQUALS" remove="true"/>
       <add-to-group group-id="CodeEditorViewGroup" anchor="last"/>
     </action>
-    <action id="ConvertJavaToKotlin" class="org.jetbrains.jet.plugin.actions.JavaToKotlinAction"
+    <action id="ConvertJavaToKotlin" class="org.jetbrains.kotlin.idea.actions.JavaToKotlinAction"
             text="Convert Java File to Kotlin File">
       <keyboard-shortcut keymap="$default" first-keystroke="control alt shift J"/>
       <add-to-group group-id="CodeMenu" anchor="last"/>
@@ -82,16 +82,16 @@
     </group>
 
     <group id="KotlinToolsGroup" popup="true" text="Kotlin" icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
-           class="org.jetbrains.jet.plugin.actions.KotlinActionGroup">
+           class="org.jetbrains.kotlin.idea.actions.KotlinActionGroup">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </group>
 
-    <action id="ConfigureKotlinInProject" class="org.jetbrains.jet.plugin.actions.ConfigureKotlinInProjectAction"
+    <action id="ConfigureKotlinInProject" class="org.jetbrains.kotlin.idea.actions.ConfigureKotlinInProjectAction"
             text="Configure Kotlin in Project">
       <add-to-group group-id="KotlinToolsGroup"/>
     </action>
 
-    <action id="ConfigureKotlinJsInProject" class="org.jetbrains.jet.plugin.actions.ConfigureKotlinJsInProjectAction"
+    <action id="ConfigureKotlinJsInProject" class="org.jetbrains.kotlin.idea.actions.ConfigureKotlinJsInProjectAction"
             text="Configure Kotlin (JavaScript) in Project">
       <add-to-group group-id="KotlinToolsGroup"/>
     </action>
@@ -101,23 +101,23 @@
       <add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="ExtractMethod"/>
     </action>
 
-    <action id="CopyAsDiagnosticTest" class="org.jetbrains.jet.plugin.actions.internal.CopyAsDiagnosticTestAction"
+    <action id="CopyAsDiagnosticTest" class="org.jetbrains.kotlin.idea.actions.internal.CopyAsDiagnosticTestAction"
             text="Copy Current File As Diagnostic Test">
       <keyboard-shortcut keymap="$default" first-keystroke="control alt shift T"/>
       <add-to-group group-id="KotlinToolsGroup" anchor="last"/>
     </action>
 
-    <action id="CheckPartialBodyResolve" class="org.jetbrains.jet.plugin.actions.internal.CheckPartialBodyResolveAction"
+    <action id="CheckPartialBodyResolve" class="org.jetbrains.kotlin.idea.actions.internal.CheckPartialBodyResolveAction"
           text="Check Partial Body Resolve">
       <add-to-group group-id="KotlinToolsGroup" anchor="last"/>
     </action>
 
-    <action id="FindImplicitNothingAction" class="org.jetbrains.jet.plugin.actions.internal.FindImplicitNothingAction"
+    <action id="FindImplicitNothingAction" class="org.jetbrains.kotlin.idea.actions.internal.FindImplicitNothingAction"
           text="Find Implicit Nothing Calls">
       <add-to-group group-id="KotlinToolsGroup" anchor="last"/>
     </action>
 
-    <action id="KotlinInternalMode" class="org.jetbrains.jet.plugin.actions.internal.KotlinInternalModeToggleAction">
+    <action id="KotlinInternalMode" class="org.jetbrains.kotlin.idea.actions.internal.KotlinInternalModeToggleAction">
       <add-to-group group-id="KotlinToolsGroup" anchor="last"/>
     </action>
 
@@ -169,19 +169,19 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.configuration.ModuleTypeCacheManager"
                     serviceImplementation="org.jetbrains.kotlin.idea.configuration.ModuleTypeCacheManager"/>
 
-    <projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerArgumentsHolder"
-                    serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerArgumentsHolder"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder"
+                    serviceImplementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder"/>
 
-    <projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder"
-                    serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder"
+                    serviceImplementation="org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder"/>
 
-    <projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JsCompilerArgumentsHolder"
-                    serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JsCompilerArgumentsHolder"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JsCompilerArgumentsHolder"
+                    serviceImplementation="org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JsCompilerArgumentsHolder"/>
 
-    <projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerSettings"
-                    serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerSettings"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettings"
+                    serviceImplementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettings"/>
 
-    <projectService serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerWorkspaceSettings"/>
+    <projectService serviceImplementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerWorkspaceSettings"/>
 
     <projectService serviceInterface="org.jetbrains.kotlin.asJava.KotlinLightClassForPackage$FileStubCache"
                     serviceImplementation="org.jetbrains.kotlin.asJava.KotlinLightClassForPackage$FileStubCache"/>
@@ -213,7 +213,7 @@
 
     <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-plugin.jar"/>
     <compiler.task execute="BEFORE" implementation="org.jetbrains.jet.plugin.internal.makeBackup.MakeBackupCompileTask"/>
-    <buildProcess.parametersProvider implementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinBuildProcessParametersProvider"/>
+    <buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
 
     <lang.syntaxHighlighterFactory key="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.JetSyntaxHighlighterFactory"/>
     <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.plugin.JetPairMatcher"/>
@@ -223,7 +223,7 @@
     <structureViewBuilder order="first" key="CLASS" factoryClass="org.jetbrains.jet.plugin.structureView.JetClsStructureViewBuilderProvider"/>
 
     <lang.foldingBuilder language="jet" implementationClass="org.jetbrains.jet.plugin.JetFoldingBuilder"/>
-    <lang.formatter language="jet" implementationClass="org.jetbrains.jet.plugin.formatter.JetFormattingModelBuilder"/>
+    <lang.formatter language="jet" implementationClass="org.jetbrains.kotlin.idea.formatter.JetFormattingModelBuilder"/>
     <lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.findUsages.JetFindUsagesProvider"/>
     <lang.elementManipulator forClass="org.jetbrains.kotlin.psi.JetStringTemplateExpression"
                              implementationClass="org.jetbrains.kotlin.psi.psiUtil.JetStringTemplateExpressionManipulator"/>
@@ -251,21 +251,21 @@
     <refactoring.copyHandler implementation="org.jetbrains.kotlin.idea.refactoring.copy.JetCopyClassHandler"/>
     <refactoring.changeSignatureUsageProcessor implementation="org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureUsageProcessor"/>
     <inlineActionHandler implementation="org.jetbrains.kotlin.idea.refactoring.inline.KotlinInlineValHandler"/>
-    <treeStructureProvider implementation="org.jetbrains.jet.plugin.projectView.JetProjectViewProvider"/>
+    <treeStructureProvider implementation="org.jetbrains.kotlin.idea.projectView.JetProjectViewProvider"/>
 
     <colorSettingsPage implementation="org.jetbrains.kotlin.idea.highlighter.JetColorSettingsPage"/>
     <additionalTextAttributes scheme="Default" file="colorScheme/Default_Kotlin.xml"/>
     <additionalTextAttributes scheme="Darcula" file="colorScheme/Darcula_Kotlin.xml"/>
 
-    <codeStyleSettingsProvider implementation="org.jetbrains.jet.plugin.formatter.JetCodeStyleSettingsProvider"/>
-    <langCodeStyleSettingsProvider implementation="org.jetbrains.jet.plugin.formatter.JetLanguageCodeStyleSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.JetCodeStyleSettingsProvider"/>
+    <langCodeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.JetLanguageCodeStyleSettingsProvider"/>
 
-    <projectConfigurable instance="org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerConfigurableTab"
+    <projectConfigurable instance="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerConfigurableTab"
                          id="project.kotlinCompiler"
                          displayName="Kotlin Compiler"
                          parentId="project.propCompiler"/>
 
-    <qualifiedNameProvider implementation="org.jetbrains.jet.plugin.actions.KotlinQualifiedNameProvider"/>
+    <qualifiedNameProvider implementation="org.jetbrains.kotlin.idea.actions.KotlinQualifiedNameProvider"/>
 
     <codeInsight.parameterInfo language="jet" implementationClass="org.jetbrains.jet.plugin.parameterInfo.JetFunctionParameterInfoHandler"/>
 
diff --git a/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/MakeBackupCompileTask.kt b/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/MakeBackupCompileTask.kt
index 0ba6dc52cdd..0c88f3a1167 100644
--- a/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/MakeBackupCompileTask.kt
+++ b/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/MakeBackupCompileTask.kt
@@ -24,7 +24,7 @@ import com.intellij.openapi.util.Key
 import com.intellij.compiler.CompilerWorkspaceConfiguration
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.components.ServiceManager
-import org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerWorkspaceSettings
+import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerWorkspaceSettings
 
 val random = Random()
 
diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java
index 91da0a0cd01..a70631ac396 100644
--- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java
@@ -48,7 +48,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaFieldImpl;
 import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl;
 import org.jetbrains.jet.plugin.JetIcons;
 import org.jetbrains.kotlin.idea.caches.resolve.JavaResolveExtension;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 import org.jetbrains.jet.plugin.util.attachment.AttachmentPackage;
 
 import java.awt.event.MouseEvent;
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java
index a9acd37f35a..730f1495f71 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.projectView;
+package org.jetbrains.kotlin.idea.projectView;
 
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.projectView.ViewSettings;
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.psi.JetPsiUtil;
 
 import java.util.Collection;
 
-import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.canRepresentPsiElement;
-import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.getClassOrObjectChildren;
+import static org.jetbrains.kotlin.idea.projectView.JetProjectViewUtil.canRepresentPsiElement;
+import static org.jetbrains.kotlin.idea.projectView.JetProjectViewUtil.getClassOrObjectChildren;
 
 public class JetClassObjectTreeNode extends AbstractPsiBasedNode<JetClassObject> {
     protected JetClassObjectTreeNode(Project project, JetClassObject classObject, ViewSettings viewSettings) {
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
index 51a7cfb407c..b480f6c82fb 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.projectView;
+package org.jetbrains.kotlin.idea.projectView;
 
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.projectView.ProjectView;
@@ -30,8 +30,8 @@ import org.jetbrains.jet.plugin.JetIconProvider;
 
 import java.util.Collection;
 
-import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.canRepresentPsiElement;
-import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.getClassOrObjectChildren;
+import static org.jetbrains.kotlin.idea.projectView.JetProjectViewUtil.canRepresentPsiElement;
+import static org.jetbrains.kotlin.idea.projectView.JetProjectViewUtil.getClassOrObjectChildren;
 
 public class JetClassOrObjectTreeNode extends AbstractPsiBasedNode<JetClassOrObject> {
     protected JetClassOrObjectTreeNode(Project project, JetClassOrObject jetClassOrObject, ViewSettings viewSettings) {
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
index 4b9882b607c..5cfccfa90e7 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.projectView;
+package org.jetbrains.kotlin.idea.projectView;
 
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.projectView.ViewSettings;
@@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings;
+import org.jetbrains.kotlin.idea.formatter.JetCodeStyleSettings;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java
index d74570d3346..e0f76aa62c9 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.projectView;
+package org.jetbrains.kotlin.idea.projectView;
 
 import com.intellij.ide.projectView.ViewSettings;
 import com.intellij.ide.projectView.impl.nodes.PsiFileNode;
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java
index 5b5ee1c2e50..4abf3305c76 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.projectView;
+package org.jetbrains.kotlin.idea.projectView;
 
 import com.intellij.ide.projectView.SelectableTreeStructureProvider;
 import com.intellij.ide.projectView.ViewSettings;
diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java
index 85d0a848c50..46f41f0556e 100644
--- a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.projectView;
+package org.jetbrains.kotlin.idea.projectView;
 
 import com.intellij.ide.projectView.ViewSettings;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java
index 151f46d22c6..027fdac235a 100644
--- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java
+++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.idea.MainFunctionDetector;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinInProjectAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.java
similarity index 96%
rename from idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinInProjectAction.java
rename to idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.java
index eca90aa0ec7..7df82368f63 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinInProjectAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions;
+package org.jetbrains.kotlin.idea.actions;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinJsInProjectAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinJsInProjectAction.java
similarity index 95%
rename from idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinJsInProjectAction.java
rename to idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinJsInProjectAction.java
index d4629d7015e..5ff969a502c 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinJsInProjectAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinJsInProjectAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions;
+package org.jetbrains.kotlin.idea.actions;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt
rename to idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt
index 9e616bca55d..c853b583455 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions
+package org.jetbrains.kotlin.idea.actions
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddFunctionToClassifierAction.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
rename to idea/src/org/jetbrains/kotlin/idea/actions/JetAddFunctionToClassifierAction.java
index 733bb2a2efa..5bccf74904a 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddFunctionToClassifierAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions;
+package org.jetbrains.kotlin.idea.actions;
 
 import com.intellij.codeInsight.hint.QuestionAction;
 import com.intellij.openapi.application.ApplicationManager;
@@ -29,14 +29,14 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil;
-import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassKind;
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.Modality;
 import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil;
+import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.psi.JetClass;
 import org.jetbrains.kotlin.psi.JetClassBody;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java
rename to idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.java
index 1c53d184f09..8625e279f4b 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.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.actions;
+package org.jetbrains.kotlin.idea.actions;
 
 import com.google.common.collect.Lists;
 import com.intellij.codeInsight.daemon.QuickFixBundle;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/KotlinActionGroup.java b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinActionGroup.java
similarity index 93%
rename from idea/src/org/jetbrains/jet/plugin/actions/KotlinActionGroup.java
rename to idea/src/org/jetbrains/kotlin/idea/actions/KotlinActionGroup.java
index 45b7bd82293..b48f822c9ad 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/KotlinActionGroup.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinActionGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.jet.plugin.actions;
+package org.jetbrains.kotlin.idea.actions;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinQualifiedNameProvider.kt
similarity index 95%
rename from idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt
rename to idea/src/org/jetbrains/kotlin/idea/actions/KotlinQualifiedNameProvider.kt
index 7cc54ce6a18..c5c8e644a2f 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinQualifiedNameProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions
+package org.jetbrains.kotlin.idea.actions
 
 import com.intellij.ide.actions.QualifiedNameProvider
 import com.intellij.psi.PsiElement
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
rename to idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
index 869edda72c5..a5a19cd5572 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.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.actions;
+package org.jetbrains.kotlin.idea.actions;
 
 import com.intellij.ide.IdeView;
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
@@ -31,9 +31,9 @@ import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.jet.plugin.JetIcons;
-import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils;
 import org.jetbrains.kotlin.idea.JetBundle;
 import org.jetbrains.kotlin.idea.JetFileType;
+import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils;
 
 import java.util.Map;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/ShowExpressionTypeAction.java
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java
rename to idea/src/org/jetbrains/kotlin/idea/actions/ShowExpressionTypeAction.java
index 268a917579b..5078ba265be 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/ShowExpressionTypeAction.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.actions;
+package org.jetbrains.kotlin.idea.actions;
 
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.hint.HintManager;
@@ -25,8 +25,8 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
-import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.idea.JetLanguage;
+import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.psi.JetExpression;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt
rename to idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt
index 7fcdd469330..af5e94e4bfc 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckPartialBodyResolveAction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions.internal
+package org.jetbrains.kotlin.idea.actions.internal
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -91,7 +91,7 @@ public class CheckPartialBodyResolveAction : AnAction() {
                     val diffPanel = DiffManager.getInstance().createDiffPanel(diffBuilder.getWindow(), project, diffBuilder, null) as DiffPanelImpl
                     diffPanel.getOptions().setShowSourcePolicy(DiffPanelOptions.ShowSourcePolicy.DONT_SHOW)
                     diffBuilder.setCenterPanel(diffPanel.getComponent())
-                    diffBuilder.setDimensionServiceKey("org.jetbrains.jet.plugin.actions.internal.CheckPartialBodyResolveAction.Diff")
+                    diffBuilder.setDimensionServiceKey("org.jetbrains.kotlin.idea.actions.internal.CheckPartialBodyResolveAction.Diff")
                     diffPanel.setDiffRequest(request)
                     diffBuilder.addOkAction().setText("Close")
                     diffBuilder.setTitle(title)
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CopyAsDiagnosticTestAction.java
similarity index 90%
rename from idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java
rename to idea/src/org/jetbrains/kotlin/idea/actions/internal/CopyAsDiagnosticTestAction.java
index 084f7a2eec5..1e7551d52d6 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CopyAsDiagnosticTestAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions.internal;
+package org.jetbrains.kotlin.idea.actions.internal;
 
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.kotlin.checkers.CheckerTestUtil;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
+import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
 
 import java.awt.*;
 import java.awt.datatransfer.Clipboard;
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt
rename to idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt
index e82330fdc88..7daa38c6fa6 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions.internal
+package org.jetbrains.kotlin.idea.actions.internal
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -45,7 +45,7 @@ import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.diagnostic.Logger
 
 public class FindImplicitNothingAction : AnAction() {
-    private val LOG = Logger.getInstance("#org.jetbrains.jet.plugin.actions.internal.FindImplicitNothingAction")
+    private val LOG = Logger.getInstance("#org.jetbrains.kotlin.idea.actions.internal.FindImplicitNothingAction")
 
     override fun actionPerformed(e: AnActionEvent) {
         val selectedFiles = selectedKotlinFiles(e).toList()
diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/KotlinInternalModeToggleAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalModeToggleAction.kt
similarity index 92%
rename from idea/src/org/jetbrains/jet/plugin/actions/internal/KotlinInternalModeToggleAction.kt
rename to idea/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalModeToggleAction.kt
index 6ed23261e39..bc982e45112 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/internal/KotlinInternalModeToggleAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalModeToggleAction.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions.internal
+package org.jetbrains.kotlin.idea.actions.internal
 
 import com.intellij.openapi.actionSystem.ToggleAction
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -30,4 +30,4 @@ public class KotlinInternalModeToggleAction: ToggleAction("Kotlin Internal Mode"
 
         DaemonCodeAnalyzer.getInstance(e!!.getProject())!!.settingsChanged()
     }
-}
\ No newline at end of file
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java
rename to idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java
index f39b2bf4392..8ff1a4239b2 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.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.compiler;
+package org.jetbrains.kotlin.idea.compiler;
 
 import com.intellij.compiler.CompilerWorkspaceConfiguration;
 import com.intellij.diagnostic.PluginException;
@@ -30,8 +30,8 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerWorkspaceSettings;
 import org.jetbrains.kotlin.idea.JetFileType;
+import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerWorkspaceSettings;
 import org.jetbrains.kotlin.js.JavaScript;
 
 import java.io.PrintStream;
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/BaseKotlinCompilerSettings.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.java
similarity index 95%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/BaseKotlinCompilerSettings.java
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.java
index 5c11db9681c..b8a4b02c37e 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/BaseKotlinCompilerSettings.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.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.compiler.configuration;
+package org.jetbrains.kotlin.idea.compiler.configuration;
 
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters;
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java
similarity index 94%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java
index ab5c877a1ef..937cbfde0e2 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.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.compiler.configuration;
+package org.jetbrains.kotlin.idea.compiler.configuration;
 
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java
similarity index 94%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java
index a6bbabb0842..28fbcfad89d 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.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.compiler.configuration;
+package org.jetbrains.kotlin.idea.compiler.configuration;
 
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinBuildProcessParametersProvider.kt b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
similarity index 87%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinBuildProcessParametersProvider.kt
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
index 98da95c8d09..9d775f8f317 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinBuildProcessParametersProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.compiler.configuration
+package org.jetbrains.kotlin.idea.compiler.configuration
 
 import com.intellij.compiler.server.BuildProcessParametersProvider
-import com.intellij.openapi.components.ServiceManager
 
 public class KotlinBuildProcessParametersProvider(private val compilerWorkspaceSettings: KotlinCompilerWorkspaceSettings): BuildProcessParametersProvider() {
     override fun getVMArguments(): MutableList<String> {
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java
similarity index 94%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java
index 16b2e9a8de1..78bd24cd0af 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCommonCompilerArgumentsHolder.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.compiler.configuration;
+package org.jetbrains.kotlin.idea.compiler.configuration;
 
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
index a0f2e72e776..0509758e35f 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerConfigurableTab">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerConfigurableTab">
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
index 17503ba08f6..ac04bc69d66 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.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.compiler.configuration;
+package org.jetbrains.kotlin.idea.compiler.configuration;
 
 import com.intellij.compiler.options.ComparingUtils;
 import com.intellij.openapi.components.ServiceManager;
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.java
similarity index 94%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.java
index 52e71abb86d..97244ef9b5c 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerSettings.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.compiler.configuration;
+package org.jetbrains.kotlin.idea.compiler.configuration;
 
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerWorkspaceSettings.kt b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
similarity index 89%
rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
rename to idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
index a08d80ce29b..7572e72b883 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.compiler.configuration
+package org.jetbrains.kotlin.idea.compiler.configuration
 
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.util.xmlb.XmlSerializerUtil
-import com.intellij.compiler.CompilerWorkspaceConfiguration
 import com.intellij.openapi.components.StoragePathMacros
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
@@ -39,4 +38,4 @@ public class KotlinCompilerWorkspaceSettings() : PersistentStateComponent<Kotlin
     override fun loadState(state: KotlinCompilerWorkspaceSettings?) {
         XmlSerializerUtil.copyBean(state!!, this)
     }
-}
\ No newline at end of file
+}
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt
index 6ab4209950f..e9333dbba53 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.asJava.KotlinLightClass
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil
 import org.jetbrains.kotlin.idea.caches.KotlinIndicesHelper
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import com.intellij.psi.search.GlobalSearchScope
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt
index f3456629d33..1f9cd88fab5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetImportDirective
 import com.intellij.codeInsight.AutoPopupController
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 import com.intellij.openapi.project.Project
-import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.formatter.JetCodeStyleSettings
 import com.intellij.openapi.application.ApplicationManager
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.JetQualifiedExpression
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
index 71638ea0a6b..43300e5a2a9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 
 public class KotlinJavaMavenConfigurator extends KotlinMavenConfigurator {
     private static final String NAME = "maven";
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java
index df046ad1e65..338befed9df 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java
@@ -24,10 +24,10 @@ import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
 import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil;
 import org.jetbrains.kotlin.idea.framework.JavaRuntimeLibraryDescription;
 import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 import org.jetbrains.kotlin.utils.PathUtil;
 
 import java.io.File;
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java
index a790a8ead67..90f152876b8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 
 public class KotlinJavascriptMavenConfigurator extends KotlinMavenConfigurator {
     private static final String NAME = "js maven";
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java
index 454a0d74c5a..c9a55fb6d1b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.configuration;
 
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
 import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 import org.jetbrains.kotlin.js.JavaScript;
 import org.jetbrains.kotlin.utils.PathUtil;
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
index 3f95986b078..931a3cecf6e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
@@ -33,8 +33,8 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
 import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory;
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
index 0b2abd2662a..8092c2bbe19 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
@@ -35,9 +35,9 @@ import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.plugin.JetPluginUtil;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
 import org.jetbrains.kotlin.idea.framework.ui.CreateLibraryDialogWithModules;
 import org.jetbrains.kotlin.idea.framework.ui.FileUIUtils;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java
index c9e70fa5730..8bdc23d99ef 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java
@@ -34,11 +34,11 @@ import com.intellij.openapi.vfs.newvfs.events.*;
 import com.intellij.util.Alarm;
 import com.intellij.util.messages.MessageBusConnection;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
 import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil;
 import org.jetbrains.kotlin.idea.configuration.AbsentSdkAnnotationsNotificationManager;
 import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils;
 import org.jetbrains.kotlin.idea.configuration.ui.notifications.NotificationsPackage;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinJavaScriptBreakpointAware.java b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinJavaScriptBreakpointAware.java
index 8e33f01b007..cc1de85c54d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinJavaScriptBreakpointAware.java
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinJavaScriptBreakpointAware.java
@@ -21,8 +21,8 @@ import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.PairProcessor;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
 import org.jetbrains.kotlin.idea.JetFileType;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 
 public class KotlinJavaScriptBreakpointAware implements PairProcessor<VirtualFile, Project> {
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
index c4223db7e83..421aeecbb4e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments
 import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionGeneratorOptions
 import org.jetbrains.kotlin.idea.refactoring.extractFunction.generateDeclaration
 import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange
-import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode
+import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
 import org.jetbrains.kotlin.psi.psiUtil.replaced
 
 fun getFunctionForExtractedFragment(
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java b/idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java
index 535698fde66..6d9a544fd1c 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter;
+package org.jetbrains.kotlin.idea.formatter;
 
 import com.intellij.formatting.*;
 import com.intellij.formatting.alignment.AlignmentStrategy;
@@ -39,8 +39,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.plugin.formatter.NodeIndentStrategy.strategy;
 import static org.jetbrains.kotlin.JetNodeTypes.*;
+import static org.jetbrains.kotlin.idea.formatter.NodeIndentStrategy.strategy;
 import static org.jetbrains.kotlin.lexer.JetTokens.*;
 
 /**
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettings.java b/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettings.java
similarity index 95%
rename from idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettings.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettings.java
index 53e691a2635..987db6d99cf 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettings.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettings.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.formatter;
+package org.jetbrains.kotlin.idea.formatter;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettingsProvider.java
similarity index 96%
rename from idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettingsProvider.java
index 9bf5bde5b26..49da79ea05b 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettingsProvider.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.formatter;
+package org.jetbrains.kotlin.idea.formatter;
 
 import com.intellij.application.options.CodeStyleAbstractConfigurable;
 import com.intellij.application.options.CodeStyleAbstractPanel;
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java
similarity index 95%
rename from idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java
index c00f101511d..c32e0c46bdf 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter;
+package org.jetbrains.kotlin.idea.formatter;
 
 import com.intellij.formatting.FormattingModel;
 import com.intellij.formatting.FormattingModelBuilder;
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/JetLanguageCodeStyleSettingsProvider.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/JetLanguageCodeStyleSettingsProvider.java
index e5b12063954..1154e559253 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/JetLanguageCodeStyleSettingsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter;
+package org.jetbrains.kotlin.idea.formatter;
 
 import com.intellij.application.options.IndentOptionsEditor;
 import com.intellij.application.options.SmartIndentOptionsEditor;
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt
rename to idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
index 9a438b54aaf..c7ade79b3b6 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter
+package org.jetbrains.kotlin.idea.formatter
 
 import com.intellij.formatting.*
 
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/NodeAlignmentStrategy.java b/idea/src/org/jetbrains/kotlin/idea/formatter/NodeAlignmentStrategy.java
similarity index 95%
rename from idea/src/org/jetbrains/jet/plugin/formatter/NodeAlignmentStrategy.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/NodeAlignmentStrategy.java
index d53a0115906..1135929520c 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/NodeAlignmentStrategy.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/NodeAlignmentStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter;
+package org.jetbrains.kotlin.idea.formatter;
 
 import com.intellij.formatting.Alignment;
 import com.intellij.formatting.alignment.AlignmentStrategy;
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/NodeIndentStrategy.java b/idea/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/formatter/NodeIndentStrategy.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java
index c0aa44d6e8f..b82c664ac1f 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/NodeIndentStrategy.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter;
+package org.jetbrains.kotlin.idea.formatter;
 
 import com.intellij.formatting.Indent;
 import com.intellij.lang.ASTNode;
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/SynteticKotlinBlock.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/SynteticKotlinBlock.kt
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/formatter/SynteticKotlinBlock.kt
rename to idea/src/org/jetbrains/kotlin/idea/formatter/SynteticKotlinBlock.kt
index 30a407727cf..9ebef4360f9 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/SynteticKotlinBlock.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/SynteticKotlinBlock.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter
+package org.jetbrains.kotlin.idea.formatter
 
 import com.intellij.formatting.Block
 import com.intellij.formatting.Alignment
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/WrappingStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt
similarity index 84%
rename from idea/src/org/jetbrains/jet/plugin/formatter/WrappingStrategy.kt
rename to idea/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt
index 6b3f3d0c639..00efe2df02d 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/WrappingStrategy.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter
+package org.jetbrains.kotlin.idea.formatter
 
 import com.intellij.formatting.Wrap
-import com.intellij.lang.ASTNode
 import com.intellij.psi.tree.IElementType
-import com.intellij.formatting.WrapType
 
 public trait WrappingStrategy {
     fun getWrap(childElementType: IElementType): Wrap?
@@ -27,4 +25,4 @@ public trait WrappingStrategy {
     object NoWrapping: WrappingStrategy {
         override fun getWrap(childElementType: IElementType): Wrap? = null
     }
-}
\ No newline at end of file
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
rename to idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index ffb77afce69..d674a026c9b 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.formatter
+package org.jetbrains.kotlin.idea.formatter
 
 import org.jetbrains.kotlin.JetNodeTypes.*
 import org.jetbrains.kotlin.lexer.JetTokens.*
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.JetLanguage
 import com.intellij.formatting.Spacing
 import com.intellij.lang.ASTNode
 import com.intellij.formatting.ASTBlock
-import org.jetbrains.jet.plugin.formatter.KotlinSpacingBuilder.CustomSpacingBuilder
+import org.jetbrains.kotlin.idea.formatter.KotlinSpacingBuilder.CustomSpacingBuilder
 import com.intellij.formatting.SpacingBuilder
 import com.intellij.formatting.SpacingBuilder.RuleBuilder
 import org.jetbrains.kotlin.lexer.JetTokens
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt
index c84762d167b..200155d2229 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt
@@ -20,7 +20,7 @@ import com.intellij.ide.util.projectWizard.JavaModuleBuilder
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.SettingsStep
 import org.jetbrains.jet.plugin.JetIcons
-import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider
 import com.intellij.ide.util.projectWizard.WizardContext
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java
index ec44f72da92..4e8062032de 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java
@@ -35,7 +35,7 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 
 import javax.swing.*;
 import java.util.ArrayList;
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt
index 0ad65ddf841..856c1779d44 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt
@@ -20,7 +20,7 @@ import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.platform.ProjectTemplatesFactory
 import com.intellij.platform.templates.BuilderBasedTemplate
 import org.jetbrains.jet.plugin.JetIcons
-import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform
 
 public class KotlinTemplatesFactory : ProjectTemplatesFactory() {
     class object {
diff --git a/idea/src/org/jetbrains/jet/plugin/project/K2JSModuleComponent.java b/idea/src/org/jetbrains/kotlin/idea/project/K2JSModuleComponent.java
similarity index 96%
rename from idea/src/org/jetbrains/jet/plugin/project/K2JSModuleComponent.java
rename to idea/src/org/jetbrains/kotlin/idea/project/K2JSModuleComponent.java
index 90d4caf28c1..086427431a2 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/K2JSModuleComponent.java
+++ b/idea/src/org/jetbrains/kotlin/idea/project/K2JSModuleComponent.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.project;
+package org.jetbrains.kotlin.idea.project;
 
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
diff --git a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java b/idea/src/org/jetbrains/kotlin/idea/project/PluginJetFilesProvider.java
similarity index 94%
rename from idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/project/PluginJetFilesProvider.java
index b75c9148cf5..622045f41e5 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/project/PluginJetFilesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.project;
+package org.jetbrains.kotlin.idea.project;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.idea.stubindex.JetExactPackagesIndex;
 import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope;
+import org.jetbrains.kotlin.psi.JetFile;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java
index c222f5ad4dc..c226b75f12f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java
@@ -24,11 +24,11 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.actions.JetAddFunctionToClassifierAction;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.psi.JetFile;
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
index bd29dfe45ab..b621b29e377 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
@@ -23,11 +23,11 @@ import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.plugin.project.PluginJetFilesProvider;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.Errors;
 import org.jetbrains.kotlin.idea.JetBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
+import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider;
 import org.jetbrains.kotlin.psi.*;
 
 import java.util.Collection;
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
index faee5ae6f45..96cc532be53 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
@@ -36,11 +36,11 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.ImportPath
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.idea.JetBundle
-import org.jetbrains.jet.plugin.actions.JetAddImportAction
+import org.jetbrains.kotlin.idea.actions.JetAddImportAction
 import org.jetbrains.kotlin.idea.caches.JetShortNamesCache
 import org.jetbrains.kotlin.idea.caches.KotlinIndicesHelper
 import org.jetbrains.kotlin.idea.caches.resolve.*
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil
 import org.jetbrains.jet.plugin.util.JetPsiHeuristicsUtil
 import java.util.ArrayList
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.java
index 80b907e0516..5d9cdaadc1e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.java
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix;
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.actions.OptimizeImportsProcessor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
 import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.NamePackage;
diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java
index fe2d55c75a0..55d911b077c 100644
--- a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java
+++ b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java
@@ -31,7 +31,7 @@ import com.intellij.psi.impl.file.impl.FileManager;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode;
+import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode;
 import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java
index 00fb431214d..2ca9605e0c8 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java
@@ -22,7 +22,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 
 public abstract class AbstractCompiledKotlinInJavaCompletionTest extends JetFixtureCompletionBaseTestCase {
     @Override
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java
index 31f4fdb185d..b4a7032554c 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java
@@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.JetStdJSProjectDescriptor;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 
 public abstract class AbstractJSBasicCompletionTest extends JetFixtureCompletionBaseTestCase {
     @NotNull
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java
index 19ed9ed3216..b275b88bd8f 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java
@@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 
 public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletionBaseTestCase {
     @NotNull
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java
index a8305de91fc..2f78de33b5c 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java
@@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 
 public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletionBaseTestCase {
     @NotNull
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java
index 3b478d9a492..cbdb76e6b4d 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java
@@ -22,7 +22,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 
 public abstract class AbstractJvmWithLibBasicCompletionTest extends JetFixtureCompletionBaseTestCase {
     private static final String TEST_PATH = PluginTestCaseBase.getTestDataPathBase() + "/completion/basic/custom";
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt
index 6592cdf9288..0ff4f4dd02a 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.lookup.LookupElement
 import org.jetbrains.jet.plugin.JetLightProjectDescriptor
 import org.jetbrains.kotlin.idea.completion.KeywordLookupObject
-import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform
 
 public abstract class AbstractKeywordCompletionTest : JetFixtureCompletionBaseTestCase() {
     override fun getPlatform() = TargetPlatform.JVM
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java
index 3ed13ede6a0..8ba79fcf8c0 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java
@@ -25,7 +25,7 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 
 import java.io.File;
 
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt
index c1ea323d580..f9e7521d193 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.completion
 import org.jetbrains.kotlin.completion.util.*
 import org.jetbrains.jet.plugin.KotlinCompletionTestCase
 import org.jetbrains.jet.plugin.PluginTestCaseBase
-import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.jet.plugin.stubs.AstAccessControl
 
 public abstract class AbstractMultiFileJvmBasicCompletionTest : KotlinCompletionTestCase() {
diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt
index 38dc139ac60..ee558400c2c 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.completion
 import org.jetbrains.kotlin.completion.util.*
 import org.jetbrains.jet.plugin.KotlinCompletionTestCase
 import org.jetbrains.jet.plugin.PluginTestCaseBase
-import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.jetbrains.jet.plugin.stubs.AstAccessControl
 import com.intellij.codeInsight.completion.CompletionType
 
diff --git a/idea/tests/org/jetbrains/kotlin/completion/CompletionTestUtil.kt b/idea/tests/org/jetbrains/kotlin/completion/CompletionTestUtil.kt
index b377863958a..d3f8269836e 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/CompletionTestUtil.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/CompletionTestUtil.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.completion.util
 
 import com.intellij.codeInsight.lookup.LookupElement
-import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform
 import org.junit.Assert
 import org.jetbrains.kotlin.completion.ExpectedCompletionUtils
 import com.intellij.codeInsight.CodeInsightSettings
diff --git a/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java
index ab7abc4127d..f2fad79af94 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java
@@ -31,8 +31,8 @@ import com.intellij.ui.JBColor;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
 import org.jetbrains.jet.plugin.stubs.AstAccessControl;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.junit.Assert;
 
diff --git a/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java
index 325a89e5607..4c1d7e2c639 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java
@@ -22,9 +22,9 @@ import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
-import org.jetbrains.jet.plugin.project.TargetPlatform;
 import org.jetbrains.kotlin.completion.util.UtilPackage;
 import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker;
+import org.jetbrains.kotlin.idea.project.TargetPlatform;
 
 import java.io.File;
 
diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt
index 4d94160ab88..ccd3d32655b 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.completion.handlers
 
 import com.intellij.codeInsight.completion.CompletionType
-import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.formatter.JetCodeStyleSettings
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 
 deprecated("All tests from here to be moved to the generated test")
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
index e8d45540613..8c0e71e46d6 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.formatter;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.testFramework.LightPlatformTestCase;
-import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings;
 import org.jetbrains.kotlin.idea.JetLanguage;
+import org.jetbrains.kotlin.idea.formatter.JetCodeStyleSettings;
 import org.jetbrains.kotlin.test.SettingsConfigurator;
 
 public class JetFormatSettingsUtil {
diff --git a/idea/tests/org/jetbrains/jet/plugin/actions/QualifiedNamesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt
similarity index 94%
rename from idea/tests/org/jetbrains/jet/plugin/actions/QualifiedNamesTest.kt
rename to idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt
index ed41b261677..69fae1adbf6 100644
--- a/idea/tests/org/jetbrains/jet/plugin/actions/QualifiedNamesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.actions
+package org.jetbrains.kotlin.idea.actions
 
 import com.intellij.testFramework.LightCodeInsightTestCase
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase
 import org.jetbrains.kotlin.psi.JetVisitorVoid
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.psi.JetClass
-import org.jetbrains.kotlin.psi.JetObjectDeclaration
 import com.intellij.ide.actions.CopyReferenceAction
 import org.jetbrains.kotlin.psi.JetNamedDeclaration
 import java.util.ArrayList
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
index 837c3a83d68..d0827c373a6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.caches.resolve
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import com.intellij.openapi.module.StdModuleTypes
 import com.intellij.openapi.roots.ModuleRootModificationUtil
-import org.jetbrains.jet.plugin.project.PluginJetFilesProvider
+import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider
 import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.vfs.LocalFileSystem
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java
index c624cdd148c..534d663ec9d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java
@@ -37,11 +37,11 @@ import com.sun.jdi.ReferenceType;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.plugin.project.PluginJetFilesProvider;
 import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.kotlin.codegen.GenerationUtils;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
+import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt
index 31118bc3cab..ebfb1399c80 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.JetFunction
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.kotlin.completion.util.testCompletion
-import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.jetbrains.kotlin.idea.project.TargetPlatform
 import com.intellij.codeInsight.completion.CompletionType
 import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.jet.plugin.PluginTestCaseBase
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.java
index 6c3e49fb92f..25caa00afe2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.java
@@ -17,8 +17,8 @@
 package org.jetbrains.kotlin.idea.resolve;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.plugin.project.ResolveElementCache;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
+import org.jetbrains.kotlin.idea.project.ResolveElementCache;
 import org.jetbrains.kotlin.psi.JetClassInitializer;
 import org.jetbrains.kotlin.psi.JetDeclaration;
 import org.jetbrains.kotlin.psi.JetPsiUtil;