diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
new file mode 100644
index 00000000000..ee684d78127
--- /dev/null
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -0,0 +1,19 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="KotlinPlugin">
+    <output-path>$PROJECT_DIR$/out/artifacts/KotlinPlugin</output-path>
+    <root id="archive" name="KotlinPlugin.zip">
+      <element id="directory" name="Kotlin">
+        <element id="directory" name="lib">
+          <element id="library" level="project" name="asm" />
+          <element id="archive" name="kotlin-plugin.jar">
+            <element id="module-output" name="backend" />
+            <element id="module-output" name="frontend" />
+            <element id="module-output" name="frontend.java" />
+            <element id="module-output" name="idea" />
+            <element id="module-output" name="jet.as.java.psi" />
+          </element>
+        </element>
+      </element>
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9c559c5bba1..911155cf2be 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -11,6 +11,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" />
       <module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea.iml" filepath="$PROJECT_DIR$/idea/idea.iml" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" />
       <module fileurl="file://$PROJECT_DIR$/stdlib/stdlib.iml" filepath="$PROJECT_DIR$/stdlib/stdlib.iml" />
       <module fileurl="file://$PROJECT_DIR$/testlib/testlib.iml" filepath="$PROJECT_DIR$/testlib/testlib.iml" />
     </modules>
diff --git a/compiler/jet.as.java.psi/jet.as.java.psi.iml b/compiler/jet.as.java.psi/jet.as.java.psi.iml
new file mode 100644
index 00000000000..de82ce75e19
--- /dev/null
+++ b/compiler/jet.as.java.psi/jet.as.java.psi.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="backend" />
+    <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="frontend.java" />
+  </component>
+</module>
+
diff --git a/idea/src/org/jetbrains/jet/plugin/java/ClsWrapperStubPsiFactory.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/java/ClsWrapperStubPsiFactory.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
index 9da8650a56e..56febf1699d 100644
--- a/idea/src/org/jetbrains/jet/plugin/java/ClsWrapperStubPsiFactory.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
@@ -1,7 +1,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.plugin.java;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.*;
diff --git a/idea/src/org/jetbrains/jet/plugin/java/JavaElementFinder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/java/JavaElementFinder.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
index 009ab41711d..ff190f2a1d6 100644
--- a/idea/src/org/jetbrains/jet/plugin/java/JavaElementFinder.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
@@ -1,7 +1,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.plugin.java;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.openapi.compiler.ex.CompilerPathsEx;
 import com.intellij.openapi.fileTypes.FileType;
diff --git a/idea/src/org/jetbrains/jet/plugin/java/JetCodeBlockModificationListener.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/java/JetCodeBlockModificationListener.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java
index dd26ab448c4..132cdd32757 100644
--- a/idea/src/org/jetbrains/jet/plugin/java/JetCodeBlockModificationListener.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java
@@ -1,7 +1,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.plugin.java;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.*;
@@ -14,7 +14,7 @@ import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetFile;
 
 public class JetCodeBlockModificationListener implements PsiTreeChangePreprocessor {
-    private static final Logger LOG = Logger.getInstance("#org.jetbrains.jet.plugin.java.JetCodeBlockModificationListener");
+    private static final Logger LOG = Logger.getInstance("#org.jetbrains.jet.asJava.JetCodeBlockModificationListener");
     
     private final PsiModificationTrackerImpl myModificationTracker;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/java/JetLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/java/JetLightClass.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
index d1c9036f035..5df0de584f9 100644
--- a/idea/src/org/jetbrains/jet/plugin/java/JetLightClass.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
@@ -1,7 +1,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.plugin.java;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -36,7 +36,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMarker {
-    private static final Logger LOG = Logger.getInstance("#org.jetbrains.jet.plugin.java.JetLightClass");
+    private static final Logger LOG = Logger.getInstance("#org.jetbrains.jet.asJava.JetLightClass");
     private final static Key<CachedValue<PsiJavaFileStub>> JAVA_API_STUB = Key.create("JAVA_API_STUB");
 
     private final JetFile file;
diff --git a/idea/src/org/jetbrains/jet/plugin/java/StubClassBuilder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/java/StubClassBuilder.java
rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java
index c5714910e67..20b300c6aad 100644
--- a/idea/src/org/jetbrains/jet/plugin/java/StubClassBuilder.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java
@@ -1,7 +1,7 @@
 /*
  * @author max
  */
-package org.jetbrains.jet.plugin.java;
+package org.jetbrains.jet.asJava;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.impl.compiled.InnerClassSourceStrategy;
diff --git a/idea/idea.iml b/idea/idea.iml
index ab661eff2d6..39519927146 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -22,6 +22,7 @@
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="stdlib" />
     <orderEntry type="module" module-name="compiler-tests" />
+    <orderEntry type="module" module-name="jet.as.java.psi" />
   </component>
 </module>
 
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index d5070d679f9..94428276631 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -66,8 +66,8 @@
       <codeInsight.overrideMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.OverrideMethodsHandler"/>
 
 
-      <java.elementFinder implementation="org.jetbrains.jet.plugin.java.JavaElementFinder"/>
-      <psi.treeChangePreprocessor implementation="org.jetbrains.jet.plugin.java.JetCodeBlockModificationListener"/>
+      <java.elementFinder implementation="org.jetbrains.jet.asJava.JavaElementFinder"/>
+      <psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.JetCodeBlockModificationListener"/>
 
       <toolWindow id="CodeWindow"
                   factoryClass="org.jetbrains.jet.plugin.internal.codewindow.BytecodeToolwindow$Factory"