diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightEnumConstant.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt
similarity index 97%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightEnumConstant.kt
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt
index c1e692e6b70..98102f50aac 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightEnumConstant.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.asJava.light
+package org.jetbrains.jet.asJava
 
 import com.intellij.psi.*
 import org.jetbrains.jet.lang.psi.JetEnumEntry
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/KotlinLightField.java
similarity index 97%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightField.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightField.java
index 5f796f43dbd..f92068cfeb0 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/KotlinLightField.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.asJava.light;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.util.TextRange;
@@ -26,7 +26,6 @@ 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;
 
 // Copied from com.intellij.psi.impl.light.LightField
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightFieldForDeclaration.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt
similarity index 96%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightFieldForDeclaration.kt
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt
index c60893022a1..6ea7e55231a 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/KotlinLightFieldForDeclaration.kt
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.asJava.light
+package org.jetbrains.jet.asJava
 
 import com.intellij.psi.*
 import org.jetbrains.jet.lang.psi.JetProperty
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 deff54e04a4..1f949f707de 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
@@ -17,25 +17,17 @@
 package org.jetbrains.jet.asJava
 
 import com.intellij.psi.impl.light.LightMethod
-import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiMethod
-import com.intellij.psi.PsiManager
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiNamedElement
+import com.intellij.psi.*
 import org.jetbrains.jet.lang.psi.JetDeclaration
-import org.jetbrains.jet.asJava.light.LightParameterListBuilder
-import com.intellij.psi.PsiParameterList
 import org.jetbrains.jet.plugin.JetLanguage
 import kotlin.properties.Delegates
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.PsiModificationTracker
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValue
-import com.intellij.psi.PsiTypeParameterList
 import org.jetbrains.jet.lang.psi.JetPropertyAccessor
 import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
 import org.jetbrains.jet.lang.psi.JetProperty
-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
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 e3b12cbe666..38959bee54f 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
@@ -22,7 +22,6 @@ import com.intellij.psi.PsiParameter;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 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.plugin.JetLanguage;
@@ -99,4 +98,4 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
 
         return setter != null ? setter.getParameter() : null;
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
index db6bdbba0e3..11966fd13a4 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
@@ -28,8 +28,6 @@ import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.asJava.light.KotlinLightEnumConstant;
-import org.jetbrains.jet.asJava.light.KotlinLightFieldForDeclaration;
 import org.jetbrains.jet.lang.psi.*;
 
 import java.util.List;
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightParameter.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameter.java
similarity index 98%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightParameter.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameter.java
index c76cf028a60..e8f21c4c8b7 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightParameter.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.asJava.light;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.lang.Language;
 import com.intellij.psi.*;
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightParameterListBuilder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java
similarity index 98%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightParameterListBuilder.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java
index 5a391bf29f3..7931b23457f 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightParameterListBuilder.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.asJava.light;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.lang.Language;
 import com.intellij.psi.*;
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightVariableBuilder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightVariableBuilder.java
similarity index 98%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightVariableBuilder.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightVariableBuilder.java
index ba532cc7c4f..665efedb222 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/light/LightVariableBuilder.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightVariableBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.asJava.light;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.lang.Language;
 import com.intellij.navigation.NavigationItem;