diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4fe72a18314..021661f45d5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -44,7 +44,6 @@
       <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-code-inliner/idea-replacement-engine.iml" filepath="$PROJECT_DIR$/idea/idea-code-inliner/idea-replacement-engine.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-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
diff --git a/idea/idea-code-inliner/idea-code-inliner.iml b/idea/idea-code-inliner/idea-code-inliner.iml
deleted file mode 100644
index f1ca7e6921c..00000000000
--- a/idea/idea-code-inliner/idea-code-inliner.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="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="util" />
-    <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="formatter" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/idea.iml b/idea/idea.iml
index db10fc6e492..ddb7d7af13b 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -55,6 +55,5 @@
     <orderEntry type="module" module-name="formatter" />
     <orderEntry type="module" module-name="idea-maven" />
     <orderEntry type="library" scope="TEST" name="native-platform-uberjar" level="project" />
-    <orderEntry type="module" module-name="idea-code-inliner" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CallableUsageReplacementStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CallableUsageReplacementStrategy.kt
similarity index 97%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CallableUsageReplacementStrategy.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/CallableUsageReplacementStrategy.kt
index da730b0b756..b1a3fc6cfa6 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CallableUsageReplacementStrategy.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CallableUsageReplacementStrategy.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.intentions.OperatorToFunctionIntention
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/ClassUsageReplacementStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/ClassUsageReplacementStrategy.kt
similarity index 98%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/ClassUsageReplacementStrategy.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/ClassUsageReplacementStrategy.kt
index 7a2479b96ff..6b793555903 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/ClassUsageReplacementStrategy.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/ClassUsageReplacementStrategy.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.idea.core.ShortenReferences
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeInliner.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeInliner.kt
similarity index 99%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeInliner.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeInliner.kt
index 85b5fed7475..764465f045d 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeInliner.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeInliner.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiElement
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeToInline.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInline.kt
similarity index 88%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeToInline.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInline.kt
index b844d2b0cd1..b76ac9c3da4 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeToInline.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInline.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import com.intellij.openapi.util.Key
-import org.jetbrains.kotlin.idea.inliner.CodeToInline.Companion.PARAMETER_USAGE_KEY
-import org.jetbrains.kotlin.idea.inliner.CodeToInline.Companion.TYPE_PARAMETER_USAGE_KEY
+import org.jetbrains.kotlin.idea.codeInliner.CodeToInline.Companion.PARAMETER_USAGE_KEY
+import org.jetbrains.kotlin.idea.codeInliner.CodeToInline.Companion.TYPE_PARAMETER_USAGE_KEY
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtExpression
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeToInlineBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInlineBuilder.kt
similarity index 99%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeToInlineBuilder.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInlineBuilder.kt
index 658d1030de6..f9c5a326b88 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/CodeToInlineBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInlineBuilder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/MutableCodeToInline.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/MutableCodeToInline.kt
similarity index 98%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/MutableCodeToInline.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/MutableCodeToInline.kt
index 339cfee848f..08b0b36959e 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/MutableCodeToInline.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/MutableCodeToInline.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiElement
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/ReplacementPerformer.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/ReplacementPerformer.kt
similarity index 99%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/ReplacementPerformer.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/ReplacementPerformer.kt
index 2e036cf217d..c99ccc0793c 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/ReplacementPerformer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/ReplacementPerformer.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import com.intellij.openapi.util.Key
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/UsageReplacementStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/UsageReplacementStrategy.kt
similarity index 98%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/UsageReplacementStrategy.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/UsageReplacementStrategy.kt
index 58257e3bf24..cef18cf284b 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/UsageReplacementStrategy.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/UsageReplacementStrategy.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.progress.ProgressIndicator
diff --git a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/introduceValue.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/introduceValue.kt
similarity index 99%
rename from idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/introduceValue.kt
rename to idea/src/org/jetbrains/kotlin/idea/codeInliner/introduceValue.kt
index 0265b77d622..4e8f2c100a1 100644
--- a/idea/idea-code-inliner/src/org/jetbrains/kotlin/idea/inliner/introduceValue.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/introduceValue.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.inliner
+package org.jetbrains.kotlin.idea.codeInliner
 
 import org.jetbrains.kotlin.idea.analysis.computeTypeInContext
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
similarity index 98%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
index f46ea0b32f3..cbb893906da 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
similarity index 99%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
index a4b74cb4a3b..82ca99bb252 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
index 34d8715678e..3afc6bf924d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.idea.core.moveCaret
 import org.jetbrains.kotlin.idea.core.targetDescriptors
 import org.jetbrains.kotlin.idea.quickfix.CleanupFix
 import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
-import org.jetbrains.kotlin.idea.inliner.UsageReplacementStrategy
+import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
 import org.jetbrains.kotlin.psi.KtImportDirective
 import org.jetbrains.kotlin.psi.KtSimpleNameExpression
 import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
index ba5ff921cae..a667f1ee43a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
@@ -31,9 +31,9 @@ import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.core.OptionalParametersHelper
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.inliner.CallableUsageReplacementStrategy
-import org.jetbrains.kotlin.idea.inliner.ClassUsageReplacementStrategy
-import org.jetbrains.kotlin.idea.inliner.UsageReplacementStrategy
+import org.jetbrains.kotlin.idea.codeInliner.CallableUsageReplacementStrategy
+import org.jetbrains.kotlin.idea.codeInliner.ClassUsageReplacementStrategy
+import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
 import org.jetbrains.kotlin.psi.KtConstructorCalleeExpression
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtSimpleNameExpression
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt
index 7f8a8f5aeef..6fd2a04ed26 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt
@@ -23,8 +23,8 @@ import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.inliner.UsageReplacementStrategy
-import org.jetbrains.kotlin.idea.inliner.replaceUsagesInWholeProject
+import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
+import org.jetbrains.kotlin.idea.codeInliner.replaceUsagesInWholeProject
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt
index 18db3064015..1898a812c37 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt
@@ -21,8 +21,8 @@ import org.jetbrains.kotlin.idea.analysis.analyzeInContext
 import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.inliner.CodeToInlineBuilder
-import org.jetbrains.kotlin.idea.inliner.CodeToInline
+import org.jetbrains.kotlin.idea.codeInliner.CodeToInlineBuilder
+import org.jetbrains.kotlin.idea.codeInliner.CodeToInline
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.resolve.frontendService
 import org.jetbrains.kotlin.name.FqName
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
index fba9f5a4451..b1234185d4c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
@@ -29,9 +29,9 @@ import org.jetbrains.kotlin.idea.analysis.analyzeInContext
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
 import org.jetbrains.kotlin.idea.core.copied
-import org.jetbrains.kotlin.idea.inliner.CallableUsageReplacementStrategy
-import org.jetbrains.kotlin.idea.inliner.CodeToInlineBuilder
-import org.jetbrains.kotlin.idea.inliner.replaceUsagesInWholeProject
+import org.jetbrains.kotlin.idea.codeInliner.CallableUsageReplacementStrategy
+import org.jetbrains.kotlin.idea.codeInliner.CodeToInlineBuilder
+import org.jetbrains.kotlin.idea.codeInliner.replaceUsagesInWholeProject
 import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtNamedFunction