diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index ac27fd5a7da..67773a4f97a 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -46,6 +46,7 @@
           <element id="module-output" name="daemon-common" />
           <element id="module-output" name="idea-repl" />
           <element id="module-output" name="idea-live-templates" />
+          <element id="module-output" name="resolution" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6a7c4e23e7d..a372392662f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -61,6 +61,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" filepath="$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/resolution/resolution.iml" filepath="$PROJECT_DIR$/compiler/resolution/resolution.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/serialization/serialization.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/temp-jdk8/temp-jdk8.iml" filepath="$PROJECT_DIR$/temp-jdk8/temp-jdk8.iml" />
@@ -68,4 +69,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 c7d2767fd14..28feac4e329 100644
--- a/build.xml
+++ b/build.xml
@@ -94,6 +94,7 @@
         <include name="compiler/conditional-preprocessor/src/"/>
         <include name="compiler/container/src"/>
         <include name="compiler/frontend/src"/>
+        <include name="compiler/resolution/src"/>
         <include name="compiler/frontend.java/src"/>
         <include name="compiler/light-classes/src"/>
         <include name="compiler/plugin-api/src"/>
@@ -113,6 +114,7 @@
     <property name="idea.out" value="${basedir}/out/production"/>
     <patternset id="compilerClassesFromIDEA.fileset">
         <include name="frontend/**"/>
+        <include name="resolution/**"/>
         <include name="container/**"/>
         <include name="descriptors/**"/>
         <include name="deserialization/**"/>
@@ -227,6 +229,7 @@
             <fileset dir="compiler/daemon/daemon-common/src"/>
             <fileset dir="compiler/container/src"/>
             <fileset dir="compiler/frontend/src"/>
+            <fileset dir="compiler/resolution/src"/>
             <fileset dir="compiler/frontend.java/src"/>
             <fileset dir="compiler/light-classes/src"/>
             <fileset dir="compiler/plugin-api/src"/>
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index 7575d3ca199..15545ccb1bf 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -14,5 +14,6 @@
     <orderEntry type="module" module-name="plugin-api" exported="" />
     <orderEntry type="module" module-name="container" exported="" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
+    <orderEntry type="module" module-name="resolution" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/resolution/resolution.iml b/compiler/resolution/resolution.iml
new file mode 100644
index 00000000000..de68b2cfa8f
--- /dev/null
+++ b/compiler/resolution/resolution.iml
@@ -0,0 +1,14 @@
+<?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="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" name="intellij-core" level="project" />
+  </component>
+</module>
\ No newline at end of file