diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt
index ad76482f254..908b21e068f 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt
@@ -18,7 +18,6 @@ package org.jetbrains.jet.asJava;
 
 import com.intellij.psi.PsiClass;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement
 import org.jetbrains.jet.lang.psi.JetClassOrObject
 
 public trait KotlinLightClass : PsiClass, KotlinLightElement<JetClassOrObject, PsiClass> {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightElement.kt
similarity index 93%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightElement.kt
index 247a9e36950..afcb2fe41db 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightElement.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightElement.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.java.jetAsJava
+package org.jetbrains.jet.asJava
 
-import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.psi.JetDeclaration
+import com.intellij.psi.PsiElement
 
 public trait KotlinLightElement<T : JetDeclaration, D : PsiElement> {
     public val origin: T?
     public val delegate: D
-}
+}
\ No newline at end of file
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightMethod.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt
similarity index 75%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightMethod.kt
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt
index af9b138e47d..2d3e346849e 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightMethod.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.java.jetAsJava;
+package org.jetbrains.jet.asJava
 
-import com.intellij.psi.PsiMethod;
-import org.jetbrains.jet.lang.psi.JetDeclaration;
+import com.intellij.psi.PsiMethod
+import org.jetbrains.jet.lang.psi.JetDeclaration
 
-/** Java method created for Kotlin declaration to make it resolvable in Java */
 public trait KotlinLightMethod: PsiMethod, KotlinLightElement<JetDeclaration, PsiMethod>
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt
index 8ba92afb914..deff54e04a4 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt
@@ -23,9 +23,7 @@ import com.intellij.psi.PsiManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
 import org.jetbrains.jet.lang.psi.JetDeclaration
-import org.jetbrains.jet.asJava.light.LightParameter
 import org.jetbrains.jet.asJava.light.LightParameterListBuilder
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod
 import com.intellij.psi.PsiParameterList
 import org.jetbrains.jet.plugin.JetLanguage
 import kotlin.properties.Delegates
@@ -41,7 +39,6 @@ import com.intellij.psi.PsiTypeParameter
 import org.jetbrains.jet.lang.psi.JetClassOrObject
 import com.intellij.psi.impl.light.LightTypeParameterListBuilder
 import com.intellij.psi.search.SearchScope
