diff --git a/.gitignore b/.gitignore
index 5f368b9690d..65d14941cb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /dist
 /gh-pages
 /ideaSDK
+/clionSDK
 /android-studio/sdk
 out/
 /tmp
@@ -23,4 +24,11 @@ build/
 !**/src/**/build
 *.iml
 !**/test/**/build
-
+.idea/modules.xml
+.idea/libraries/Gradle*.xml
+.idea/modules
+.idea/modules.xml
+.idea/gradle.xml
+.idea/compiler.xml
+.idea/inspectionProfiles/profiles_settings.xml
+.idea/.name
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 3e7d3e5d71f..00000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-kotlin gradle
\ No newline at end of file
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 89b5c746b88..34a06d733e0 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -29,7 +29,6 @@
           <element id="module-output" name="preloader" />
           <element id="module-output" name="deserialization" />
           <element id="module-output" name="backend-common" />
-          <element id="library" level="project" name="builtins" />
           <element id="module-output" name="js.ast" />
           <element id="directory" name="kotlin">
             <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/kotlin" />
@@ -65,11 +64,9 @@
           <element id="module-output" name="idea-gradle" />
           <element id="module-output" name="idea-jvm" />
         </element>
-        <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">
           <element id="artifact" artifact-name="KotlinJpsPlugin" />
         </element>
-        <element id="library" level="project" name="markdown" />
         <element id="archive" name="android-extensions-ide.jar">
           <element id="module-output" name="android-extensions-idea" />
         </element>
@@ -106,12 +103,6 @@
         <element id="archive" name="kotlin-gradle-tooling.jar">
           <element id="module-output" name="kotlin-gradle-tooling" />
         </element>
-        <element id="library" level="project" name="kotlinx-coroutines-core" />
-        <element id="library" level="project" name="javaslang" />
-        <element id="library" level="project" name="kotlinx-coroutines-jdk8" />
-        <element id="archive" name="kapt-idea.jar">
-          <element id="module-output" name="kapt3-idea" />
-        </element>
       </element>
       <element id="directory" name="kotlinc">
         <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index f84a1adbcfb..00000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel>
