Rename jet -> kotlin in frontend: PSI

org.jetbrains.jet.lang.psi -> org.jetbrains.kotlin.psi

idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java

@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.cfg.JetFlowInformationProvider;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo;
 import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor;

idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt

@@ -17,8 +17,8 @@
 package org.jetbrains.jet.lang.resolve.lazy
 
 import java.util.HashSet
-import org.jetbrains.jet.lang.psi.*
-import org.jetbrains.jet.lang.psi.psiUtil.siblings
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.siblings
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.utils.addIfNotNull
 import java.util.ArrayList
@@ -26,9 +26,9 @@ import java.util.HashMap
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.JetNodeTypes
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
-import org.jetbrains.jet.lang.psi.psiUtil.isAncestor
+import org.jetbrains.kotlin.psi.psiUtil.isAncestor
 import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider
-import org.jetbrains.jet.lang.psi.psiUtil.isProbablyNothing
+import org.jetbrains.kotlin.psi.psiUtil.isProbablyNothing
 
 //TODO: do resolve anonymous object's body
 

idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt

@@ -17,8 +17,8 @@
 package org.jetbrains.jet.plugin.codeInsight
 
 import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.lang.psi.*
-import org.jetbrains.jet.lang.psi.psiUtil.*
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils
 import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo

idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java

@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor;
-import org.jetbrains.jet.lang.psi.JetElement;
+import org.jetbrains.kotlin.psi.JetElement;
 
 import javax.swing.*;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java

@@ -28,7 +28,7 @@ import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.lexer.JetTokens;
 import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration;
 import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration;

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java

@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils;

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt

@@ -16,8 +16,8 @@
 
 package org.jetbrains.jet.plugin.caches.resolve
 
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetElement
+import org.jetbrains.kotlin.psi.JetFile
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.analyzer.AnalysisResult
 import com.intellij.openapi.diagnostic.Logger
@@ -31,12 +31,12 @@ 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.jet.lang.psi.JetCodeFragment
+import org.jetbrains.kotlin.psi.JetCodeFragment
 import org.jetbrains.kotlin.utils.keysToMap
 import com.intellij.openapi.roots.ProjectRootModificationTracker
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
-import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.kotlin.psi.JetDeclaration
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt

@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.caches.resolve
 import org.jetbrains.kotlin.asJava.KotlinWrappingLightClass
 import com.intellij.psi.PsiClass
 import com.intellij.psi.impl.compiled.ClsClassImpl
