diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index b992edf832f..1b1bf2dd414 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -46,6 +46,7 @@
           <element id="module-output" name="container" />
           <element id="module-output" name="rmi-interface" />
           <element id="module-output" name="idea-repl" />
+          <element id="module-output" name="idea-live-templates" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index eb77c89fb96..dc0e1b27c47 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -37,6 +37,7 @@
       <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" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-js/idea-js.iml" filepath="$PROJECT_DIR$/idea/idea-js/idea-js.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-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" />
       <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" />
diff --git a/idea/idea-live-templates/idea-live-templates.iml b/idea/idea-live-templates/idea-live-templates.iml
new file mode 100644
index 00000000000..c04eb50c696
--- /dev/null
+++ b/idea/idea-live-templates/idea-live-templates.iml
@@ -0,0 +1,21 @@
+<?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="library" name="kotlin-runtime" level="project" />
+    <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" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.kt
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.kt
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuitableVariableMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuitableVariableMacro.kt
similarity index 100%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuitableVariableMacro.kt
rename to idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuitableVariableMacro.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesContextTest.kt
similarity index 95%
rename from idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt
rename to idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesContextTest.kt
index b1cb123d3b8..cedd09a8341 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt
+++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesContextTest.kt
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.codeInsight
+package org.jetbrains.kotlin.idea.liveTemplates
 
 import com.intellij.codeInsight.template.TemplateContextType
 import com.intellij.testFramework.UsefulTestCase
-import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import java.io.File
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.java
similarity index 96%
rename from idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java
rename to idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.java
index f8c1849d6a5..f5e4a22f032 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java
+++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.codeInsight;
+package org.jetbrains.kotlin.idea.liveTemplates;
 
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupEx;
@@ -30,6 +30,7 @@ import com.intellij.openapi.editor.actionSystem.EditorActionManager;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.UIUtil;
+import junit.framework.TestCase;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
@@ -260,7 +261,7 @@ public class LiveTemplatesTest extends KotlinLightCodeInsightFixtureTestCase {
     }
 
     private void checkAfter() {
-        assertNull(getTemplateState());
+        TestCase.assertNull(getTemplateState());
         myFixture.checkResultByFile(getTestName(true) + ".exp.kt", true);
     }
 
@@ -315,12 +316,12 @@ public class LiveTemplatesTest extends KotlinLightCodeInsightFixtureTestCase {
     }
 
     private void assertStringItems(@NonNls String... items) {
-        assertEquals(Arrays.asList(items), Arrays.asList(getItemStringsSorted()));
+        TestCase.assertEquals(Arrays.asList(items), Arrays.asList(getItemStringsSorted()));
     }
 
     private String[] getItemStrings() {
         LookupEx lookup = LookupManager.getActiveLookup(myFixture.getEditor());
-        assertNotNull(lookup);
+        TestCase.assertNotNull(lookup);
         ArrayList<String> result = new ArrayList<String>();
         for (LookupElement element : lookup.getItems()) {
             result.add(element.getLookupString());
diff --git a/idea/idea.iml b/idea/idea.iml
index 397bb482896..1d8c69173dc 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -45,11 +45,12 @@
     <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
     <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
     <orderEntry type="library" name="markdown" level="project" />
-    <orderEntry type="module" module-name="idea-completion" scope="TEST" />
+    <orderEntry type="module" module-name="idea-completion" exported="" scope="RUNTIME" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="idea-js" scope="TEST" />
     <orderEntry type="module" module-name="kotlinr" />
     <orderEntry type="module" module-name="idea-repl" scope="TEST" />
+    <orderEntry type="module" module-name="idea-live-templates" exported="" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/android-idea-plugin/android-idea-plugin.iml b/plugins/android-idea-plugin/android-idea-plugin.iml
index 770742cf8da..22680fe41d8 100644
--- a/plugins/android-idea-plugin/android-idea-plugin.iml
+++ b/plugins/android-idea-plugin/android-idea-plugin.iml
@@ -20,5 +20,6 @@
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <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" />
   </component>
 </module>
\ No newline at end of file