diff --git a/.idea/artifacts/KotlinJpsPlugin.xml b/.idea/artifacts/KotlinJpsPlugin.xml
index d20c1520000..99950f45f18 100644
--- a/.idea/artifacts/KotlinJpsPlugin.xml
+++ b/.idea/artifacts/KotlinJpsPlugin.xml
@@ -24,7 +24,7 @@
       <element id="module-output" name="deserialization" />
       <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/native-platform-uberjar.jar" path-in-jar="/" />
       <element id="module-output" name="android-jps-plugin" />
-      <element id="module-output" name="build" />
+      <element id="module-output" name="build-common" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 647e0d006fd..6a7c4e23e7d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -13,7 +13,7 @@
       <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$/jps-plugin/bare-plugin/bare-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
+      <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" />
@@ -68,4 +68,4 @@
       <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
     </modules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/build/build.iml b/build-common/build-common.iml
similarity index 82%
rename from build/build.iml
rename to build-common/build-common.iml
index 00fa174c223..9ab68bfb5dc 100644
--- a/build/build.iml
+++ b/build-common/build-common.iml
@@ -4,8 +4,6 @@
     <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" />
@@ -16,4 +14,4 @@
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/build/src/org/jetbrains/kotlin/build/JvmSourceRoot.kt b/build-common/src/org/jetbrains/kotlin/build/JvmSourceRoot.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/build/JvmSourceRoot.kt
rename to build-common/src/org/jetbrains/kotlin/build/JvmSourceRoot.kt
diff --git a/build/src/org/jetbrains/kotlin/build/generatedFiles.kt b/build-common/src/org/jetbrains/kotlin/build/generatedFiles.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/build/generatedFiles.kt
rename to build-common/src/org/jetbrains/kotlin/build/generatedFiles.kt
diff --git a/build/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java b/build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java
similarity index 100%
rename from build/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java
rename to build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java
diff --git a/build/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java b/build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
similarity index 100%
rename from build/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
rename to build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
diff --git a/build/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java b/build-common/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java
similarity index 100%
rename from build/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java
rename to build-common/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java
diff --git a/build/src/org/jetbrains/kotlin/incremental/CacheVersion.kt b/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/IncrementalCompilationComponentsImpl.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCompilationComponentsImpl.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/IncrementalCompilationComponentsImpl.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/IncrementalCompilationComponentsImpl.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/LocalFileKotlinClass.kt b/build-common/src/org/jetbrains/kotlin/incremental/LocalFileKotlinClass.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/LocalFileKotlinClass.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/LocalFileKotlinClass.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/LookupStorage.kt b/build-common/src/org/jetbrains/kotlin/incremental/LookupStorage.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/LookupStorage.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/LookupStorage.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt b/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/BasicMap.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMap.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/BasicMap.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMap.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/BasicMapsOwner.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMapsOwner.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/BasicMapsOwner.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMapsOwner.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/ClassOneToManyMap.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/ClassOneToManyMap.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/ClassOneToManyMap.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/ClassOneToManyMap.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/FileToIdMap.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/FileToIdMap.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/FileToIdMap.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/FileToIdMap.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/IdToFileMap.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/IdToFileMap.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/IdToFileMap.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/IdToFileMap.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/LazyStorage.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/LazyStorage.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/LazyStorage.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/LazyStorage.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/LookupMap.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/LookupMap.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/LookupMap.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/LookupMap.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/externalizers.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/externalizers.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/externalizers.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/externalizers.kt
diff --git a/build/src/org/jetbrains/kotlin/incremental/storage/values.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/values.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/incremental/storage/values.kt
rename to build-common/src/org/jetbrains/kotlin/incremental/storage/values.kt
diff --git a/build/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt b/build-common/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt
similarity index 100%
rename from build/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt
rename to build-common/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt
diff --git a/build.xml b/build.xml
index 479e28cb07b..874a1408c6d 100644
--- a/build.xml
+++ b/build.xml
@@ -603,15 +603,15 @@
         </jar>
     </target>
 
-    <target name="kotlin-build">
-        <cleandir dir="${output}/classes/kotlin-build"/>
+    <target name="kotlin-build-common">
+        <cleandir dir="${output}/classes/kotlin-build-common"/>
 
-        <javac2 destdir="${output}/classes/kotlin-build" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
+        <javac2 destdir="${output}/classes/kotlin-build-common" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
-            <withKotlin modulename="kotlin-build"/>
+            <withKotlin modulename="kotlin-build-common"/>
             <skip pattern="kotlin/jvm/internal/.*"/>
             <src>
-                <pathelement path="build/src"/>
+                <pathelement path="build-common/src"/>
             </src>
             <classpath>
                 <pathelement path="${bootstrap.runtime}"/>
@@ -621,28 +621,28 @@
             </classpath>
         </javac2>
 
-        <jar destfile="${kotlin-home}/lib/kotlin-build.jar">
-            <fileset dir="${output}/classes/kotlin-build"/>
+        <jar destfile="${kotlin-home}/lib/kotlin-build-common.jar">
+            <fileset dir="${output}/classes/kotlin-build-common"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
 
             <manifest>
                 <attribute name="Built-By" value="${manifest.impl.vendor}"/>
 
                 <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.common}"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jar>
 
-        <jar jarfile="${output}/kotlin-build-sources.jar">
-            <fileset dir="build/src"/>
+        <jar jarfile="${output}/kotlin-build-common-sources.jar">
+            <fileset dir="build-common/src"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
 
             <manifest>
                 <attribute name="Built-By" value="${manifest.impl.vendor}"/>
 
                 <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.sources}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.common.sources}"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jar>
@@ -1054,7 +1054,7 @@
             depends="builtins,stdlib,kotlin-test,core,reflection,pack-runtime,pack-runtime-sources,mock-runtime-for-test"/>
 
     <target name="dist"
-            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
+            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
             description="Builds redistributables from sources"/>
 
     <target name="dist-quick"
diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
index 2679ddc43b9..b4c7b39b31a 100644
--- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
@@ -27,7 +27,7 @@ import java.util.*
 
 class GenerateProtoBufCompare {
     companion object {
-        val DEST_FILE: File = File("build/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt")
+        val DEST_FILE: File = File("build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt")
 
         @JvmStatic
         fun main(args: Array<String>) {
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index 09a0ac0fec2..f884b9bd6b7 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -10,7 +10,7 @@
     <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" />
+    <orderEntry type="module" module-name="build-common" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
@@ -25,4 +25,4 @@
     <orderEntry type="module" module-name="daemon-common" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
index a2c1770fe8b..5ffb9065b7e 100644
--- a/resources/kotlinManifest.properties
+++ b/resources/kotlinManifest.properties
@@ -25,5 +25,5 @@ manifest.impl.title.kotlin.android.sdk.annotations=Kotlin Compiler Android SDK A
 
 manifest.impl.title.kotlin.daemon-client=Kotlin Compile Daemon Client
 
-manifest.impl.title.kotlin.build=Kotlin Builder
-manifest.impl.title.kotlin.build.sources=Kotlin Builder Sources
+manifest.impl.title.kotlin.build.common=Kotlin Build Common
+manifest.impl.title.kotlin.build.common.sources=Kotlin Build Common Sources