-import org.jetbrains.jet.utils.*
 
 public class KotlinLightMethodForDeclaration(
         manager: PsiManager, override val delegate: PsiMethod, override val origin: JetDeclaration, containingClass: PsiClass
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightParameter.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightParameter.java
index f639eedf905..e3b12cbe666 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightParameter.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightParameter.java
@@ -25,8 +25,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.asJava.light.LightParameter;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.plugin.JetLanguage;
 
 import java.util.List;
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java
index 7566259acdc..4ca33c4b685 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java
@@ -22,8 +22,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetTypeParameter;
 import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.plugin.JetLanguage;
 
 public class KotlinLightTypeParameter
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java
index 12b34a54677..be2064819bf 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java
@@ -40,7 +40,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.utils.KotlinVfsUtil;
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightField.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightField.java
index f13108657bd..5f796f43dbd 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightField.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightField.java
@@ -26,8 +26,8 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.asJava.KotlinLightElement;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement;
 
 // Copied from com.intellij.psi.impl.light.LightField
 public abstract class KotlinLightField<T extends JetDeclaration, D extends PsiField> extends LightElement
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt
index 9e83b878fbe..716cd910b44 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt
@@ -16,30 +16,12 @@
 
 package org.jetbrains.jet.asJava
 
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiMethod
-import org.jetbrains.jet.lang.psi.JetNamedFunction
-import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.jet.lang.psi.JetParameter
+import com.intellij.psi.*
+import org.jetbrains.jet.lang.psi.*
 import java.util.Collections
-import org.jetbrains.jet.lang.psi.JetPropertyAccessor
-import com.intellij.psi.PsiParameter
 import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
-import org.jetbrains.jet.lang.psi.JetParameterList
-import org.jetbrains.jet.lang.psi.JetClass
-import org.jetbrains.jet.lang.psi.JetTypeParameter
-import org.jetbrains.jet.lang.psi.JetDeclaration
-import org.jetbrains.jet.lang.psi.JetClassOrObject
-import com.intellij.psi.PsiTypeParameter
 import java.util.ArrayList
-import org.jetbrains.jet.lang.psi.JetTypeParameterList
-import com.intellij.psi.PsiTypeParameterListOwner
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement
-import com.intellij.psi.PsiNamedElement
-import com.intellij.psi.PsiNamedElement
-import org.jetbrains.jet.lang.psi.JetCallableDeclaration
 import org.jetbrains.jet.lang.psi.psiUtil.isExtensionDeclaration
-import com.intellij.psi.PsiClass
 
 public fun JetClassOrObject.toLightClass(): KotlinLightClass? = LightClassUtil.getPsiClass(this) as KotlinLightClass?
 
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt
index 28b02be3240..a324edeb5d8 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.caches.resolve
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement
+import org.jetbrains.jet.asJava.KotlinLightElement
 import org.jetbrains.jet.lang.psi.*
 import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.roots.LibraryOrderEntry
diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java
index 6a748585caa..0153785faf6 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java
@@ -26,12 +26,12 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.asJava.KotlinLightMethod;
 import org.jetbrains.jet.kdoc.lexer.KDocTokens;
 import org.jetbrains.jet.kdoc.psi.api.KDoc;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
index 00651e3951c..de65a1b332c 100644
--- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
+++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
@@ -25,8 +25,8 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiReference;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.asJava.KotlinLightMethod;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
 
 import java.util.ArrayList;
diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt
index 54670bde6c2..3367280ff62 100644
--- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt
+++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt
@@ -20,29 +20,11 @@ import com.intellij.ide.hierarchy.HierarchyTreeStructure
 import com.intellij.ide.hierarchy.HierarchyNodeDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.psi.JetElement
 import com.intellij.ide.hierarchy.method.MethodHierarchyNodeDescriptor
 import com.intellij.ide.hierarchy.method.MethodHierarchyTreeStructure
-import com.intellij.psi.PsiMethod
-import org.jetbrains.jet.asJava.LightClassUtil
-import org.jetbrains.jet.lang.psi.JetNamedFunction
-import org.jetbrains.jet.lang.psi.JetProperty
-import org.jetbrains.jet.lang.psi.JetParameter
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod
-import org.jetbrains.jet.plugin.search.declarationsSearch.HierarchySearchRequest
-import com.intellij.psi.search.GlobalSearchScopes
-import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.jet.plugin.search.declarationsSearch.searchOverriders
-import org.jetbrains.jet.lang.psi.JetDeclaration
 import com.intellij.util.ArrayUtil
-import org.jetbrains.jet.lang.psi.JetClassOrObject
-import com.intellij.psi.PsiClass
-import java.util.Collections
-import org.jetbrains.jet.lang.psi.JetPropertyAccessor
 import org.jetbrains.jet.asJava.toLightMethods
-import com.siyeh.ig.psiutils.CollectionUtils
 import com.intellij.util.containers.ContainerUtil
-import java.util.HashSet
 
 class KotlinOverrideTreeStructure(project: Project, val element: PsiElement) : HierarchyTreeStructure(project, null) {
     val javaTreeStructures = element.toLightMethods().map { method -> MethodHierarchyTreeStructure(project, method) };
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
index 0878275e1d8..b9793880f91 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.popup.JBPopupAdapter;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.LightweightWindowEvent;
-import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.search.searches.OverridingMethodsSearch;
@@ -39,6 +38,7 @@ import jet.runtime.typeinfo.KotlinSignature;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.asJava.AsJavaPackage;
+import org.jetbrains.jet.asJava.KotlinLightMethod;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor;
 import org.jetbrains.jet.lang.psi.*;
@@ -46,7 +46,6 @@ import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
 import org.jetbrains.jet.lang.resolve.OverrideResolver;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetKeywordToken;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java
index c39436c600f..86545e47663 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java
@@ -26,12 +26,11 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.asJava.KotlinLightMethod;
 import org.jetbrains.jet.asJava.LightClassUtil;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt
index 6ce36bb8d67..3bed97fe853 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt
@@ -23,7 +23,7 @@ import com.intellij.psi.search.SearchScope
 import org.jetbrains.jet.asJava.LightClassUtil
 import org.jetbrains.jet.lang.psi.JetNamedFunction
 import com.intellij.refactoring.rename.RenameJavaMethodProcessor
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod
+import org.jetbrains.jet.asJava.KotlinLightMethod
 import kotlin.properties.Delegates
 import org.jetbrains.jet.plugin.refactoring.runReadAction
 
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPsiProcessor.kt
index e57a2876017..2253c7f49fa 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPsiProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPsiProcessor.kt
@@ -19,8 +19,6 @@ package org.jetbrains.jet.plugin.refactoring.rename
 import com.intellij.refactoring.rename.RenamePsiElementProcessor
 import com.intellij.psi.PsiElement
 import com.intellij.usageView.UsageInfo
-import org.jetbrains.jet.lang.psi.JetNamedFunction
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod
 import org.jetbrains.jet.lang.psi.JetNamedDeclaration
 
 abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() {
diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java
index 6a30564745c..dcfe26c5222 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java
@@ -29,9 +29,9 @@ import com.intellij.util.Processor;
 import com.intellij.util.QueryExecutor;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.asJava.KotlinLightMethod;
 import org.jetbrains.jet.asJava.LightClassUtil;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 
 public class KotlinDefinitionsSearcher implements QueryExecutor<PsiElement, DefinitionsScopedSearch.SearchParameters> {
     @Override
diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
index b40894867d1..185ecef423e 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java
@@ -26,9 +26,9 @@ import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.asJava.AsJavaPackage;
+import org.jetbrains.jet.asJava.KotlinLightMethod;
 import org.jetbrains.jet.asJava.LightClassUtil;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.plugin.ProjectRootsUtil;
 import org.jetbrains.jet.plugin.search.usagesSearch.*;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt b/idea/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
index 891c9a74e94..d883905b60e 100644
--- a/idea/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
@@ -17,32 +17,19 @@
 package org.jetbrains.jet.plugin.search.usagesSearch
 
 import com.intellij.psi.PsiConstructorCall
-import com.intellij.psi.PsiElement
-import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
+import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.psi.*
 import org.jetbrains.jet.lang.psi.psiUtil.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache
 import com.intellij.psi.PsiReference
-import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
-import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
-import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import org.jetbrains.jet.plugin.findUsages.JetUsageTypeProvider
 import com.intellij.usages.impl.rules.UsageType
 import org.jetbrains.jet.codegen.PropertyCodegen
-import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod
-import org.jetbrains.jet.asJava.unwrapped
+import org.jetbrains.jet.asJava.KotlinLightMethod
 import org.jetbrains.jet.lang.resolve.OverrideResolver
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
-import com.intellij.util.containers.ContainerUtil
-import org.jetbrains.jet.plugin.references.JetMultiReference
-import java.util.HashSet
-import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
-import org.jetbrains.jet.plugin.references.JetReference
-import com.intellij.psi.PsiMethod
 import org.jetbrains.jet.plugin.references.*
 
 val JetDeclaration.descriptor: DeclarationDescriptor?
diff --git a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java
index 6f42c0b2b22..ea87b7e588d 100644
--- a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java
@@ -22,10 +22,10 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.asJava.KotlinLightClass;
+import org.jetbrains.jet.asJava.KotlinLightMethod;
 import org.jetbrains.jet.asJava.LightClassUtil;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
index bd1a231eab5..d176afc09ac 100644
--- a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
@@ -24,7 +24,7 @@ import com.intellij.psi.CommonClassNames.*
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.jet.lang.types.lang.PrimitiveType
 import org.jetbrains.jet.j2k.*
-import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod
+import org.jetbrains.jet.asJava.KotlinLightMethod
 import org.jetbrains.jet.lang.psi.JetProperty
 import org.jetbrains.jet.lang.psi.JetFunction
 import org.jetbrains.jet.lang.psi.JetClassOrObject