diff --git a/.idea/artifacts/IdeLazyResolver.xml b/.idea/artifacts/IdeLazyResolver.xml
index 3bda3717522..855b18a9b2f 100644
--- a/.idea/artifacts/IdeLazyResolver.xml
+++ b/.idea/artifacts/IdeLazyResolver.xml
@@ -1,9 +1,9 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="IdeLazyResolver">
-    <output-path>$PROJECT_DIR$/out/artifacts/IdeLazyResolver</output-path>
-    <root id="archive" name="ide-lazy-resolver.jar">
-      <element id="module-output" name="ide-lazy-resolve" />
-      <element id="dir-copy" path="$PROJECT_DIR$/idea/ide-lazy-resolve" />
+    <output-path>$PROJECT_DIR$/out/artifacts/internal/</output-path>
+    <root id="archive" name="kotlin-ide-common.jar">
+      <element id="module-output" name="ide-common" />
+      <element id="dir-copy" path="$PROJECT_DIR$/idea/ide-common" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 63f418c7a17..482d04c2737 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -29,7 +29,7 @@
           </element>
           <element id="module-output" name="eval4j" />
           <element id="module-output" name="idea-analysis" />
-          <element id="module-output" name="ide-lazy-resolve" />
+          <element id="module-output" name="ide-common" />
           <element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
           <element id="module-output" name="kotlin-android-plugin" />
         </element>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8e067d9c71a..fc7cd87891f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -22,8 +22,8 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
       <module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/idea/ide-common/ide-common.iml" filepath="$PROJECT_DIR$/idea/ide-common/ide-common.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/ide-compiler-runner/ide-compiler-runner.iml" filepath="$PROJECT_DIR$/ide-compiler-runner/ide-compiler-runner.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/ide-lazy-resolve/ide-lazy-resolve.iml" filepath="$PROJECT_DIR$/idea/ide-lazy-resolve/ide-lazy-resolve.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea.iml" filepath="$PROJECT_DIR$/idea/idea.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" filepath="$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea_runner/idea_runner.iml" filepath="$PROJECT_DIR$/idea_runner/idea_runner.iml" group="ide" />
@@ -48,5 +48,4 @@
       <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index e5430268c02..b507a1937e2 100644
--- a/build.xml
+++ b/build.xml
@@ -692,7 +692,7 @@
                 source="${java.target}" target="${java.target}">
             <withKotlin externalannotations="${external.annotations.path}"/>
             <src>
-                <dirset dir="${basedir}/idea/ide-lazy-resolve">
+                <dirset dir="${basedir}/idea/ide-common">
                     <include name="src"/>
                 </dirset>
                 <dirset dir="${basedir}/idea/idea-analysis">
@@ -768,7 +768,7 @@
         <fileset dir="js/js.frontend/src"/>
         <fileset dir="js/js.inliner/src"/>
         <fileset dir="idea/idea-analysis/src"/>
-        <fileset dir="idea/ide-lazy-resolve/src"/>
+        <fileset dir="idea/ide-common/src"/>
 
         <manifest>
           <attribute name="Built-By" value="${manifest.impl.vendor}"/>
diff --git a/idea/ide-lazy-resolve/ide-lazy-resolve.iml b/idea/ide-common/ide-common.iml
similarity index 85%
rename from idea/ide-lazy-resolve/ide-lazy-resolve.iml
rename to idea/ide-common/ide-common.iml
index 93933256e46..616a31aae0a 100644
--- a/idea/ide-lazy-resolve/ide-lazy-resolve.iml
+++ b/idea/ide-common/ide-common.iml
@@ -17,9 +17,9 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="intellij-core-analysis" level="project" />
     <orderEntry type="library" name="guava" level="project" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="frontend.java" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/idea/ide-lazy-resolve/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java
similarity index 100%
rename from idea/ide-lazy-resolve/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java
rename to idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java
diff --git a/idea/idea-analysis/idea-analysis.iml b/idea/idea-analysis/idea-analysis.iml
index 9533d1a34a3..be0c00381fa 100644
--- a/idea/idea-analysis/idea-analysis.iml
+++ b/idea/idea-analysis/idea-analysis.iml
@@ -32,7 +32,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" name="trove4j" level="project" />
-    <orderEntry type="module" module-name="ide-lazy-resolve" exported="" />
+    <orderEntry type="module" module-name="ide-common" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file