-      <module name="allopen-cli_main" target="1.8" />
-      <module name="allopen-cli_test" target="1.8" />
-      <module name="allopen-ide_main" target="1.8" />
-      <module name="allopen-ide_test" target="1.8" />
-      <module name="android-extensions-compiler_main" target="1.8" />
-      <module name="android-extensions-compiler_test" target="1.8" />
-      <module name="android-extensions-idea_main" target="1.8" />
-      <module name="android-extensions-idea_test" target="1.8" />
-      <module name="android-extensions-jps_main" target="1.8" />
-      <module name="android-extensions-jps_test" target="1.8" />
-      <module name="android-lint_main" target="1.8" />
-      <module name="android-lint_test" target="1.8" />
-      <module name="android-tests_main" target="1.8" />
-      <module name="android-tests_test" target="1.8" />
-      <module name="annotation-based-compiler-plugins-ide-support_main" target="1.8" />
-      <module name="annotation-based-compiler-plugins-ide-support_test" target="1.8" />
-      <module name="annotation-processor-example_main" target="1.8" />
-      <module name="annotation-processor-example_test" target="1.8" />
-      <module name="ant_main" target="1.8" />
-      <module name="ant_test" target="1.8" />
-      <module name="backend-common_main" target="1.8" />
-      <module name="backend-common_test" target="1.8" />
-      <module name="backend_main" target="1.8" />
-      <module name="backend_test" target="1.8" />
-      <module name="binary-compatibility-validator_main" target="1.8" />
-      <module name="binary-compatibility-validator_test" target="1.8" />
-      <module name="build-common_main" target="1.8" />
-      <module name="build-common_test" target="1.8" />
-      <module name="buildSrc_main" target="1.8" />
-      <module name="buildSrc_test" target="1.8" />
-      <module name="builtins_main" target="1.8" />
-      <module name="builtins_test" target="1.8" />
-      <module name="cli-common_main" target="1.8" />
-      <module name="cli-common_test" target="1.8" />
-      <module name="cli-runner_main" target="1.8" />
-      <module name="cli-runner_test" target="1.8" />
-      <module name="cli_main" target="1.8" />
-      <module name="cli_test" target="1.8" />
-      <module name="compiler-client-embeddable_main" target="1.8" />
-      <module name="compiler-client-embeddable_test" target="1.8" />
-      <module name="compiler-runner_main" target="1.8" />
-      <module name="compiler-runner_test" target="1.8" />
-      <module name="compiler.tests-common_main" target="1.8" />
-      <module name="compiler.tests-common_test" target="1.8" />
-      <module name="compiler_main" target="1.8" />
-      <module name="compiler_test" target="1.8" />
-      <module name="container_main" target="1.8" />
-      <module name="container_test" target="1.8" />
-      <module name="core_main" target="1.8" />
-      <module name="core_test" target="1.8" />
-      <module name="daemon-client_main" target="1.8" />
-      <module name="daemon-client_test" target="1.8" />
-      <module name="daemon-common_main" target="1.8" />
-      <module name="daemon-common_test" target="1.8" />
-      <module name="eval4j_main" target="1.8" />
-      <module name="eval4j_test" target="1.8" />
-      <module name="frontend.java_main" target="1.8" />
-      <module name="frontend.java_test" target="1.8" />
-      <module name="frontend.script_main" target="1.8" />
-      <module name="frontend.script_test" target="1.8" />
-      <module name="frontend_main" target="1.8" />
-      <module name="frontend_test" target="1.8" />
-      <module name="generators_main" target="1.8" />
-      <module name="generators_test" target="1.8" />
-      <module name="ide-common_main" target="1.8" />
-      <module name="ide-common_test" target="1.8" />
-      <module name="ide-lazy-resolver_main" target="1.8" />
-      <module name="ide-lazy-resolver_test" target="1.8" />
-      <module name="idea-android-output-parser_main" target="1.8" />
-      <module name="idea-android-output-parser_test" target="1.8" />
-      <module name="idea-android_main" target="1.8" />
-      <module name="idea-android_test" target="1.8" />
-      <module name="idea-core_main" target="1.8" />
-      <module name="idea-core_test" target="1.8" />
-      <module name="idea-formatter_main" target="1.8" />
-      <module name="idea-formatter_test" target="1.8" />
-      <module name="idea-jps-common_main" target="1.8" />
-      <module name="idea-jps-common_test" target="1.8" />
-      <module name="idea-test-framework_main" target="1.8" />
-      <module name="idea-test-framework_test" target="1.8" />
-      <module name="idea_main" target="1.8" />
-      <module name="idea_test" target="1.8" />
-      <module name="incremental-compilation-impl_main" target="1.8" />
-      <module name="incremental-compilation-impl_test" target="1.8" />
-      <module name="ir.ir2cfg_main" target="1.8" />
-      <module name="ir.ir2cfg_test" target="1.8" />
-      <module name="ir.psi2ir_main" target="1.8" />
-      <module name="ir.psi2ir_test" target="1.8" />
-      <module name="ir.tree_main" target="1.8" />
-      <module name="ir.tree_test" target="1.8" />
-      <module name="j2k_main" target="1.8" />
-      <module name="j2k_test" target="1.8" />
-      <module name="js.ast_main" target="1.8" />
-      <module name="js.ast_test" target="1.8" />
-      <module name="js.dce_main" target="1.8" />
-      <module name="js.dce_test" target="1.8" />
-      <module name="js.frontend_main" target="1.8" />
-      <module name="js.frontend_test" target="1.8" />
-      <module name="js.parser_main" target="1.8" />
-      <module name="js.parser_test" target="1.8" />
-      <module name="js.serializer_main" target="1.8" />
-      <module name="js.serializer_test" target="1.8" />
-      <module name="js.tests_main" target="1.8" />
-      <module name="js.tests_test" target="1.8" />
-      <module name="js.translator_main" target="1.8" />
-      <module name="js.translator_test" target="1.8" />
-      <module name="kapt3_main" target="1.8" />
-      <module name="kapt3_test" target="1.8" />
-      <module name="kotlin-allopen_main" target="1.8" />
-      <module name="kotlin-allopen_test" target="1.8" />
-      <module name="kotlin-annotation-processing_main" target="1.8" />
-      <module name="kotlin-annotation-processing_test" target="1.8" />
-      <module name="kotlin-gradle-plugin-api_main" target="1.8" />
-      <module name="kotlin-gradle-plugin-api_test" target="1.8" />
-      <module name="kotlin-gradle-plugin-integration-tests_main" target="1.8" />
-      <module name="kotlin-gradle-plugin-integration-tests_test" target="1.8" />
-      <module name="kotlin-gradle-plugin_agp25" target="1.8" />
-      <module name="kotlin-gradle-plugin_main" target="1.8" />
-      <module name="kotlin-gradle-plugin_test" target="1.8" />
-      <module name="kotlin-gradle-subplugin-example_main" target="1.8" />
-      <module name="kotlin-gradle-subplugin-example_test" target="1.8" />
-      <module name="kotlin-gradle-tooling_main" target="1.8" />
-      <module name="kotlin-gradle-tooling_test" target="1.8" />
-      <module name="kotlin-jps-plugin_main" target="1.8" />
-      <module name="kotlin-jps-plugin_test" target="1.8" />
-      <module name="kotlin-noarg_main" target="1.8" />
-      <module name="kotlin-noarg_test" target="1.8" />
-      <module name="kotlin-reflect_main" target="1.6" />
-      <module name="kotlin-reflect_test" target="1.6" />
-      <module name="kotlin-runtime_main" target="1.6" />
-      <module name="kotlin-runtime_test" target="1.6" />
-      <module name="kotlin-sam-with-receiver_main" target="1.8" />
-      <module name="kotlin-sam-with-receiver_test" target="1.8" />
-      <module name="kotlin-script-runtime_main" target="1.6" />
-      <module name="kotlin-script-runtime_test" target="1.6" />
-      <module name="kotlin-stdlib-common_main" target="1.8" />
-      <module name="kotlin-stdlib-common_test" target="1.8" />
-      <module name="kotlin-stdlib-gen_main" target="1.8" />
-      <module name="kotlin-stdlib-gen_test" target="1.8" />
-      <module name="kotlin-stdlib-jre7_main" target="1.6" />
-      <module name="kotlin-stdlib-jre7_test" target="1.6" />
-      <module name="kotlin-stdlib-jre8_main" target="1.6" />
-      <module name="kotlin-stdlib-jre8_test" target="1.6" />
-      <module name="kotlin-stdlib-js-merger_main" target="1.8" />
-      <module name="kotlin-stdlib-js-merger_test" target="1.8" />
-      <module name="kotlin-stdlib-js_builtins" target="1.8" />
-      <module name="kotlin-stdlib-js_main" target="1.8" />
-      <module name="kotlin-stdlib-js_test" target="1.8" />
-      <module name="kotlin-stdlib_annotations" target="1.6" />
-      <module name="kotlin-stdlib_builtins" target="1.6" />
-      <module name="kotlin-stdlib_main" target="1.6" />
-      <module name="kotlin-stdlib_test" target="1.6" />
-      <module name="kotlin-test-common_main" target="1.8" />
-      <module name="kotlin-test-common_test" target="1.8" />
-      <module name="kotlin-test-js_main" target="1.8" />
-      <module name="kotlin-test-js_test" target="1.8" />
-      <module name="kotlin-test-junit_main" target="1.6" />
-      <module name="kotlin-test-junit_test" target="1.6" />
-      <module name="kotlin-test-jvm_main" target="1.6" />
-      <module name="kotlin-test-jvm_test" target="1.6" />
-      <module name="kotlin_main" target="1.8" />
-      <module name="kotlin_test" target="1.8" />
-      <module name="light-classes_main" target="1.8" />
-      <module name="light-classes_test" target="1.8" />
-      <module name="lint_main" target="1.8" />
-      <module name="lint_test" target="1.8" />
-      <module name="mock-runtime-for-test_main" target="1.8" />
-      <module name="mock-runtime-for-test_test" target="1.8" />
-      <module name="noarg-cli_main" target="1.8" />
-      <module name="noarg-cli_test" target="1.8" />
-      <module name="noarg-ide_main" target="1.8" />
-      <module name="noarg-ide_test" target="1.8" />
-      <module name="plugin-api_main" target="1.8" />
-      <module name="plugin-api_test" target="1.8" />
-      <module name="plugins-tests_main" target="1.8" />
-      <module name="plugins-tests_test" target="1.8" />
-      <module name="preloader_main" target="1.8" />
-      <module name="preloader_test" target="1.8" />
-      <module name="prepare-formatter_main" target="1.8" />
-      <module name="prepare-formatter_test" target="1.8" />
-      <module name="prepare-jps-plugin_main" target="1.8" />
-      <module name="prepare-jps-plugin_test" target="1.8" />
-      <module name="reflection.jvm_main" target="1.8" />
-      <module name="reflection.jvm_test" target="1.8" />
-      <module name="resolution_main" target="1.8" />
-      <module name="resolution_test" target="1.8" />
-      <module name="sam-with-receiver-cli_main" target="1.8" />
-      <module name="sam-with-receiver-cli_test" target="1.8" />
-      <module name="sam-with-receiver-ide_main" target="1.8" />
-      <module name="sam-with-receiver-ide_test" target="1.8" />
-      <module name="samples_main" target="1.8" />
-      <module name="samples_test" target="1.8" />
-      <module name="script.runtime_main" target="1.8" />
-      <module name="script.runtime_test" target="1.8" />
-      <module name="serialization_main" target="1.8" />
-      <module name="serialization_test" target="1.8" />
-      <module name="source-sections-compiler_main" target="1.8" />
-      <module name="source-sections-compiler_test" target="1.8" />
-      <module name="tests-java8_main" target="1.8" />
-      <module name="tests-java8_test" target="1.8" />
-      <module name="uast-kotlin-idea_main" target="1.8" />
-      <module name="uast-kotlin-idea_test" target="1.8" />
-      <module name="uast-kotlin_main" target="1.8" />
-      <module name="uast-kotlin_test" target="1.8" />
-      <module name="util.runtime_main" target="1.8" />
-      <module name="util.runtime_test" target="1.8" />
-      <module name="util_main" target="1.8" />
-      <module name="util_test" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index e90b1ddc105..1010bfbd321 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Kotlin2JsCompilerArguments">
-    <option name="sourceMapPrefix" value="" />
-    <option name="sourceMapEmbedSources" value="inlining" />
+    <option name="sourceMapEmbedSources" />
+    <option name="sourceMapPrefix" />
   </component>
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="1.8" />
   </component>
+  <component name="KotlinCommonCompilerArguments">
+    <option name="errors">
+      <ArgumentParseErrors />
+    </option>
+  </component>
   <component name="KotlinCompilerSettings">
     <option name="additionalArguments" value="-version -Xallow-kotlin-package -Xskip-metadata-version-check" />
   </component>