-import org.jetbrains.jet.lang.psi.JetClassOrObject
+import org.jetbrains.kotlin.psi.JetClassOrObject
 
 class KotlinLightClassForDecompiledDeclaration(
         private val clsClass: ClsClassImpl,

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt

@@ -16,8 +16,8 @@
 
 package org.jetbrains.jet.plugin.caches.resolve
 
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetElement
+import org.jetbrains.kotlin.psi.JetFile
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.analyzer.AnalysisResult
@@ -38,23 +38,23 @@ import org.jetbrains.jet.plugin.project.ResolveSessionForBodies
 import java.util.HashMap
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.resolve.BindingContext
-import org.jetbrains.jet.lang.psi.JetNamedFunction
-import org.jetbrains.jet.lang.psi.JetClassInitializer
-import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.jet.lang.psi.JetImportDirective
-import org.jetbrains.jet.lang.psi.JetAnnotationEntry
-import org.jetbrains.jet.lang.psi.JetTypeConstraint
-import org.jetbrains.jet.lang.psi.JetPackageDirective
-import org.jetbrains.jet.lang.psi.JetPsiUtil
-import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.kotlin.psi.JetNamedFunction
+import org.jetbrains.kotlin.psi.JetClassInitializer
+import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.JetImportDirective
+import org.jetbrains.kotlin.psi.JetAnnotationEntry
+import org.jetbrains.kotlin.psi.JetTypeConstraint
+import org.jetbrains.kotlin.psi.JetPackageDirective
+import org.jetbrains.kotlin.psi.JetPsiUtil
+import org.jetbrains.kotlin.psi.JetDeclaration
 import org.jetbrains.jet.lang.resolve.CompositeBindingContext
-import org.jetbrains.jet.lang.psi.JetParameter
-import org.jetbrains.jet.lang.psi.JetDelegationSpecifierList
-import org.jetbrains.jet.lang.psi.JetTypeParameter
-import org.jetbrains.jet.lang.psi.JetClassOrObject
-import org.jetbrains.jet.lang.psi.JetCallableDeclaration
-import org.jetbrains.jet.lang.psi.JetCodeFragment
-import org.jetbrains.jet.lang.psi.JetExpression
+import org.jetbrains.kotlin.psi.JetParameter
+import org.jetbrains.kotlin.psi.JetDelegationSpecifierList
+import org.jetbrains.kotlin.psi.JetTypeParameter
+import org.jetbrains.kotlin.psi.JetClassOrObject
+import org.jetbrains.kotlin.psi.JetCallableDeclaration
+import org.jetbrains.kotlin.psi.JetCodeFragment
+import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.jet.analyzer.analyzeInContext
 import org.jetbrains.jet.lang.resolve.BindingTraceContext
 import org.jetbrains.jet.lang.types.TypeUtils
@@ -67,7 +67,7 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode
 import com.intellij.openapi.project.IndexNotReadyException
-import org.jetbrains.jet.lang.psi.JetBlockExpression
+import org.jetbrains.kotlin.psi.JetBlockExpression
 
 public trait CacheExtension<T> {
     public val platform: TargetPlatform

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt

@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl
 import com.intellij.openapi.roots.JdkOrderEntry
 import org.jetbrains.jet.analyzer.AnalyzerFacade
 import org.jetbrains.jet.analyzer.ResolverForModule
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.storage.ExceptionTracker
 import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
 import org.jetbrains.jet.analyzer.ResolverForProject

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt

@@ -16,11 +16,11 @@
 
 package org.jetbrains.jet.plugin.caches.resolve
 
-import org.jetbrains.jet.lang.psi.JetElement
+import org.jetbrains.kotlin.psi.JetElement
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
-import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.kotlin.psi.JetDeclaration
 import org.jetbrains.jet.analyzer.AnalysisResult
 import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.caches.resolve
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.asJava.KotlinLightElement
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.roots.LibraryOrderEntry
 import com.intellij.openapi.roots.JdkOrderEntry

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt

@@ -16,11 +16,11 @@
 
 package org.jetbrains.jet.plugin.caches.resolve
 
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetElement
+import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.analyzer.AnalysisResult
 import org.jetbrains.jet.lang.resolve.BindingContext
-import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.kotlin.psi.JetDeclaration
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt

@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.codeInsight
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
 import org.jetbrains.jet.plugin.decompiler.navigation.DecompiledNavigationUtils
 import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver

idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt

@@ -16,18 +16,18 @@
 
 package org.jetbrains.jet.plugin.codeInsight
 
-import org.jetbrains.jet.lang.psi.JetReferenceExpression
-import org.jetbrains.jet.lang.psi.JetElement
+import org.jetbrains.kotlin.psi.JetReferenceExpression
+import org.jetbrains.kotlin.psi.JetElement
 import org.jetbrains.jet.lang.resolve.BindingContext
-import org.jetbrains.jet.lang.psi.JetFile
-import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid
-import org.jetbrains.jet.lang.psi.JetUserType
-import org.jetbrains.jet.lang.psi.JetExpression
-import org.jetbrains.jet.lang.psi.JetCallExpression
-import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
+import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
+import org.jetbrains.kotlin.psi.JetUserType
+import org.jetbrains.kotlin.psi.JetExpression
+import org.jetbrains.kotlin.psi.JetCallExpression
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 import java.util.Collections
 import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade
-import org.jetbrains.jet.lang.psi.JetQualifiedExpression
+import org.jetbrains.kotlin.psi.JetQualifiedExpression
 import java.util.LinkedHashMap
 
 object JetFileReferencesResolver {

idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.codeInsight
 
 import com.intellij.psi.PsiElement;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
@@ -33,10 +33,10 @@ import org.jetbrains.jet.analyzer.analyzeInContext
 import org.jetbrains.jet.lang.resolve.calls.callUtil.getCalleeExpressionIfAny
 import java.util.LinkedHashSet
 import org.jetbrains.jet.lang.resolve.ImportPath
-import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElement
+import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement
 import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
-import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
 public object ShortenReferences {
     public fun process(element: JetElement) {

idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/shorten/shortenWaitingSet.kt

@@ -18,10 +18,10 @@ package org.jetbrains.jet.plugin.codeInsight.shorten
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.SmartPsiElementPointer
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.psi.UserDataProperty
+import org.jetbrains.kotlin.psi.JetElement
+import org.jetbrains.kotlin.psi.UserDataProperty
 import com.intellij.openapi.util.Key
-import org.jetbrains.jet.lang.psi.NotNullableUserDataProperty
+import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
 import java.util.HashSet
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.psi.SmartPointerManager

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt

@@ -21,12 +21,12 @@ import com.intellij.psi.impl.compiled.ClsFileImpl
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
-import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.kotlin.psi.JetDeclaration
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.plugin.decompiler.textBuilder.buildDecompiledText
 import org.jetbrains.jet.plugin.decompiler.textBuilder.descriptorToKey
 import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetFile
 
 public class JetClsFile(val provider: JetClassFileViewProvider) : JetFile(provider, true) {
     private val decompiledText = LockedClearableLazyValue(Any()) {

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java

@@ -24,7 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.psi.JetDeclaration;
+import org.jetbrains.kotlin.psi.JetDeclaration;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder;

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java

@@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider;
 import org.jetbrains.jet.lang.resolve.BindingTraceContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt

@@ -16,9 +16,9 @@
 
 package org.jetbrains.jet.plugin.decompiler.navigation
 
-import org.jetbrains.jet.lang.psi.KotlinDeclarationNavigationPolicy
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.kotlin.psi.KotlinDeclarationNavigationPolicy
+import org.jetbrains.kotlin.psi.JetElement
+import org.jetbrains.kotlin.psi.JetDeclaration
 import com.intellij.openapi.project.DumbService
 
 public class KotlinDeclarationNavigationPolicyImpl : KotlinDeclarationNavigationPolicy {
@@ -31,4 +31,4 @@ public class KotlinDeclarationNavigationPolicyImpl : KotlinDeclarationNavigation
         }
         return null
     }
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java

@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt

@@ -21,8 +21,8 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFunctionStubImpl
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPropertyStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinFunctionStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl
 import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt

@@ -19,22 +19,22 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder
 import com.intellij.psi.stubs.StubElement
 import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.jet.lang.psi.stubs.elements.JetClassElementType
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinClassStubImpl
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinObjectStubImpl
+import org.jetbrains.kotlin.psi.stubs.elements.JetClassElementType
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinClassStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.psi.JetClassBody
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
-import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes
-import org.jetbrains.jet.lang.psi.JetParameterList
+import org.jetbrains.kotlin.psi.JetClassBody
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
+import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes
+import org.jetbrains.kotlin.psi.JetParameterList
 import org.jetbrains.jet.lang.resolve.name.ClassId
-import org.jetbrains.jet.lang.psi.JetDelegationSpecifierList
-import org.jetbrains.jet.lang.psi.JetDelegatorToSuperClass
+import org.jetbrains.kotlin.psi.JetDelegationSpecifierList
+import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName
-import org.jetbrains.jet.lang.psi.JetClassObject
+import org.jetbrains.kotlin.psi.JetClassObject
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
 import org.jetbrains.kotlin.serialization.ProtoBuf.Type
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.*

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt

@@ -25,7 +25,7 @@ import com.intellij.psi.impl.compiled.ClassFileStubBuilder
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassFinder
 import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassDataFinder
 import com.intellij.openapi.diagnostic.Logger

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt

@@ -20,38 +20,38 @@ import com.intellij.psi.stubs.StubElement
 import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.resolve.name.FqName
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
-import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl
-import org.jetbrains.jet.lang.psi.JetTypeReference
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
+import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl
+import org.jetbrains.kotlin.psi.JetTypeReference
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.lang.psi.JetParameterList
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinParameterStubImpl
+import org.jetbrains.kotlin.psi.JetParameterList
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinParameterStubImpl
 import org.jetbrains.jet.lang.resolve.name.Name
-import org.jetbrains.jet.lang.psi.JetNullableType
+import org.jetbrains.kotlin.psi.JetNullableType
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
-import org.jetbrains.jet.lang.psi.JetTypeArgumentList
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeProjectionStubImpl
-import org.jetbrains.jet.lang.psi.JetFunctionType
-import org.jetbrains.jet.lang.psi.JetFunctionTypeReceiver
+import org.jetbrains.kotlin.psi.JetTypeArgumentList
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeProjectionStubImpl
+import org.jetbrains.kotlin.psi.JetFunctionType
+import org.jetbrains.kotlin.psi.JetFunctionTypeReceiver
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
-import org.jetbrains.jet.lang.psi.JetTypeParameterList
+import org.jetbrains.kotlin.psi.JetTypeParameterList
 import org.jetbrains.kotlin.serialization.ProtoBuf.Type
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeParameterStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeParameterStubImpl
 import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
-import org.jetbrains.jet.lang.psi.JetTypeConstraintList
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeConstraintStubImpl
+import org.jetbrains.kotlin.psi.JetTypeConstraintList
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeConstraintStubImpl
 import org.jetbrains.jet.lang.resolve.name.ClassId
 import java.util.ArrayList
 import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
-import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.ModifierMaskUtils
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
+import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub
 import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection
-import org.jetbrains.jet.lang.psi.JetProjectionKind
+import org.jetbrains.kotlin.psi.JetProjectionKind
 
 class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt

@@ -17,29 +17,29 @@
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
 import org.jetbrains.jet.lang.resolve.name.FqName
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFileStubImpl
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
-import org.jetbrains.jet.lang.psi.JetPackageDirective
-import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
+import org.jetbrains.kotlin.psi.JetPackageDirective
+import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes
 import com.intellij.psi.stubs.StubElement
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl
-import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl
+import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
 import org.jetbrains.jet.lang.resolve.name.ClassId
-import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
+import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub
 import org.jetbrains.jet.lang.resolve.name.SpecialNames
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinUserTypeStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinUserTypeStubImpl
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
 import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
-import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl
+import org.jetbrains.kotlin.psi.stubs.impl.ModifierMaskUtils
 import org.jetbrains.kotlin.serialization.ProtoBuf
 import com.intellij.util.io.StringRef
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.jet.lang.psi.stubs.impl.KotlinAnnotationEntryStubImpl
-import org.jetbrains.jet.lang.psi.JetConstructorCalleeExpression
-import org.jetbrains.jet.lang.psi.JetTypeReference
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinAnnotationEntryStubImpl
+import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression
+import org.jetbrains.kotlin.psi.JetTypeReference
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
 import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind

idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.kt

@@ -20,7 +20,7 @@ import com.intellij.lang.cacheBuilder.WordsScanner
 import com.intellij.lang.findUsages.FindUsagesProvider
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 
 public class JetFindUsagesProvider : FindUsagesProvider {
     public override fun canFindUsagesFor(psiElement: PsiElement): Boolean =

idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt

@@ -17,42 +17,42 @@
 package org.jetbrains.jet.plugin.findUsages
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.psi.JetForExpression
-import org.jetbrains.jet.lang.psi.JetMultiDeclaration
-import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType
-import org.jetbrains.jet.lang.psi.JetReferenceExpression
-import org.jetbrains.jet.lang.psi.JetImportDirective
-import org.jetbrains.jet.lang.psi.JetCallableReferenceExpression
-import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.jet.lang.psi.psiUtil.isAncestor
-import org.jetbrains.jet.lang.psi.JetFunction
-import org.jetbrains.jet.lang.psi.JetTypeParameter
-import org.jetbrains.jet.lang.psi.JetTypeConstraint
-import org.jetbrains.jet.lang.psi.JetDelegationSpecifier
-import org.jetbrains.jet.lang.psi.JetTypedef
-import org.jetbrains.jet.lang.psi.JetTypeProjection
-import org.jetbrains.jet.lang.psi.JetParameter
-import org.jetbrains.jet.lang.psi.JetIsExpression
-import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS
+import org.jetbrains.kotlin.psi.JetForExpression
+import org.jetbrains.kotlin.psi.JetMultiDeclaration
+import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
+import org.jetbrains.kotlin.psi.JetReferenceExpression
+import org.jetbrains.kotlin.psi.JetImportDirective
+import org.jetbrains.kotlin.psi.JetCallableReferenceExpression
+import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.psiUtil.isAncestor
+import org.jetbrains.kotlin.psi.JetFunction
+import org.jetbrains.kotlin.psi.JetTypeParameter
+import org.jetbrains.kotlin.psi.JetTypeConstraint
+import org.jetbrains.kotlin.psi.JetDelegationSpecifier
+import org.jetbrains.kotlin.psi.JetTypedef
+import org.jetbrains.kotlin.psi.JetTypeProjection
+import org.jetbrains.kotlin.psi.JetParameter
+import org.jetbrains.kotlin.psi.JetIsExpression
+import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
-import org.jetbrains.jet.lang.psi.JetSuperExpression
-import org.jetbrains.jet.lang.psi.JetDelegatorByExpressionSpecifier
-import org.jetbrains.jet.lang.psi.psiUtil.getParentOfTypesAndPredicate
-import org.jetbrains.jet.lang.psi.JetBinaryExpression
-import org.jetbrains.jet.lang.psi.JetPsiUtil
-import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
+import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
+import org.jetbrains.kotlin.psi.JetSuperExpression
+import org.jetbrains.kotlin.psi.JetDelegatorByExpressionSpecifier
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate
+import org.jetbrains.kotlin.psi.JetBinaryExpression
+import org.jetbrains.kotlin.psi.JetPsiUtil
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.plugin.references.JetArrayAccessReference
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.plugin.references.JetInvokeFunctionReference
 import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor
-import org.jetbrains.jet.lang.psi.JetAnnotationEntry
-import org.jetbrains.jet.lang.psi.JetCallExpression
-import org.jetbrains.jet.lang.psi.JetUnaryExpression
-import org.jetbrains.jet.lang.psi.JetWhenConditionInRange
-import org.jetbrains.jet.lang.psi.JetPackageDirective
-import org.jetbrains.jet.lang.psi.JetQualifiedExpression
+import org.jetbrains.kotlin.psi.JetAnnotationEntry
+import org.jetbrains.kotlin.psi.JetCallExpression
+import org.jetbrains.kotlin.psi.JetUnaryExpression
+import org.jetbrains.kotlin.psi.JetWhenConditionInRange
+import org.jetbrains.kotlin.psi.JetPackageDirective
+import org.jetbrains.kotlin.psi.JetQualifiedExpression
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassKind
@@ -61,7 +61,7 @@ import com.intellij.psi.PsiPackage
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor
 import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum.*
 import org.jetbrains.jet.plugin.caches.resolve.analyze
-import org.jetbrains.jet.lang.psi.psiUtil.getParentOfTypeAndBranch
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
 
 public object UsageTypeUtils {
     public fun getUsageType(element: PsiElement?): UsageTypeEnum? {

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java

@@ -22,9 +22,9 @@ import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.checkers.DebugInfoUtil;
-import org.jetbrains.jet.lang.psi.JetCodeFragment;
-import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.psi.JetReferenceExpression;
+import org.jetbrains.kotlin.psi.JetCodeFragment;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetReferenceExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
 import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode;

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java

@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage;

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java

@@ -22,9 +22,9 @@ 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.lang.psi.JetDeclaration;
-import org.jetbrains.jet.lang.psi.JetElement;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetDeclaration;
+import org.jetbrains.kotlin.psi.JetElement;
+import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.project.TargetPlatform;

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java

@@ -20,7 +20,7 @@ import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage;

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HighlightingVisitor.java

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.highlighter;
 
 import com.intellij.lang.annotation.AnnotationHolder;
-import org.jetbrains.jet.lang.psi.JetVisitorVoid;
+import org.jetbrains.kotlin.psi.JetVisitorVoid;
 
 abstract class HighlightingVisitor extends JetVisitorVoid {
     protected AnnotationHolder holder;

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt

@@ -38,9 +38,9 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic
 import org.jetbrains.jet.lang.diagnostics.Errors
 import org.jetbrains.jet.lang.diagnostics.Severity
 import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages
-import org.jetbrains.jet.lang.psi.JetCodeFragment
-import org.jetbrains.jet.lang.psi.JetFile
-import org.jetbrains.jet.lang.psi.JetReferenceExpression
+import org.jetbrains.kotlin.psi.JetCodeFragment
+import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.JetReferenceExpression
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil
@@ -49,7 +49,7 @@ import org.jetbrains.jet.plugin.caches.resolve.*
 import org.jetbrains.jet.plugin.quickfix.JetIntentionActionsFactory
 import org.jetbrains.jet.plugin.quickfix.QuickFixes
 import kotlin.platform.platformStatic
-import org.jetbrains.jet.lang.psi.JetBinaryExpressionWithTypeRHS
+import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS
 
 public open class JetPsiChecker : Annotator, HighlightRangeExtension {
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt

@@ -22,10 +22,10 @@ import com.intellij.codeInspection.SuppressIntentionAction
 import org.jetbrains.jet.lang.diagnostics.Severity
 import java.util.Collections
 import org.jetbrains.jet.plugin.quickfix.KotlinSuppressIntentionAction
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.jet.plugin.quickfix.AnnotationHostKind
 import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory
-import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
 class KotlinSuppressableWarningProblemGroup(
         private val diagnosticFactory: DiagnosticFactory<*>

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java

@@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.highlighter;
 
 import com.intellij.lang.annotation.AnnotationHolder;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetExpressionWithLabel;
-import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
+import org.jetbrains.kotlin.psi.JetExpressionWithLabel;
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression;
 
 class LabelsHighlightingVisitor extends HighlightingVisitor {
     LabelsHighlightingVisitor(AnnotationHolder holder) {

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java

@@ -22,10 +22,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
-import org.jetbrains.jet.lang.psi.JetParameter;
-import org.jetbrains.jet.lang.psi.JetProperty;
-import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
-import org.jetbrains.jet.lang.psi.JetThisExpression;
+import org.jetbrains.kotlin.psi.JetParameter;
+import org.jetbrains.kotlin.psi.JetProperty;
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression;
+import org.jetbrains.kotlin.psi.JetThisExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage;

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java

@@ -24,8 +24,8 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.impl.source.tree.LeafPsiElement;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetFunctionLiteral;
-import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression;
+import org.jetbrains.kotlin.psi.JetFunctionLiteral;
+import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression;
 import org.jetbrains.kotlin.lexer.JetTokens;
 
 class SoftKeywordsHighlightingVisitor extends HighlightingVisitor {

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java

@@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 
 class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor {

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java

@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage;
 import org.jetbrains.jet.lang.types.JetType;

idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.inspections
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.psi.JetElement
+import org.jetbrains.kotlin.psi.JetElement
 import com.intellij.psi.PsiElementVisitor
 import com.intellij.codeInspection.LocalInspectionToolSession
 import com.intellij.codeInspection.ProblemsHolder
@@ -77,4 +77,4 @@ private fun PsiElement.getOrCreateEditor(): Editor? {
 
     val editors = editorFactory.getEditors(document)
     return if (editors.isEmpty()) editorFactory.createEditor(document) else editors[0]
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt

@@ -17,6 +17,6 @@
 package org.jetbrains.jet.plugin.inspections
 
 import org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments
-import org.jetbrains.jet.lang.psi.JetTypeArgumentList
+import org.jetbrains.kotlin.psi.JetTypeArgumentList
 
 public class RemoveExplicitTypeArgsInspection : IntentionBasedInspection<JetTypeArgumentList>(RemoveExplicitTypeArguments())

idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt

@@ -17,6 +17,6 @@
 package org.jetbrains.jet.plugin.inspections
 
 import org.jetbrains.jet.plugin.intentions.SimplifyNegatedBinaryExpressionIntention
-import org.jetbrains.jet.lang.psi.JetPrefixExpression
+import org.jetbrains.kotlin.psi.JetPrefixExpression
 
-public class SimplifyBinaryNegationInspection : IntentionBasedInspection<JetPrefixExpression>(SimplifyNegatedBinaryExpressionIntention())
+public class SimplifyBinaryNegationInspection : IntentionBasedInspection<JetPrefixExpression>(SimplifyNegatedBinaryExpressionIntention())

idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt

@@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.intentions
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
-import org.jetbrains.jet.lang.psi.JetElement
+import org.jetbrains.kotlin.psi.JetElement
 import org.jetbrains.jet.plugin.JetBundle
-import org.jetbrains.jet.lang.psi.psiUtil.getParentOfTypesAndPredicate
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate
 import com.intellij.codeInsight.intention.IntentionAction
 
 public abstract class JetSelfTargetingIntention<T: JetElement>(protected val key: String, val elementType: Class<T>) : IntentionAction {
@@ -58,4 +58,4 @@ public abstract class JetSelfTargetingIntention<T: JetElement>(protected val key
     override fun startInWriteAction(): Boolean = true
 
     override fun toString(): String = getText()
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt

@@ -16,17 +16,17 @@
 
 package org.jetbrains.jet.plugin.intentions
 
-import org.jetbrains.jet.lang.psi.JetExpression
+import org.jetbrains.kotlin.psi.JetExpression
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.jet.lang.psi.JetPrefixExpression
-import org.jetbrains.jet.lang.psi.JetPostfixExpression
-import org.jetbrains.jet.lang.psi.JetBinaryExpression
-import org.jetbrains.jet.lang.psi.JetArrayAccessExpression
-import org.jetbrains.jet.lang.psi.JetCallExpression
+import org.jetbrains.kotlin.psi.JetPrefixExpression
+import org.jetbrains.kotlin.psi.JetPostfixExpression
+import org.jetbrains.kotlin.psi.JetBinaryExpression
+import org.jetbrains.kotlin.psi.JetArrayAccessExpression
+import org.jetbrains.kotlin.psi.JetCallExpression
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.lang.psi.JetPsiFactory
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
+import org.jetbrains.kotlin.psi.JetPsiFactory
+import org.jetbrains.kotlin.psi.JetElement
+import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
 import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall

idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt

@@ -17,21 +17,21 @@
 package org.jetbrains.jet.plugin.intentions
 
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.jet.lang.psi.JetCallExpression
+import org.jetbrains.kotlin.psi.JetCallExpression
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.resolve.calls.util.DelegatingCall
 import org.jetbrains.jet.lang.types.TypeUtils
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
-import org.jetbrains.jet.lang.psi.JetTypeProjection
-import org.jetbrains.jet.lang.psi.Call
+import org.jetbrains.kotlin.psi.JetTypeProjection
+import org.jetbrains.kotlin.psi.Call
 import org.jetbrains.kotlin.di.InjectorForMacros
 import org.jetbrains.jet.lang.resolve.BindingTraceContext
-import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.jet.lang.psi.JetTypeArgumentList
-import org.jetbrains.jet.lang.psi.JetReturnExpression
-import org.jetbrains.jet.lang.psi.JetDeclarationWithBody
+import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.JetTypeArgumentList
+import org.jetbrains.kotlin.psi.JetReturnExpression
+import org.jetbrains.kotlin.psi.JetDeclarationWithBody
 import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall
-import org.jetbrains.jet.lang.psi.psiUtil.getTextWithLocation
+import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo
 import org.jetbrains.jet.plugin.util.approximateFlexibleTypes
 import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor

idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt

@@ -16,19 +16,19 @@
 
 package org.jetbrains.jet.plugin.intentions
 
-import org.jetbrains.jet.lang.psi.JetPrefixExpression
-import org.jetbrains.jet.lang.psi.JetExpression
-import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
+import org.jetbrains.kotlin.psi.JetPrefixExpression
+import org.jetbrains.kotlin.psi.JetExpression
+import org.jetbrains.kotlin.psi.JetParenthesizedExpression
 import org.jetbrains.kotlin.lexer.JetToken
 import org.jetbrains.kotlin.lexer.JetSingleValueToken
-import org.jetbrains.jet.lang.psi.JetOperationExpression
-import org.jetbrains.jet.lang.psi.JetIsExpression
-import org.jetbrains.jet.lang.psi.JetBinaryExpression
+import org.jetbrains.kotlin.psi.JetOperationExpression
+import org.jetbrains.kotlin.psi.JetIsExpression
+import org.jetbrains.kotlin.psi.JetBinaryExpression
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.lang.psi.JetPsiUtil
+import org.jetbrains.kotlin.psi.JetPsiUtil
 import org.jetbrains.jet.plugin.JetBundle
-import org.jetbrains.jet.lang.psi.JetPsiFactory
+import org.jetbrains.kotlin.psi.JetPsiFactory
 import com.intellij.psi.PsiElement
 
 public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) {

idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java

@@ -35,7 +35,7 @@ import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.plugin.framework.JsLibraryStdDetectionUtil;
 import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil;

idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java

@@ -24,8 +24,8 @@ import com.intellij.psi.util.PsiModificationTracker;
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.psi.JetElement;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetElement;
+import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.lazy.*;

idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java

@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.ReadOnly;
 import org.jetbrains.jet.lang.descriptors.*;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode;

idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformDetector.java

@@ -21,7 +21,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetFile;
 
 public class TargetPlatformDetector {
     public static final TargetPlatformDetector INSTANCE = new TargetPlatformDetector();

idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java

@@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.quickfix;
 
 import com.intellij.openapi.components.ServiceManager;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.psi.JetImportDirective;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetImportDirective;
 import org.jetbrains.jet.lang.resolve.ImportPath;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix
 
 import com.intellij.codeInsight.intention.IntentionAction
 import org.jetbrains.jet.lang.diagnostics.Diagnostic
-import org.jetbrains.jet.lang.psi.JetCodeFragment
+import org.jetbrains.kotlin.psi.JetCodeFragment
 import java.util.Collections
 
 // TODO: Replace with trait when all subclasses are translated to Kotlin

idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt

@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.jet.plugin.JetBundle
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns

idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt

@@ -18,13 +18,13 @@ package org.jetbrains.jet.plugin.quickfix
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.psi.JetDeclarationWithBody
-import org.jetbrains.jet.lang.psi.JetBlockExpression
+import org.jetbrains.kotlin.psi.JetDeclarationWithBody
+import org.jetbrains.kotlin.psi.JetBlockExpression
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.openapi.editor.ScrollType
-import org.jetbrains.jet.lang.psi.JetWithExpressionInitializer
-import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.jet.lang.psi.psiUtil.siblings
+import org.jetbrains.kotlin.psi.JetWithExpressionInitializer
+import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.psiUtil.siblings
 
 private fun moveCaretIntoGeneratedElement(editor: Editor, element: PsiElement): Boolean {
     // Inspired by GenerateMembersUtils.positionCaret()

idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt

@@ -22,14 +22,14 @@ import org.jetbrains.jet.lang.resolve.name.FqName
 import com.intellij.psi.PsiPackage
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiMember
-import org.jetbrains.jet.lang.psi.JetNamedDeclaration
+import org.jetbrains.kotlin.psi.JetNamedDeclaration
 import org.jetbrains.jet.lang.resolve.name.isOneSegmentFQN
-import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElement
-import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
-import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.lang.psi.JetCallExpression
-import org.jetbrains.jet.lang.psi.JetUserType
-import org.jetbrains.jet.lang.psi
+import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression
+import org.jetbrains.kotlin.psi.JetElement
+import org.jetbrains.kotlin.psi.JetCallExpression
+import org.jetbrains.kotlin.psi.JetUserType
+import org.jetbrains.kotlin.psi
 
 /**
  * Returns FqName for given declaration (either Java or Kotlin)

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java

@@ -41,7 +41,7 @@ import org.jetbrains.jet.context.GlobalContextImpl;
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
 import org.jetbrains.jet.lang.resolve.name.Name;

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java

@@ -25,8 +25,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
-import org.jetbrains.jet.lang.psi.JetArrayAccessExpression;
-import org.jetbrains.jet.lang.psi.JetContainerNode;
+import org.jetbrains.kotlin.psi.JetArrayAccessExpression;
+import org.jetbrains.kotlin.psi.JetContainerNode;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.kotlin.lexer.JetTokens;

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.references
 
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
-import org.jetbrains.jet.lang.psi.JetForExpression
+import org.jetbrains.kotlin.psi.JetForExpression
 import org.jetbrains.jet.lang.resolve.BindingContext
 import java.util.Collections
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java

@@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin.references
 
-import org.jetbrains.jet.lang.psi.JetMultiDeclaration
+import org.jetbrains.kotlin.psi.JetMultiDeclaration
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import com.intellij.openapi.util.TextRange
@@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.source.PsiSourceElement
 import org.jetbrains.jet.lang.resolve.source.getPsi
 import com.intellij.psi.PsiElement
 import com.intellij.util.IncorrectOperationException
-import org.jetbrains.jet.lang.psi.JetNamedFunction
+import org.jetbrains.kotlin.psi.JetNamedFunction
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt

@@ -19,11 +19,11 @@ package org.jetbrains.jet.plugin.references
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
-import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.jet.lang.psi.JetPropertyDelegate
+import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.JetPropertyDelegate
 import org.jetbrains.jet.lang.resolve.BindingContext
 import java.util.Collections
-import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
 public class JetPropertyDelegationMethodsReference(element: JetPropertyDelegate) : JetMultiReference<JetPropertyDelegate>(element) {
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt

@@ -26,9 +26,9 @@ import com.intellij.psi.PsiReference
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.resolve.BindingContext
 import java.util.Collections
-import org.jetbrains.jet.lang.psi.JetReferenceExpression
+import org.jetbrains.kotlin.psi.JetReferenceExpression
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil
-import org.jetbrains.jet.lang.psi.JetElement
+import org.jetbrains.kotlin.psi.JetElement
 import org.jetbrains.kotlin.utils.keysToMap
 import org.jetbrains.jet.plugin.caches.resolve.analyze
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.references
 
 import com.intellij.psi.*
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 import com.intellij.util.ProcessingContext
 import com.intellij.patterns.PlatformPatterns
 
@@ -59,4 +59,4 @@ public class JetReferenceContributor() : PsiReferenceContributor() {
                 }
         })
     }
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt

@@ -19,13 +19,13 @@ package org.jetbrains.jet.plugin.references
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
 import org.jetbrains.jet.plugin.refactoring.fqName.changeQualifiedName
-import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector
-import org.jetbrains.jet.lang.psi.psiUtil.getOutermostNonInterleavingQualifiedElement
+import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector
+import org.jetbrains.kotlin.psi.psiUtil.getOutermostNonInterleavingQualifiedElement
 import org.jetbrains.jet.plugin.codeInsight.shorten.addToShorteningWaitSet
 import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions
@@ -36,7 +36,7 @@ import com.intellij.util.IncorrectOperationException
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike
 import org.jetbrains.jet.plugin.caches.resolve.analyze
-import org.jetbrains.jet.lang.psi.psiUtil.getParentOfTypeAndBranch
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
 
 public class JetSimpleNameReference(
         jetSimpleNameExpression: JetSimpleNameExpression

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetThisReference.java

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.references;
 
 import com.intellij.openapi.util.TextRange;
-import org.jetbrains.jet.lang.psi.JetThisReferenceExpression;
+import org.jetbrains.kotlin.psi.JetThisReferenceExpression;
 
 public class JetThisReference extends JetSimpleReference<JetThisReferenceExpression> {
     public JetThisReference(JetThisReferenceExpression expression) {

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt

@@ -20,19 +20,19 @@ import com.intellij.psi.PsiReference
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.asJava.unwrapped
 import com.intellij.psi.PsiMethod
-import org.jetbrains.jet.lang.psi.JetPropertyAccessor
-import org.jetbrains.jet.lang.psi.JetProperty
+import org.jetbrains.kotlin.psi.JetPropertyAccessor
+import org.jetbrains.kotlin.psi.JetProperty
 import java.util.HashSet
-import org.jetbrains.jet.lang.psi.JetExpression
+import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention
-import org.jetbrains.jet.lang.psi.JetQualifiedExpression
-import org.jetbrains.jet.lang.psi.JetCallExpression
-import org.jetbrains.jet.lang.psi.JetObjectDeclaration
-import org.jetbrains.jet.lang.psi.JetClass
+import org.jetbrains.kotlin.psi.JetQualifiedExpression
+import org.jetbrains.kotlin.psi.JetCallExpression
+import org.jetbrains.kotlin.psi.JetObjectDeclaration
+import org.jetbrains.kotlin.psi.JetClass
 import com.intellij.psi.PsiPolyVariantReference
 import org.jetbrains.kotlin.utils.emptyOrSingletonList
-import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType
-import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 
 // Navigation element of the resolved reference
 // For property accessor return enclosing property

idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java

@@ -25,7 +25,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.plugin.search.usagesSearch.*;
 import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.asJava.AsJavaPackage;

idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt

@@ -17,27 +17,27 @@
 package org.jetbrains.jet.plugin.search.usagesSearch
 
 import com.intellij.psi.PsiReference
-import org.jetbrains.jet.lang.psi.JetClassOrObject
+import org.jetbrains.kotlin.psi.JetClassOrObject
 import org.jetbrains.jet.plugin.search.usagesSearch.*
 import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchFilter.*
-import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.jet.lang.psi.JetNamedFunction
+import org.jetbrains.kotlin.psi.JetProperty
+import org.jetbrains.kotlin.psi.JetNamedFunction
 import java.util.Collections
 import java.util.ArrayList
-import org.jetbrains.jet.lang.psi.JetNamedDeclaration
+import org.jetbrains.kotlin.psi.JetNamedDeclaration
 import com.intellij.psi.PsiNamedElement
 import org.jetbrains.kotlin.asJava.LightClassUtil
-import org.jetbrains.jet.lang.psi.JetParameter
-import org.jetbrains.jet.lang.psi.JetPsiUtil
+import org.jetbrains.kotlin.psi.JetParameter
+import org.jetbrains.kotlin.psi.JetPsiUtil
 import org.jetbrains.kotlin.asJava.LightClassUtil.PropertyAccessorsPsiMethods
-import org.jetbrains.jet.lang.psi.psiUtil.*
+import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.kotlin.lexer.JetSingleValueToken
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.jet.plugin.references.*
-import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.kotlin.psi.JetDeclaration
 import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.jet.plugin.caches.resolve.analyze
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt

@@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.search.usagesSearch
 
 import com.intellij.psi.PsiConstructorCall
 import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.lang.psi.*
-import org.jetbrains.jet.lang.psi.psiUtil.*
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import com.intellij.psi.PsiReference
 import org.jetbrains.jet.lang.resolve.DescriptorUtils

idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java

@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 import java.util.ArrayList;

idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java

@@ -24,7 +24,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetFile;
 
 public class JetStructureViewFactory implements PsiStructureViewFactory {
     @Override

idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java

@@ -20,8 +20,8 @@ import com.intellij.ide.structureView.StructureViewModelBase;
 import com.intellij.ide.util.treeView.smartTree.NodeProvider;
 import com.intellij.ide.util.treeView.smartTree.Sorter;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetDeclaration;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetDeclaration;
+import org.jetbrains.kotlin.psi.JetFile;
 
 import java.util.Arrays;
 import java.util.Collection;

idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt

@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext
 import java.util.ArrayList
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 import com.intellij.psi.NavigatablePsiElement
-import org.jetbrains.jet.lang.psi.JetClassOrObject
+import org.jetbrains.kotlin.psi.JetClassOrObject
 import org.jetbrains.jet.plugin.caches.resolve.analyze
 
 public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider<TreeElement>() {
@@ -61,4 +61,4 @@ public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider<Tr
 
         return children
     }
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java

@@ -30,9 +30,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.psi.JetClassInitializer;
-import org.jetbrains.jet.lang.psi.JetModifierListOwner;
-import org.jetbrains.jet.lang.psi.JetPsiUtil;
+import org.jetbrains.kotlin.psi.JetClassInitializer;
+import org.jetbrains.kotlin.psi.JetModifierListOwner;
+import org.jetbrains.kotlin.psi.JetPsiUtil;
 import org.jetbrains.jet.plugin.JetDescriptorIconProvider;
 
 import javax.swing.*;

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetAnnotationEntry;
+import org.jetbrains.kotlin.psi.JetAnnotationEntry;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetClassShortNameIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetClassOrObject;
+import org.jetbrains.kotlin.psi.JetClassOrObject;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetExactPackagesIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetFile;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetClassOrObject;
+import org.jetbrains.kotlin.psi.JetClassOrObject;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetFunctionShortNameIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetNamedFunction;
+import org.jetbrains.kotlin.psi.JetNamedFunction;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetProbablyNothingFunctionShortNameIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetNamedFunction;
+import org.jetbrains.kotlin.psi.JetNamedFunction;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetProbablyNothingPropertyShortNameIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetProperty;
+import org.jetbrains.kotlin.psi.JetProperty;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetPropertyShortNameIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetProperty;
+import org.jetbrains.kotlin.psi.JetProperty;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetClassOrObject;
+import org.jetbrains.kotlin.psi.JetClassOrObject;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelClassByPackageIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetClassOrObject;
+import org.jetbrains.kotlin.psi.JetClassOrObject;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionByPackageIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetNamedFunction;
+import org.jetbrains.kotlin.psi.JetNamedFunction;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionFqnNameIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetNamedFunction;
+import org.jetbrains.kotlin.psi.JetNamedFunction;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertyByPackageIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetProperty;
+import org.jetbrains.kotlin.psi.JetProperty;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertyFqnNameIndex.java

@@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetProperty;
+import org.jetbrains.kotlin.psi.JetProperty;
 
 import java.util.Collection;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt

@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.stubindex
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.stubs.StubIndex
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.lang.resolve.name.FqName
 import kotlin.platform.platformStatic
 import com.intellij.util.containers.MultiMap

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java

@@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.stubindex;
 
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
-import org.jetbrains.jet.lang.psi.JetClassOrObject;
-import org.jetbrains.jet.lang.psi.stubs.*;
-import org.jetbrains.jet.lang.psi.stubs.elements.StubIndexService;
+import org.jetbrains.kotlin.psi.JetClassOrObject;
+import org.jetbrains.kotlin.psi.stubs.*;
+import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.stubindex.resolve
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo
 import org.jetbrains.jet.lang.resolve.lazy.declarations.*
 import org.jetbrains.jet.lang.resolve.name.FqName

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactoryService.kt

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.stubindex.resolve
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory
 import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService
 import org.jetbrains.kotlin.storage.StorageManager

idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.stubindex.resolve
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.resolve.name.Name

idea/idea-analysis/src/org/jetbrains/jet/plugin/util/JetPsiPrecedences.kt

@@ -21,7 +21,7 @@ import com.intellij.psi.tree.IElementType
 import org.jetbrains.jet.lang.parsing.JetExpressionParsing
 import java.util.HashMap
 import org.jetbrains.jet.lang.parsing.JetExpressionParsing.Precedence.*
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.psi.*
 
 public object JetPsiPrecedences {
 

idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/KotlinAndroidGotoDeclarationHandler.java

@@ -35,7 +35,7 @@ import org.jetbrains.android.util.AndroidResourceUtil;
 import org.jetbrains.android.util.AndroidUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression;
 
 import java.util.ArrayList;
 import java.util.Collections;

idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt

@@ -19,15 +19,15 @@ package org.jetbrains.kotlin.android.navigation
 import org.jetbrains.android.util.AndroidResourceUtil
 import com.intellij.psi.PsiElement
 import org.jetbrains.android.facet.AndroidFacet
-import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.PsiClass
 import org.jetbrains.android.util.AndroidUtils
 import com.android.SdkConstants
 import org.jetbrains.android.augment.AndroidPsiElementFinder
-import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
-import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression
-import org.jetbrains.jet.lang.psi.JetExpression
+import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
+import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
+import org.jetbrains.kotlin.psi.JetExpression
 
 private fun getReferenceExpression(element: PsiElement?): JetSimpleNameExpression? {
     return PsiTreeUtil.getParentOfType<JetSimpleNameExpression>(element, javaClass<JetSimpleNameExpression>())
@@ -109,4 +109,4 @@ private fun getReceiverAsSimpleNameExpression(exp: JetSimpleNameExpression): Jet
         else -> null
     }
 
-}
+}

idea/src/META-INF/plugin.xml

@@ -133,7 +133,7 @@
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceInterface="org.jetbrains.jet.lang.psi.stubs.elements.StubIndexService"
+    <applicationService serviceInterface="org.jetbrains.kotlin.psi.stubs.elements.StubIndexService"
                         serviceImplementation="org.jetbrains.jet.plugin.stubindex.StubIndexServiceImpl"/>
 
     <applicationService serviceInterface="org.jetbrains.jet.OperationModeProvider"
@@ -148,7 +148,7 @@
     <applicationService serviceInterface="org.jetbrains.jet.plugin.quickfix.ImportInsertHelper"
                         serviceImplementation="org.jetbrains.jet.plugin.quickfix.ImportInsertHelperImpl"/>
 
-    <applicationService serviceInterface="org.jetbrains.jet.lang.psi.KotlinDeclarationNavigationPolicy"
+    <applicationService serviceInterface="org.jetbrains.kotlin.psi.KotlinDeclarationNavigationPolicy"
                         serviceImplementation="org.jetbrains.jet.plugin.decompiler.navigation.KotlinDeclarationNavigationPolicyImpl"/>
 
     <projectService serviceInterface="org.jetbrains.jet.plugin.caches.resolve.KotlinCacheService"
@@ -225,8 +225,8 @@
     <lang.foldingBuilder language="jet" implementationClass="org.jetbrains.jet.plugin.JetFoldingBuilder"/>
     <lang.formatter language="jet" implementationClass="org.jetbrains.jet.plugin.formatter.JetFormattingModelBuilder"/>
     <lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>
-    <lang.elementManipulator forClass="org.jetbrains.jet.lang.psi.JetStringTemplateExpression"
-                             implementationClass="org.jetbrains.jet.lang.psi.psiUtil.JetStringTemplateExpressionManipulator"/>
+    <lang.elementManipulator forClass="org.jetbrains.kotlin.psi.JetStringTemplateExpression"
+                             implementationClass="org.jetbrains.kotlin.psi.psiUtil.JetStringTemplateExpressionManipulator"/>
     <fileStructureGroupRuleProvider implementation="org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider"/>
     <importFilteringRule implementation="org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule"/>
     <lang.refactoringSupport language="jet" implementationClass="org.jetbrains.jet.plugin.refactoring.JetRefactoringSupportProvider"/>
@@ -348,15 +348,15 @@
                                     implementationClass="org.jetbrains.jet.plugin.ktSignature.KotlinSignatureInJavaMarkerProvider"/>
     <iconProvider implementation="org.jetbrains.jet.plugin.JetIconProvider"/>
     <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetFunctionPresenter"
-                              forClass="org.jetbrains.jet.lang.psi.JetNamedFunction"/>
+                              forClass="org.jetbrains.kotlin.psi.JetNamedFunction"/>
     <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetClassPresenter"
-                              forClass="org.jetbrains.jet.lang.psi.JetClass"/>
+                              forClass="org.jetbrains.kotlin.psi.JetClass"/>
     <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetObjectPresenter"
-                              forClass="org.jetbrains.jet.lang.psi.JetObjectDeclaration"/>
+                              forClass="org.jetbrains.kotlin.psi.JetObjectDeclaration"/>
     <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetPropertyPresenter"
-                              forClass="org.jetbrains.jet.lang.psi.JetProperty"/>
+                              forClass="org.jetbrains.kotlin.psi.JetProperty"/>
     <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetParameterPresenter"
-                              forClass="org.jetbrains.jet.lang.psi.JetParameter"/>
+                              forClass="org.jetbrains.kotlin.psi.JetParameter"/>
     <gotoTargetRendererProvider id="JetGotoTargetRenderProvider" implementation="org.jetbrains.jet.plugin.JetGotoTargetRenderProvider"
                                 order="first"/>
     <elementDescriptionProvider implementation="org.jetbrains.jet.plugin.findUsages.JetElementDescriptionProvider" order="first"/>
@@ -405,7 +405,7 @@
     <java.elementFinder implementation="org.jetbrains.kotlin.asJava.JavaElementFinder"/>
     <java.shortNamesCache implementation="org.jetbrains.jet.plugin.caches.JetShortNamesCache"/>
 
-    <stubElementTypeHolder class="org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes"/>
+    <stubElementTypeHolder class="org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes"/>
     <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetExactPackagesIndex"/>
     <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelClassByPackageIndex"/>
     <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionByPackageIndex"/>

idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java

@@ -29,9 +29,9 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
-import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.psi.JetImportDirective;
-import org.jetbrains.jet.lang.psi.JetImportList;
+import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.psi.JetImportDirective;
+import org.jetbrains.kotlin.psi.JetImportList;
 import org.jetbrains.kotlin.lexer.JetTokens;
 
 import java.util.ArrayList;