diff --git a/.idea/libraries/builtins.xml b/.idea/libraries/builtins.xml
deleted file mode 100644
index 840a804dcbb..00000000000
--- a/.idea/libraries/builtins.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="builtins">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/dist/builtins" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/javaslang.xml b/.idea/libraries/javaslang.xml
deleted file mode 100644
index eb6d0490a08..00000000000
--- a/.idea/libraries/javaslang.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="javaslang">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/javaslang-2.0.6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/javaslang-2.0.6-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/javax_inject.xml b/.idea/libraries/javax_inject.xml
deleted file mode 100644
index 19231028824..00000000000
--- a/.idea/libraries/javax_inject.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="javax.inject">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/javax.inject.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/javax.inject-src.zip!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinx_coroutines_core.xml b/.idea/libraries/kotlinx_coroutines_core.xml
deleted file mode 100644
index 6982ee33904..00000000000
--- a/.idea/libraries/kotlinx_coroutines_core.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="kotlinx-coroutines-core">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-core.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-core-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinx_coroutines_jdk8.xml b/.idea/libraries/kotlinx_coroutines_jdk8.xml
deleted file mode 100644
index f6a74dbb003..00000000000
--- a/.idea/libraries/kotlinx_coroutines_jdk8.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="kotlinx-coroutines-jdk8">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-jdk8.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/kotlinx-coroutines-jdk8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/markdown.xml b/.idea/libraries/markdown.xml
deleted file mode 100644
index 5fbeaedaec3..00000000000
--- a/.idea/libraries/markdown.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="markdown">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/markdown.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 1e6d1ac1a68..00000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/allopen/allopen-cli/allopen-cli.iml" filepath="$PROJECT_DIR$/plugins/allopen/allopen-cli/allopen-cli.iml" group="plugins/allopen" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/allopen/allopen-ide/allopen-ide.iml" filepath="$PROJECT_DIR$/plugins/allopen/allopen-ide/allopen-ide.iml" group="plugins/allopen" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/lint/android-annotations/android-annotations.iml" filepath="$PROJECT_DIR$/plugins/lint/android-annotations/android-annotations.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml" group="plugins/android-extensions" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml" group="plugins/android-extensions" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml" group="plugins/android-extensions" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml" group="plugins/android-extensions" />
-      <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml" filepath="$PROJECT_DIR$/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" filepath="$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/ant/ant.iml" filepath="$PROJECT_DIR$/ant/ant.iml" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/ir/backend.common/backend.common.iml" filepath="$PROJECT_DIR$/compiler/ir/backend.common/backend.common.iml" group="compiler/ir" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/ir/backend.jvm/backend.jvm.iml" filepath="$PROJECT_DIR$/compiler/ir/backend.jvm/backend.jvm.iml" group="compiler/ir" />
-      <module fileurl="file://$PROJECT_DIR$/build-common/build-common.iml" filepath="$PROJECT_DIR$/build-common/build-common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/core/builtins/builtins.iml" filepath="$PROJECT_DIR$/core/builtins/builtins.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" group="compiler/cli" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" group="compiler/cli" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/compiler-runner/compiler-runner.iml" filepath="$PROJECT_DIR$/compiler/compiler-runner/compiler-runner.iml" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/tests-java8/compiler-tests-java8.iml" filepath="$PROJECT_DIR$/compiler/tests-java8/compiler-tests-java8.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" filepath="$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/container/container.iml" filepath="$PROJECT_DIR$/compiler/container/container.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon.iml" group="compiler/daemon" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon-client/daemon-client.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon-client/daemon-client.iml" group="compiler/daemon" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/daemon/daemon-common/daemon-common.iml" filepath="$PROJECT_DIR$/compiler/daemon/daemon-common/daemon-common.iml" group="compiler/daemon" />
-      <module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" filepath="$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/deserialization/deserialization.iml" filepath="$PROJECT_DIR$/core/deserialization/deserialization.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/formatter/formatter.iml" filepath="$PROJECT_DIR$/idea/formatter/formatter.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" />
-      <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$/compiler/frontend.script/frontend.script.iml" filepath="$PROJECT_DIR$/compiler/frontend.script/frontend.script.iml" group="compiler" />
-      <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$/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/idea-android/idea-android.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" filepath="$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-gradle/idea-gradle.iml" filepath="$PROJECT_DIR$/idea/idea-gradle/idea-gradle.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-jvm/idea-jvm.iml" filepath="$PROJECT_DIR$/idea/idea-jvm/idea-jvm.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-live-templates/idea-live-templates.iml" filepath="$PROJECT_DIR$/idea/idea-live-templates/idea-live-templates.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-maven/idea-maven.iml" filepath="$PROJECT_DIR$/idea/idea-maven/idea-maven.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/incremental-compilation-impl/incremental-compilation-impl.iml" filepath="$PROJECT_DIR$/compiler/incremental-compilation-impl/incremental-compilation-impl.iml" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.ir2cfg/ir.ir2cfg.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.ir2cfg/ir.ir2cfg.iml" group="compiler/ir" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.psi2ir/ir.psi2ir.iml" group="compiler/ir" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" filepath="$PROJECT_DIR$/compiler/ir/ir.tree/ir.tree.iml" group="compiler/ir" />
-      <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/javac-wrapper/javac-wrapper.iml" filepath="$PROJECT_DIR$/compiler/javac-wrapper/javac-wrapper.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-tests/jps-tests.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-tests/jps-tests.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.ast/js.ast.iml" filepath="$PROJECT_DIR$/js/js.ast/js.ast.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.dce/js.dce.iml" filepath="$PROJECT_DIR$/js/js.dce/js.dce.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.frontend/js.frontend.iml" filepath="$PROJECT_DIR$/js/js.frontend/js.frontend.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.inliner/js.inliner.iml" filepath="$PROJECT_DIR$/js/js.inliner/js.inliner.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.parser/js.parser.iml" filepath="$PROJECT_DIR$/js/js.parser/js.parser.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.serializer/js.serializer.iml" filepath="$PROJECT_DIR$/js/js.serializer/js.serializer.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" group="compiler/js" />
-      <module fileurl="file://$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" filepath="$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/kapt3/kapt3.iml" filepath="$PROJECT_DIR$/plugins/kapt3/kapt3.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/kapt3-idea/kapt3-idea.iml" filepath="$PROJECT_DIR$/plugins/kapt3-idea/kapt3-idea.iml" />
-      <module fileurl="file://$PROJECT_DIR$/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml" filepath="$PROJECT_DIR$/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/light-classes/light-classes.iml" filepath="$PROJECT_DIR$/compiler/light-classes/light-classes.iml" group="compiler/java" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-api/lint-api.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-api/lint-api.iml" group="plugins/lint" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-checks/lint-checks.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-checks/lint-checks.iml" group="plugins/lint" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/lint/lint-idea/lint-idea.iml" filepath="$PROJECT_DIR$/plugins/lint/lint-idea/lint-idea.iml" group="plugins/lint" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/noarg/noarg-cli/noarg-cli.iml" filepath="$PROJECT_DIR$/plugins/noarg/noarg-cli/noarg-cli.iml" group="plugins/noarg" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/noarg/noarg-ide/noarg-ide.iml" filepath="$PROJECT_DIR$/plugins/noarg/noarg-ide/noarg-ide.iml" group="plugins/noarg" />
-      <module fileurl="file://$PROJECT_DIR$/non-compiler-tests/non-compiler-tests.iml" filepath="$PROJECT_DIR$/non-compiler-tests/non-compiler-tests.iml" />
-      <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$/plugins/plugins-tests/plugins-tests.iml" filepath="$PROJECT_DIR$/plugins/plugins-tests/plugins-tests.iml" group="plugins" />
-      <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$/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml" filepath="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml" group="plugins/sam-with-receiver" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml" filepath="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml" group="plugins/sam-with-receiver" />
-      <module fileurl="file://$PROJECT_DIR$/core/script.runtime/script.runtime.iml" filepath="$PROJECT_DIR$/core/script.runtime/script.runtime.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$/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml" filepath="$PROJECT_DIR$/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/tests-common/tests-common.iml" filepath="$PROJECT_DIR$/compiler/tests-common/tests-common.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/tests-ir-jvm/tests-ir-jvm.iml" filepath="$PROJECT_DIR$/compiler/tests-ir-jvm/tests-ir-jvm.iml" group="compiler/ir" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/uast-kotlin/uast-kotlin.iml" filepath="$PROJECT_DIR$/plugins/uast-kotlin/uast-kotlin.iml" group="plugins/lint" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/uast-kotlin-idea/uast-kotlin-idea.iml" filepath="$PROJECT_DIR$/plugins/uast-kotlin-idea/uast-kotlin-idea.iml" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
-      <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>
\ No newline at end of file
diff --git a/Kotlin.iml b/Kotlin.iml
deleted file mode 100644
index 55f858484e3..00000000000
--- a/Kotlin.iml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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$/resources" isTestSource="false" />
-      <excludeFolder url="$MODULE_DIR$/libraries/out" />
-      <excludeFolder url="file://$MODULE_DIR$/android.tests.dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/dist" />
-      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/androidSDK" />
-      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/config" />
-      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/config-idea" />
-      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system" />
-      <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system-idea" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/annotation-processor-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/browser-example-with-library/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/browser-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/js-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-gradle-subplugin-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-java-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-js-library-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-jsr223-daemon-local-eval-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-jsr223-local-example/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/common/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/js/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/js/it/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/js/it/node_modules" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/junit/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin.test/jvm/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/common/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/jre7/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/jre8/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/js/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/stdlib/js/node_modules" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/binary-compatibility-validator/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/gradle-tools/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/idl2k/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-allopen/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-allopen/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-android-extensions/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-annotation-processing-maven/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-annotation-processing/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-build-common-test/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler-client-embeddable-test/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler-client-embeddable/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler-embeddable/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler-runner/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-compiler/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-daemon-client/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-api/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-api/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-integration-tests/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin-integration-tests/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin/local-repo" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-gradle-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-allopen/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-noarg/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin-test/local-repo" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin-test/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/local-repo" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-noarg/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-noarg/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-osgi-bundle/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-reflect/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-sam-with-receiver-compiler-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-script-util/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-source-sections-compiler-plugin/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-stdlib-gen/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/maven-archetypes/kotlin-archetype-js/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/maven-archetypes/kotlin-archetype-jvm/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/native-platform/target" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/protobuf-lite/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/runtime/build" />
-      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/script-runtime/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/ant/ant.iml b/ant/ant.iml
deleted file mode 100644
index ef08453f50e..00000000000
--- a/ant/ant.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="library" name="ant" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="preloader" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/build-common/build-common.iml b/build-common/build-common.iml
deleted file mode 100644
index 2f861d68f12..00000000000
--- a/build-common/build-common.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="js.frontend" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/android-tests/android-module/android-module.iml b/compiler/android-tests/android-module/android-module.iml
deleted file mode 100644
index 19dbd15d44e..00000000000
--- a/compiler/android-tests/android-module/android-module.iml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/android-tests/android-tests.iml b/compiler/android-tests/android-tests.iml
deleted file mode 100644
index c79988410a0..00000000000
--- a/compiler/android-tests/android-tests.iml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="tests-common" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="library" name="jps-test" level="project" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="descriptor.loader.java" scope="TEST" />
-    <orderEntry type="module" module-name="frontend.java" scope="TEST" />
-    <orderEntry type="module" module-name="jps-tests" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/backend-common/backend-common.iml b/compiler/backend-common/backend-common.iml
deleted file mode 100644
index 0e3a740b14d..00000000000
--- a/compiler/backend-common/backend-common.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="frontend" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
deleted file mode 100644
index 0a5e4d1a810..00000000000
--- a/compiler/backend/backend.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="backend-common" exported="" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/builtins-serializer/builtins-serializer.iml b/compiler/builtins-serializer/builtins-serializer.iml
deleted file mode 100644
index 1af900f1cbe..00000000000
--- a/compiler/builtins-serializer/builtins-serializer.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/cli/cli-common/cli-common.iml b/compiler/cli/cli-common/cli-common.iml
deleted file mode 100644
index 546275c3c54..00000000000
--- a/compiler/cli/cli-common/cli-common.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="util" />
-    <orderEntry type="library" name="jps" level="project" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="frontend.script" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/cli/cli-runner/cli-runner.iml b/compiler/cli/cli-runner/cli-runner.iml
deleted file mode 100644
index c1303b33ab0..00000000000
--- a/compiler/cli/cli-runner/cli-runner.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
deleted file mode 100644
index 7cdbb89daca..00000000000
--- a/compiler/cli/cli.iml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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="backend" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="plugin-api" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="library" name="jansi" level="project" />
-    <orderEntry type="library" name="jline" level="project" />
-    <orderEntry type="module" module-name="cli-common" exported="" />
-    <orderEntry type="module" module-name="backend-common" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="annotation-collector" />
-    <orderEntry type="module" module-name="frontend.script" />
-    <orderEntry type="module" module-name="javac-wrapper" />
-    <orderEntry type="module" module-name="js.dce" />
-    <orderEntry type="module" module-name="backend.jvm" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/compiler-runner/compiler-runner.iml b/compiler/compiler-runner/compiler-runner.iml
deleted file mode 100644
index 7d416137387..00000000000
--- a/compiler/compiler-runner/compiler-runner.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="build-common" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="daemon-client" />
-    <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="preloader" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/conditional-preprocessor/conditional-preprocessor.iml b/compiler/conditional-preprocessor/conditional-preprocessor.iml
deleted file mode 100644
index e1d23a84a21..00000000000
--- a/compiler/conditional-preprocessor/conditional-preprocessor.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="util" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="frontend" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/container/container.iml b/compiler/container/container.iml
deleted file mode 100644
index a3cf4067c6c..00000000000
--- a/compiler/container/container.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/../../core/container/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" exported="" name="javax.inject" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="util.runtime" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/daemon/daemon-client/daemon-client.iml b/compiler/daemon/daemon-client/daemon-client.iml
deleted file mode 100644
index a8aed225985..00000000000
--- a/compiler/daemon/daemon-client/daemon-client.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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="daemon-common" scope="PROVIDED" />
-    <orderEntry type="module" module-name="util" scope="PROVIDED" />
-    <orderEntry type="module" module-name="util.runtime" scope="PROVIDED" />
-    <orderEntry type="library" scope="PROVIDED" name="native-platform-uberjar" level="project" />
-    <orderEntry type="module" module-name="cli-common" scope="PROVIDED" />
-    <orderEntry type="module" module-name="descriptors" scope="PROVIDED" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/daemon/daemon-common/daemon-common.iml b/compiler/daemon/daemon-common/daemon-common.iml
deleted file mode 100644
index 9f464abc4b7..00000000000
--- a/compiler/daemon/daemon-common/daemon-common.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="cli-common" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="descriptors" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/daemon/daemon.iml b/compiler/daemon/daemon.iml
deleted file mode 100644
index f11e4dd0815..00000000000
--- a/compiler/daemon/daemon.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="cli" />
-    <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="incremental-compilation-impl" />
-    <orderEntry type="module" module-name="build-common" />
-    <orderEntry type="module" module-name="descriptor.loader.java" />
-    <orderEntry type="module" module-name="frontend.script" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
deleted file mode 100644
index 17a0c5c825e..00000000000
--- a/compiler/frontend.java/frontend.java.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="frontend" exported="" />
-    <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/frontend.script/frontend.script.iml b/compiler/frontend.script/frontend.script.iml
deleted file mode 100644
index ed154038a0b..00000000000
--- a/compiler/frontend.script/frontend.script.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
deleted file mode 100644
index 47b2ee30c19..00000000000
--- a/compiler/frontend/frontend.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/generator" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="descriptors" exported="" />
-    <orderEntry type="module" module-name="deserialization" exported="" />
-    <orderEntry type="module" module-name="util" 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="" />
-    <orderEntry type="library" exported="" name="kotlin-script-runtime" level="project" />
-    <orderEntry type="library" name="javaslang" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/incremental-compilation-impl/incremental-compilation-impl.iml b/compiler/incremental-compilation-impl/incremental-compilation-impl.iml
deleted file mode 100644
index 311d82c03a8..00000000000
--- a/compiler/incremental-compilation-impl/incremental-compilation-impl.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/testData" type="java-test-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="build-common" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="descriptor.loader.java" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="junit-4.12" level="project" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="jps" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/ir/backend.common/backend.common.iml b/compiler/ir/backend.common/backend.common.iml
deleted file mode 100644
index a98ff1c560f..00000000000
--- a/compiler/ir/backend.common/backend.common.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="util" />
-    <orderEntry type="module" module-name="ir.tree" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="cli-common" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/ir/backend.jvm/backend.jvm.iml b/compiler/ir/backend.jvm/backend.jvm.iml
deleted file mode 100644
index f62fe97c7c5..00000000000
--- a/compiler/ir/backend.jvm/backend.jvm.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="util" />
-    <orderEntry type="module" module-name="ir.tree" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="ir.psi2ir" />
-    <orderEntry type="module" module-name="backend.common" />
-    <orderEntry type="module" module-name="frontend.java" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/ir/ir.ir2cfg/ir.ir2cfg.iml b/compiler/ir/ir.ir2cfg/ir.ir2cfg.iml
deleted file mode 100644
index 1152e9530d3..00000000000
--- a/compiler/ir/ir.ir2cfg/ir.ir2cfg.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="util" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="ir.tree" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/ir/ir.psi2ir/ir.psi2ir.iml b/compiler/ir/ir.psi2ir/ir.psi2ir.iml
deleted file mode 100644
index 1932e72398c..00000000000
--- a/compiler/ir/ir.psi2ir/ir.psi2ir.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="util" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="ir.tree" />
-    <orderEntry type="module" module-name="backend-common" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/ir.tree.iml b/compiler/ir/ir.tree/ir.tree.iml
deleted file mode 100644
index afd2b356dda..00000000000
--- a/compiler/ir/ir.tree/ir.tree.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="util" />
-    <orderEntry type="module" module-name="frontend" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/javac-wrapper/javac-wrapper.iml b/compiler/javac-wrapper/javac-wrapper.iml
deleted file mode 100644
index a8c91b4dfdd..00000000000
--- a/compiler/javac-wrapper/javac-wrapper.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="descriptor.loader.java" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/lib/openapi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/light-classes/light-classes.iml b/compiler/light-classes/light-classes.iml
deleted file mode 100644
index 87965c60696..00000000000
--- a/compiler/light-classes/light-classes.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="backend" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/plugin-api/plugin-api.iml b/compiler/plugin-api/plugin-api.iml
deleted file mode 100644
index d6427e84c96..00000000000
--- a/compiler/plugin-api/plugin-api.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="library" exported="" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/preloader/instrumentation/instrumentation.iml b/compiler/preloader/instrumentation/instrumentation.iml
deleted file mode 100644
index bedfa6e4240..00000000000
--- a/compiler/preloader/instrumentation/instrumentation.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="library" name="asm" level="project" />
-    <orderEntry type="module" module-name="preloader" scope="PROVIDED" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/preloader/preloader.iml b/compiler/preloader/preloader.iml
deleted file mode 100644
index 72aeb571869..00000000000
--- a/compiler/preloader/preloader.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/resolution/resolution.iml b/compiler/resolution/resolution.iml
deleted file mode 100644
index 8d7cc04c5a9..00000000000
--- a/compiler/resolution/resolution.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="trove4j" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/serialization/serialization.iml b/compiler/serialization/serialization.iml
deleted file mode 100644
index 27fd7317375..00000000000
--- a/compiler/serialization/serialization.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="library" name="protobuf-java" level="project" />
-    <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="descriptors" exported="" />
-    <orderEntry type="module" module-name="deserialization" exported="" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/tests-common/tests-common.iml b/compiler/tests-common/tests-common.iml
deleted file mode 100644
index 95246f4e2f4..00000000000
--- a/compiler/tests-common/tests-common.iml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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$" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="library" name="dx-android" level="project" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="builtins-serializer" />
-    <orderEntry type="module" module-name="descriptors.runtime" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="preloader" />
-    <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="js.translator" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="daemon-client" />
-    <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="library" exported="" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="backend.jvm" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="javac-wrapper" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/tests-ir-jvm/tests-ir-jvm.iml b/compiler/tests-ir-jvm/tests-ir-jvm.iml
deleted file mode 100644
index 23294642a91..00000000000
--- a/compiler/tests-ir-jvm/tests-ir-jvm.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="library" name="junit-4.12" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/tests-java8/compiler-tests-java8.iml b/compiler/tests-java8/compiler-tests-java8.iml
deleted file mode 100644
index b1bec867cc7..00000000000
--- a/compiler/tests-java8/compiler-tests-java8.iml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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$/../java8-tests/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" name="dx-android" level="project" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="builtins-serializer" />
-    <orderEntry type="module" module-name="descriptors.runtime" />
-    <orderEntry type="module" module-name="preloader" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="compiler-tests" />
-    <orderEntry type="module" module-name="tests-common" />
-    <orderEntry type="module" module-name="descriptor.loader.java" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
deleted file mode 100644
index b778363feeb..00000000000
--- a/compiler/tests/compiler-tests.iml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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$" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tests-common" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="library" name="dx-android" level="project" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="builtins-serializer" />
-    <orderEntry type="module" module-name="descriptors.runtime" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="preloader" />
-    <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="js.translator" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="daemon-client" />
-    <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="ir.tree" scope="TEST" />
-    <orderEntry type="module" module-name="backend.common" scope="TEST" />
-    <orderEntry type="module" module-name="ir.psi2ir" scope="TEST" />
-    <orderEntry type="module" module-name="ir.ir2cfg" scope="TEST" />
-    <orderEntry type="module" module-name="javac-wrapper" scope="TEST" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" name="javaslang" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="frontend.script" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/util/util.iml b/compiler/util/util.iml
deleted file mode 100644
index e04b9022082..00000000000
--- a/compiler/util/util.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="library" scope="PROVIDED" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="util.runtime" exported="" />
-    <orderEntry type="module" module-name="Kotlin" exported="" />
-    <orderEntry type="library" name="jps-model" level="project" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="deserialization" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/builtins/builtins.iml b/core/builtins/builtins.iml
deleted file mode 100644
index c0447264f2d..00000000000
--- a/core/builtins/builtins.iml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml
deleted file mode 100644
index c4ae6c54466..00000000000
--- a/core/descriptor.loader.java/descriptor.loader.java.iml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="module" module-name="descriptors" exported="" />
-    <orderEntry type="module" module-name="deserialization" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/descriptors.runtime/descriptors.runtime.iml b/core/descriptors.runtime/descriptors.runtime.iml
deleted file mode 100644
index 48d25c9e4da..00000000000
--- a/core/descriptors.runtime/descriptors.runtime.iml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
-    <orderEntry type="module" module-name="descriptors" exported="" />
-    <orderEntry type="module" module-name="deserialization" exported="" />
-    <orderEntry type="module" module-name="util.runtime" exported="" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/descriptors/descriptors.iml b/core/descriptors/descriptors.iml
deleted file mode 100644
index e7e844e240b..00000000000
--- a/core/descriptors/descriptors.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="RUNTIME" name="builtins" level="project" />
-    <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="library" name="javax.inject" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/deserialization/deserialization.iml b/core/deserialization/deserialization.iml
deleted file mode 100644
index a640162b195..00000000000
--- a/core/deserialization/deserialization.iml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="protobuf-java" level="project" />
-    <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="util.runtime" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/reflection.jvm/reflection.jvm.iml b/core/reflection.jvm/reflection.jvm.iml
deleted file mode 100644
index fcf05b5fe4c..00000000000
--- a/core/reflection.jvm/reflection.jvm.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="builtins" />
-    <orderEntry type="module" module-name="runtime.jvm" />
-    <orderEntry type="module" module-name="descriptors.runtime" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/runtime.jvm/runtime.jvm.iml b/core/runtime.jvm/runtime.jvm.iml
deleted file mode 100644
index c3ec4503ede..00000000000
--- a/core/runtime.jvm/runtime.jvm.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="builtins" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/script.runtime/script.runtime.iml b/core/script.runtime/script.runtime.iml
deleted file mode 100644
index 7ac35c564e0..00000000000
--- a/core/script.runtime/script.runtime.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="builtins" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/core/util.runtime/util.runtime.iml b/core/util.runtime/util.runtime.iml
deleted file mode 100644
index 63aa4f487b4..00000000000
--- a/core/util.runtime/util.runtime.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="kotlin-runtime" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/eval4j/eval4j.iml b/eval4j/eval4j.iml
deleted file mode 100644
index 8b0c78cb882..00000000000
--- a/eval4j/eval4j.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="module" module-name="backend" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/generators/generators.iml b/generators/generators.iml
deleted file mode 100644
index de8dcb380b4..00000000000
--- a/generators/generators.iml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="idea" scope="TEST" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
-    <orderEntry type="module" module-name="compiler-tests-java8" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="backend" scope="TEST" />
-    <orderEntry type="module" module-name="frontend" scope="TEST" />
-    <orderEntry type="module" module-name="frontend.java" scope="TEST" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="descriptor.loader.java" scope="TEST" />
-    <orderEntry type="module" module-name="descriptors.runtime" scope="TEST" />
-    <orderEntry type="module" module-name="js.tests" scope="TEST" />
-    <orderEntry type="module" module-name="jps-tests" scope="TEST" />
-    <orderEntry type="module" module-name="j2k" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="js.ast" scope="TEST" />
-    <orderEntry type="module" module-name="js.frontend" scope="TEST" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
-    <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
-    <orderEntry type="module" module-name="android-extensions-idea" scope="TEST" />
-    <orderEntry type="module" module-name="android-extensions-jps" scope="TEST" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="idea-completion" scope="TEST" />
-    <orderEntry type="module" module-name="annotation-collector" scope="TEST" />
-    <orderEntry type="module" module-name="container" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="build-common" scope="TEST" />
-    <orderEntry type="module" module-name="incremental-compilation-impl" scope="TEST" />
-    <orderEntry type="module" module-name="plugins-tests" scope="TEST" />
-    <orderEntry type="module" module-name="idea-android" scope="TEST" />
-    <orderEntry type="module" module-name="idea-android-output-parser" scope="TEST" />
-    <orderEntry type="module" module-name="idea-maven" scope="TEST" />
-    <orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
-    <orderEntry type="module" module-name="kapt3" scope="TEST" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="idea-gradle" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/grammar/grammar.iml b/grammar/grammar.iml
deleted file mode 100644
index c03fc491744..00000000000
--- a/grammar/grammar.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="library" name="intellij-core" level="project" />
-  </component>
-</module>
-
diff --git a/idea-runner/idea-runner.iml b/idea-runner/idea-runner.iml
deleted file mode 100644
index f702d0377cb..00000000000
--- a/idea-runner/idea-runner.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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$" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="idea" scope="PROVIDED" />
-    <orderEntry type="module" module-name="idea-maven" scope="PROVIDED" />
-    <orderEntry type="module" module-name="idea-gradle" scope="PROVIDED" />
-    <orderEntry type="module" module-name="idea-jvm" scope="PROVIDED" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/formatter/formatter.iml b/idea/formatter/formatter.iml
deleted file mode 100644
index efaee3d60da..00000000000
--- a/idea/formatter/formatter.iml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/lib/openapi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/ide-common/ide-common.iml b/idea/ide-common/ide-common.iml
deleted file mode 100644
index df607cb5f8c..00000000000
--- a/idea/ide-common/ide-common.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="frontend" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/core/annotations.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="module" module-name="js.serializer" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml b/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
deleted file mode 100644
index 75aba5d4052..00000000000
--- a/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
-    <orderEntry type="library" exported="" name="android-plugin" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="intellij-core" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-android/idea-android.iml b/idea/idea-android/idea-android.iml
deleted file mode 100644
index 18a8cf1641d..00000000000
--- a/idea/idea-android/idea-android.iml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
-    <orderEntry type="library" exported="" name="android-plugin" level="project" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="ide-common" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="idea-core" />
-    <orderEntry type="module" module-name="lint-idea" scope="TEST" />
-    <orderEntry type="library" name="uast-java" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="library" scope="PROVIDED" name="dx-android" level="project" />
-    <orderEntry type="module" module-name="idea-gradle" />
-    <orderEntry type="module" module-name="android-extensions-compiler" />
-    <orderEntry type="module" module-name="android-extensions-runtime" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-completion/idea-completion.iml b/idea/idea-completion/idea-completion.iml
deleted file mode 100644
index d3158c4c2da..00000000000
--- a/idea/idea-completion/idea-completion.iml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="descriptor.loader.java" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="idea-core" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="library" scope="RUNTIME" name="junit-plugin" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="formatter" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-core/idea-core.iml b/idea/idea-core/idea-core.iml
deleted file mode 100644
index 3aac9dfbfe1..00000000000
--- a/idea/idea-core/idea-core.iml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="j2k" />
-    <orderEntry type="library" exported="" name="kotlinx-coroutines-core" level="project" />
-    <orderEntry type="module" module-name="frontend.script" />
-    <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-gradle/idea-gradle.iml b/idea/idea-gradle/idea-gradle.iml
deleted file mode 100644
index c06b9964090..00000000000
--- a/idea/idea-gradle/idea-gradle.iml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="module" module-name="frontend.script" />
-    <orderEntry type="module" module-name="kotlin-gradle-tooling" />
-    <orderEntry type="module" module-name="idea-jvm" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-jps-common/idea-jps-common.iml b/idea/idea-jps-common/idea-jps-common.iml
deleted file mode 100644
index 7225646ab21..00000000000
--- a/idea/idea-jps-common/idea-jps-common.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend.java" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-jvm/idea-jvm.iml b/idea/idea-jvm/idea-jvm.iml
deleted file mode 100644
index d203961955b..00000000000
--- a/idea/idea-jvm/idea-jvm.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="library" scope="PROVIDED" name="idea-full" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="testng-plugin" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="library" name="java-decompiler-plugin" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-live-templates/idea-live-templates.iml b/idea/idea-live-templates/idea-live-templates.iml
deleted file mode 100644
index f275ba71200..00000000000
--- a/idea/idea-live-templates/idea-live-templates.iml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="idea-core" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="idea" scope="RUNTIME" />
-    <orderEntry type="library" scope="RUNTIME" name="junit-plugin" level="project" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="idea-completion" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-maven/idea-maven.iml b/idea/idea-maven/idea-maven.iml
deleted file mode 100644
index d7f0488f552..00000000000
--- a/idea/idea-maven/idea-maven.iml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="idea-jps-common" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="build-common" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-repl/idea-repl.iml b/idea/idea-repl/idea-repl.iml
deleted file mode 100644
index 5c700bafce3..00000000000
--- a/idea/idea-repl/idea-repl.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="idea-completion" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="module" module-name="daemon-client" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea-test-framework/idea-test-framework.iml b/idea/idea-test-framework/idea-test-framework.iml
deleted file mode 100644
index 4db5f94afe3..00000000000
--- a/idea/idea-test-framework/idea-test-framework.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tests-common" exported="" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="idea-core" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="idea" scope="TEST" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea.iml b/idea/idea.iml
deleted file mode 100644
index a2cd129b9d2..00000000000
--- a/idea/idea.iml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/../lib/asm-util-3.3.1.jar!/" />
-    <src_description expected_position="1">
-      <src_folder value="file://$MODULE_DIR$/src" expected_position="1" />
-      <src_folder value="file://$MODULE_DIR$/tests" expected_position="2" />
-    </src_description>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/testData/debugger/tinyApp/classes" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="plugin-api" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="module" module-name="cli-common" exported="" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="intellilang-plugin" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="copyright-plugin" level="project" />
-    <orderEntry type="module" module-name="j2k" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="idea-jps-common" exported="" />
-    <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
-    <orderEntry type="module" module-name="eval4j" />
-    <orderEntry type="module" module-name="idea-core" />
-    <orderEntry type="module" module-name="idea-analysis" exported="" />
-    <orderEntry type="module" module-name="js.frontend" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
-    <orderEntry type="module" module-name="android-extensions-idea" scope="TEST" />
-    <orderEntry type="library" name="markdown" level="project" />
-    <orderEntry type="module" module-name="idea-completion" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="daemon-client" />
-    <orderEntry type="module" module-name="idea-repl" scope="TEST" />
-    <orderEntry type="module" module-name="idea-live-templates" exported="" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="lint-idea" scope="PROVIDED" />
-    <orderEntry type="module" module-name="uast-kotlin" scope="PROVIDED" />
-    <orderEntry type="module" module-name="uast-kotlin-idea" scope="PROVIDED" />
-    <orderEntry type="module" module-name="formatter" />
-    <orderEntry type="library" scope="TEST" name="native-platform-uberjar" level="project" />
-    <orderEntry type="module" module-name="allopen-ide" scope="TEST" />
-    <orderEntry type="module" module-name="noarg-ide" scope="TEST" />
-    <orderEntry type="module" module-name="sam-with-receiver-ide" scope="TEST" />
-    <orderEntry type="module" module-name="kapt3" scope="TEST" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="build-common" />
-    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
-    <orderEntry type="module" module-name="frontend.script" />
-    <orderEntry type="module" module-name="backend.jvm" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="sam-with-receiver-cli" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml b/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml
deleted file mode 100644
index a43b98b013e..00000000000
--- a/idea/kotlin-gradle-tooling/kotlin-gradle-tooling.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.1" />
-          <option name="apiVersion" value="1.1" />
-          <option name="version" value="true" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <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="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/j2k/j2k.iml b/j2k/j2k.iml
deleted file mode 100644
index 70f450b89e4..00000000000
--- a/j2k/j2k.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="module" module-name="idea" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
deleted file mode 100644
index 4858c972118..00000000000
--- a/jps-plugin/jps-plugin.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="idea-jps-common" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="build-common" />
-    <orderEntry type="module" module-name="compiler-runner" />
-    <orderEntry type="library" name="jps" level="project" />
-    <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="preloader" />
-    <orderEntry type="module" module-name="daemon-client" />
-    <orderEntry type="module" module-name="daemon-common" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="module" module-name="daemon" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jps-plugin/jps-tests/jps-tests.iml b/jps-plugin/jps-tests/jps-tests.iml
deleted file mode 100644
index 6debe8f5988..00000000000
--- a/jps-plugin/jps-tests/jps-tests.iml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="descriptors" scope="TEST" />
-    <orderEntry type="module" module-name="frontend.java" scope="TEST" />
-    <orderEntry type="module" module-name="backend" scope="TEST" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
-    <orderEntry type="module" module-name="daemon-common" scope="TEST" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="build-common" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="incremental-compilation-impl" scope="TEST" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="js.serializer" scope="TEST" />
-    <orderEntry type="module" module-name="js.translator" scope="TEST" />
-    <orderEntry type="module" module-name="preloader" scope="TEST" />
-    <orderEntry type="library" scope="PROVIDED" name="native-platform-uberjar" level="project" />
-    <orderEntry type="module" module-name="compiler-runner" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml
deleted file mode 100644
index 4a98e226204..00000000000
--- a/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-tests" />
-    <orderEntry type="library" scope="TEST" name="jps" level="project" />
-    <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="build-common" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/js/js.ast/js.ast.iml b/js/js.ast/js.ast.iml
deleted file mode 100644
index 0e3a740b14d..00000000000
--- a/js/js.ast/js.ast.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="frontend" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/js/js.dce/js.dce.iml b/js/js.dce/js.dce.iml
deleted file mode 100644
index 50c3196e4e0..00000000000
--- a/js/js.dce/js.dce.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="library" scope="PROVIDED" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="js.ast" />
-    <orderEntry type="module" module-name="js.inliner" />
-    <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/js/js.frontend/js.frontend.iml b/js/js.frontend/js.frontend.iml
deleted file mode 100644
index cd29f87729d..00000000000
--- a/js/js.frontend/js.frontend.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="frontend" />
-    <orderEntry type="module" module-name="js.ast" exported="" />
-    <orderEntry type="module" module-name="js.parser" exported="" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="js.serializer" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/js/js.inliner/js.inliner.iml b/js/js.inliner/js.inliner.iml
deleted file mode 100644
index b98d0f89245..00000000000
--- a/js/js.inliner/js.inliner.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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" />
-    <orderEntry type="module" module-name="js.ast" />
-    <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="module" module-name="js.parser" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="backend-common" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/js/js.libraries/js.libraries.iml b/js/js.libraries/js.libraries.iml
deleted file mode 100644
index d5c07432750..00000000000
--- a/js/js.libraries/js.libraries.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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" />
-  </component>
-</module>
-
diff --git a/js/js.parser/js.parser.iml b/js/js.parser/js.parser.iml
deleted file mode 100644
index 8066bb12c1a..00000000000
--- a/js/js.parser/js.parser.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="library" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="js.ast" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="json-org" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/js/js.serializer/js.serializer.iml b/js/js.serializer/js.serializer.iml
deleted file mode 100644
index a3dbbdf0b55..00000000000
--- a/js/js.serializer/js.serializer.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="serialization" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="js.ast" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/js/js.tests/js.tests.iml b/js/js.tests/js.tests.iml
deleted file mode 100644
index 7ec8d7e656a..00000000000
--- a/js/js.tests/js.tests.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="module" module-name="tests-common" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="backend-common" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="js.dce" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/js/js.translator/js.translator.iml b/js/js.translator/js.translator.iml
deleted file mode 100644
index 602eee31925..00000000000
--- a/js/js.translator/js.translator.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="frontend" />
-    <orderEntry type="module" module-name="backend-common" />
-    <orderEntry type="module" module-name="js.ast" exported="" />
-    <orderEntry type="module" module-name="js.frontend" exported="" />
-    <orderEntry type="module" module-name="js.inliner" exported="" />
-    <orderEntry type="module" module-name="js.parser" />
-    <orderEntry type="module" module-name="js.serializer" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="json-org" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/allopen/allopen-cli/allopen-cli.iml b/plugins/allopen/allopen-cli/allopen-cli.iml
deleted file mode 100644
index 1b4ce6be947..00000000000
--- a/plugins/allopen/allopen-cli/allopen-cli.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="plugin-api" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml b/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml
deleted file mode 100644
index a1b321e4270..00000000000
--- a/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="plugin-api" exported="" />
-    <orderEntry type="module" module-name="frontend" exported="" />
-    <orderEntry type="module" module-name="frontend.java" exported="" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="backend" scope="PROVIDED" />
-    <orderEntry type="module" module-name="android-extensions-runtime" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
deleted file mode 100644
index 99397c7c3c2..00000000000
--- a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="android-extensions-compiler" exported="" />
-    <orderEntry type="module" module-name="idea-android" />
-    <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="idea" scope="PROVIDED" />
-    <orderEntry type="module" module-name="idea-core" scope="PROVIDED" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="idea-completion" />
-    <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="frontend.java" scope="TEST" />
-    <orderEntry type="module" module-name="idea-live-templates" scope="TEST" />
-    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
-    <orderEntry type="module" module-name="idea-jps-common" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="android-extensions-runtime" />
-    <orderEntry type="module" module-name="idea-gradle" />
-    <orderEntry type="module" module-name="kapt3-idea" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml b/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
deleted file mode 100644
index 0b0240cf57b..00000000000
--- a/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-plugin" scope="PROVIDED" />
-    <orderEntry type="library" scope="PROVIDED" name="jps" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="android-plugin" level="project" />
-    <orderEntry type="module" module-name="android-extensions-compiler" />
-    <orderEntry type="module" module-name="util" scope="PROVIDED" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml b/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml
deleted file mode 100644
index 8ca9d47ce2a..00000000000
--- a/plugins/android-extensions/android-extensions-runtime/android-extensions-runtime.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="library" scope="PROVIDED" name="android-layoutlib" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml b/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml
deleted file mode 100644
index 8f7c0749415..00000000000
--- a/plugins/annotation-based-compiler-plugins-ide-support/annotation-based-compiler-plugins-ide-support.iml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="idea-maven" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="idea-jps-common" />
-    <orderEntry type="module" module-name="idea-gradle" exported="" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/annotation-collector/annotation-collector.iml b/plugins/annotation-collector/annotation-collector.iml
deleted file mode 100644
index 7cc838fd4ab..00000000000
--- a/plugins/annotation-collector/annotation-collector.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="plugin-api" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="light-classes" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3.iml b/plugins/kapt3/kapt3.iml
deleted file mode 100644
index 1d1a30a735f..00000000000
--- a/plugins/kapt3/kapt3.iml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="plugin-api" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/lint/android-annotations/android-annotations.iml b/plugins/lint/android-annotations/android-annotations.iml
deleted file mode 100644
index c90834f2d60..00000000000
--- a/plugins/lint/android-annotations/android-annotations.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/lint/lint-api/lint-api.iml b/plugins/lint/lint-api/lint-api.iml
deleted file mode 100644
index e726367da7c..00000000000
--- a/plugins/lint/lint-api/lint-api.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="library" name="android-plugin" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="android-annotations" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" exported="" name="uast-java" level="project" />
-    <orderEntry type="module" module-name="util.runtime" scope="PROVIDED" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/lint/lint-checks/lint-checks.iml b/plugins/lint/lint-checks/lint-checks.iml
deleted file mode 100644
index e946263a51c..00000000000
--- a/plugins/lint/lint-checks/lint-checks.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="android-annotations" />
-    <orderEntry type="module" module-name="lint-api" />
-    <orderEntry type="module" module-name="lint-idea" />
-    <orderEntry type="library" name="android-plugin" level="project" />
-    <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="android-extensions-runtime" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/lint/lint-idea/lint-idea.iml b/plugins/lint/lint-idea/lint-idea.iml
deleted file mode 100644
index 55aac4b2efd..00000000000
--- a/plugins/lint/lint-idea/lint-idea.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lint-api" />
-    <orderEntry type="module" module-name="lint-checks" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="uast-kotlin" />
-    <orderEntry type="library" name="android-plugin" level="project" />
-    <orderEntry type="module" module-name="android-annotations" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="idea-core" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="idea-android" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/noarg/noarg-cli/noarg-cli.iml b/plugins/noarg/noarg-cli/noarg-cli.iml
deleted file mode 100644
index 5cf7403a117..00000000000
--- a/plugins/noarg/noarg-cli/noarg-cli.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="plugin-api" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/noarg/noarg-ide/noarg-ide.iml b/plugins/noarg/noarg-ide/noarg-ide.iml
deleted file mode 100644
index 6b81ded642a..00000000000
--- a/plugins/noarg/noarg-ide/noarg-ide.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="plugin-api" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="noarg-cli" />
-    <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="idea-jps-common" />
-    <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="annotation-based-compiler-plugins-ide-support" />
-    <orderEntry type="module" module-name="idea-maven" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/plugins-tests/plugins-tests.iml b/plugins/plugins-tests/plugins-tests.iml
deleted file mode 100755
index 29cfa62c84b..00000000000
--- a/plugins/plugins-tests/plugins-tests.iml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="android-extensions-compiler" />
-    <orderEntry type="module" module-name="android-extensions-jps" />
-    <orderEntry type="module" module-name="annotation-collector" scope="TEST" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="backend" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
-    <orderEntry type="library" name="jps-test" level="project" />
-    <orderEntry type="library" scope="TEST" name="robolectric" level="project" />
-    <orderEntry type="library" scope="TEST" name="ant" level="project" />
-    <orderEntry type="library" name="android-plugin" level="project" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="idea-gradle-plugin">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
-        </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" />
-        <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="TEST" name="gradle-and-groovy-plugin" level="project" />
-    <orderEntry type="module" module-name="light-classes" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="junit-plugin" level="project" />
-    <orderEntry type="module" module-name="build-common" scope="TEST" />
-    <orderEntry type="module" module-name="jps-tests" scope="TEST" />
-    <orderEntry type="module" module-name="kapt3" scope="TEST" />
-    <orderEntry type="module" module-name="sam-with-receiver-cli" scope="TEST" />
-    <orderEntry type="module" module-name="allopen-cli" scope="TEST" />
-    <orderEntry type="module" module-name="noarg-cli" scope="TEST" />
-    <orderEntry type="module" module-name="frontend.script" />
-    <orderEntry type="module" module-name="android-extensions-runtime" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml b/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml
deleted file mode 100644
index b0a3fb30186..00000000000
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="plugin-api" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver.iml b/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver.iml
deleted file mode 100644
index 65a63b9379f..00000000000
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml b/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml
deleted file mode 100644
index cfea7744ab2..00000000000
--- a/plugins/sam-with-receiver/sam-with-receiver-ide/sam-with-receiver-ide.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="plugin-api" />
-    <orderEntry type="module" module-name="sam-with-receiver-cli" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="idea-maven" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="annotation-based-compiler-plugins-ide-support" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml b/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
deleted file mode 100644
index f354ccf4329..00000000000
--- a/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/testData" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.script" />
-    <orderEntry type="module" module-name="plugin-api" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="module" module-name="frontend.java" scope="TEST" />
-    <orderEntry type="module" module-name="cli-common" scope="TEST" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
-    <orderEntry type="module" module-name="daemon-client" scope="TEST" />
-    <orderEntry type="module" module-name="daemon-common" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/uast-kotlin-idea/uast-kotlin-idea.iml b/plugins/uast-kotlin-idea/uast-kotlin-idea.iml
deleted file mode 100644
index 86a69835678..00000000000
--- a/plugins/uast-kotlin-idea/uast-kotlin-idea.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="library" name="kotlin-runtime" level="project" />
-        <orderEntry type="module" module-name="uast-kotlin" />
-        <orderEntry type="module" module-name="frontend" />
-        <orderEntry type="module" module-name="ide-common" />
-        <orderEntry type="module" module-name="backend" />
-        <orderEntry type="module" module-name="frontend.java" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/uast-kotlin/uast-kotlin.iml b/plugins/uast-kotlin/uast-kotlin.iml
deleted file mode 100644
index bb738923d66..00000000000
--- a/plugins/uast-kotlin/uast-kotlin.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="library" name="uast-java" level="project" />
-    <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="module" module-name="idea-android" scope="TEST" />
-    <orderEntry type="module" module-name="tests-common" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file