diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 38fedd07e2b..54e34abf8f6 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -54,7 +54,7 @@
         </element>
         <element id="library" level="project" name="markdown" />
         <element id="archive" name="kotlin-android-extensions-plugin.jar">
-          <element id="module-output" name="android-idea-plugin" />
+          <element id="module-output" name="android-extensions-idea" />
         </element>
         <element id="archive" name="kotlin-android-extensions-compiler-plugin.jar">
           <element id="module-output" name="android-extensions-compiler" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 25deb736d30..f06b1fabcd4 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,7 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.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" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" group="plugins" />
+      <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" />
       <module fileurl="file://$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" group="plugins" />
       <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" />
diff --git a/generators/generators.iml b/generators/generators.iml
index 271f9a73a67..d1366f40093 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -25,7 +25,7 @@
     <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-idea-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="android-extensions-idea" scope="TEST" />
     <orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
     <orderEntry type="module" module-name="idea-completion" scope="TEST" />
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index e2d86f81bad..55050dae279 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -956,7 +956,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("plugins/android-idea-plugin/tests", "plugins/android-idea-plugin/testData") {
+    testGroup("plugins/android-extensions/android-extensions-idea/tests", "plugins/android-extensions/android-extensions-idea/testData") {
         testClass<AbstractAndroidCompletionTest>() {
             model("android/completion", recursive = false, extension = null)
         }
diff --git a/idea/idea.iml b/idea/idea.iml
index a156a21a097..cf85b23184b 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -42,7 +42,7 @@
     <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
-    <orderEntry type="module" module-name="android-idea-plugin" 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" scope="TEST" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
diff --git a/plugins/android-idea-plugin/android-idea-plugin.iml b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
similarity index 100%
rename from plugins/android-idea-plugin/android-idea-plugin.iml
rename to plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidGotoDeclarationHandler.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidGotoDeclarationHandler.kt
similarity index 100%
rename from plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidGotoDeclarationHandler.kt
rename to plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidGotoDeclarationHandler.kt
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidIndicesHelperExtension.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidIndicesHelperExtension.kt
similarity index 100%
rename from plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidIndicesHelperExtension.kt
rename to plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidIndicesHelperExtension.kt
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt
similarity index 100%
rename from plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt
rename to plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
similarity index 100%
rename from plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
rename to plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidXmlVisitor.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidXmlVisitor.kt
similarity index 100%
rename from plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidXmlVisitor.kt
rename to plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidXmlVisitor.kt
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
similarity index 100%
rename from plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
rename to plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt
similarity index 100%
rename from plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt
rename to plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidPackageFragmentProviderExtension.kt
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidExtensionsReportSubmitter.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/plugin/android/AndroidExtensionsReportSubmitter.kt
similarity index 100%
rename from plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidExtensionsReportSubmitter.kt
rename to plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/plugin/android/AndroidExtensionsReportSubmitter.kt
diff --git a/plugins/android-idea-plugin/testData/android/AndroidManifest.xml b/plugins/android-extensions/android-extensions-idea/testData/android/AndroidManifest.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/AndroidManifest.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/AndroidManifest.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/fqNameInAttr.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttr/fqNameInAttr.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/fqNameInAttr.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttr/fqNameInAttr.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttr/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttr/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/fqNameInAttrFragment/fqNameInAttrFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttrFragment/fqNameInAttrFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/fqNameInAttrFragment/fqNameInAttrFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttrFragment/fqNameInAttrFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/fqNameInAttrFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttrFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/fqNameInAttrFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttrFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/fqNameInTag/fqNameInTag.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTag/fqNameInTag.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/fqNameInTag/fqNameInTag.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTag/fqNameInTag.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/fqNameInTag/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTag/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/fqNameInTag/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTag/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/fqNameInTagFragment/fqNameInTagFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTagFragment/fqNameInTagFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/fqNameInTagFragment/fqNameInTagFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTagFragment/fqNameInTagFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/fqNameInTagFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTagFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/fqNameInTagFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTagFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFile/multiFile.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFile/multiFile.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/multiFile/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFile/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/multiFile/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFile/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/multiFile/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFile/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/multiFile/res/layout/layout1.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFile/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/multiFileFragment/multiFileFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFileFragment/multiFileFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/multiFileFragment/multiFileFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFileFragment/multiFileFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/multiFileFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFileFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/multiFileFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFileFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/multiFileFragment/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFileFragment/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/multiFileFragment/res/layout/layout1.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFileFragment/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/propertiesSimple/propertiesSimple.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimple/propertiesSimple.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/propertiesSimple/propertiesSimple.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimple/propertiesSimple.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/propertiesSimple/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimple/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/propertiesSimple/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimple/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/propertiesSimpleFragment/propertiesSimpleFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleFragment/propertiesSimpleFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/propertiesSimpleFragment/propertiesSimpleFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleFragment/propertiesSimpleFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/propertiesSimpleFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/propertiesSimpleFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/propertiesSimpleView/propertiesSimpleView.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleView/propertiesSimpleView.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/propertiesSimpleView/propertiesSimpleView.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleView/propertiesSimpleView.kt
diff --git a/plugins/android-idea-plugin/testData/android/completion/propertiesSimpleView/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleView/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/propertiesSimpleView/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleView/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/withoutImport/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/completion/withoutImport/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/withoutImport/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/withoutImport/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/completion/withoutImport/withoutImport.kt b/plugins/android-extensions/android-extensions-idea/testData/android/completion/withoutImport/withoutImport.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/completion/withoutImport/withoutImport.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/completion/withoutImport/withoutImport.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/fqNameInAttr.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttr/fqNameInAttr.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/fqNameInAttr.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttr/fqNameInAttr.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttr/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttr/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttrFragment/fqNameInAttrFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttrFragment/fqNameInAttrFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttrFragment/fqNameInAttrFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttrFragment/fqNameInAttrFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttrFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttrFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttrFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttrFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/fqNameInTag.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTag/fqNameInTag.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/fqNameInTag.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTag/fqNameInTag.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTag/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTag/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/fqNameInTagFragment/fqNameInTagFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTagFragment/fqNameInTagFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/fqNameInTagFragment/fqNameInTagFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTagFragment/fqNameInTagFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/fqNameInTagFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTagFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/fqNameInTagFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTagFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/multiFile/multiFile.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFile/multiFile.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/multiFile/multiFile.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFile/multiFile.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/multiFile/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFile/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/multiFile/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFile/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/multiFile/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFile/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/multiFile/res/layout/layout1.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFile/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/multiFileFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFileFragment/multiFileFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/multiFileFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFileFragment/multiFileFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFileFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFileFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFileFragment/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/res/layout/layout1.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFileFragment/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/simple/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simple/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/simple/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simple/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/simple/simple.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simple/simple.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/simple/simple.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simple/simple.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/simpleFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/simpleFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/simpleFragment/simpleFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleFragment/simpleFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/simpleFragment/simpleFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleFragment/simpleFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/simpleView/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleView/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/simpleView/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleView/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/simpleView/simpleView.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleView/simpleView.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/simpleView/simpleView.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleView/simpleView.kt
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/wrongIdFormat/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/wrongIdFormat/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/wrongIdFormat.kt b/plugins/android-extensions/android-extensions-idea/testData/android/findUsages/wrongIdFormat/wrongIdFormat.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/wrongIdFormat.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/findUsages/wrongIdFormat/wrongIdFormat.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/fqNameInAttr.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttr/fqNameInAttr.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/fqNameInAttr.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttr/fqNameInAttr.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttr/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttr/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/fqNameInAttrFragment/fqNameInAttrFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttrFragment/fqNameInAttrFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/fqNameInAttrFragment/fqNameInAttrFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttrFragment/fqNameInAttrFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/fqNameInAttrFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttrFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/fqNameInAttrFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttrFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/fqNameInTag/fqNameInTag.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTag/fqNameInTag.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/fqNameInTag/fqNameInTag.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTag/fqNameInTag.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/fqNameInTag/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTag/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/fqNameInTag/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTag/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/fqNameInTagFragment/fqNameInTagFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTagFragment/fqNameInTagFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/fqNameInTagFragment/fqNameInTagFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTagFragment/fqNameInTagFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/fqNameInTagFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTagFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/fqNameInTagFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTagFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/multiFile/multiFile.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFile/multiFile.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/multiFile/multiFile.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFile/multiFile.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/multiFile/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFile/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/multiFile/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFile/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/multiFile/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFile/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/multiFile/res/layout/layout1.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFile/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/multiFileFragment/multiFileFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFileFragment/multiFileFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/multiFileFragment/multiFileFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFileFragment/multiFileFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/multiFileFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFileFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/multiFileFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFileFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/multiFileFragment/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFileFragment/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/multiFileFragment/res/layout/layout1.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFileFragment/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/simple/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/simple/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/simple/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/simple/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/simple/simple.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/simple/simple.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/simple/simple.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/simple/simple.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/simpleFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/simpleFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/simpleFragment/simpleFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleFragment/simpleFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/simpleFragment/simpleFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleFragment/simpleFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/goto/simpleView/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleView/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/simpleView/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleView/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/goto/simpleView/simpleView.kt b/plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleView/simpleView.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/goto/simpleView/simpleView.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleView/simpleView.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/fqNameInAttr.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttr/fqNameInAttr.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/fqNameInAttr.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttr/fqNameInAttr.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttr/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttr/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/fqNameInAttrFragment/fqNameInAttrFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttrFragment/fqNameInAttrFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/fqNameInAttrFragment/fqNameInAttrFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttrFragment/fqNameInAttrFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/fqNameInAttrFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttrFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/fqNameInAttrFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttrFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/fqNameInTag/fqNameInTag.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTag/fqNameInTag.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/fqNameInTag/fqNameInTag.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTag/fqNameInTag.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/fqNameInTag/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTag/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/fqNameInTag/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTag/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/fqNameInTagFragment/fqNameInTagFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTagFragment/fqNameInTagFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/fqNameInTagFragment/fqNameInTagFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTagFragment/fqNameInTagFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/fqNameInTagFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTagFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/fqNameInTagFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTagFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/multiFile/multiFile.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFile/multiFile.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/multiFile/multiFile.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFile/multiFile.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/multiFile/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFile/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/multiFile/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFile/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/multiFile/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFile/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/multiFile/res/layout/layout1.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFile/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/multiFileFragment/multiFileFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFileFragment/multiFileFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/multiFileFragment/multiFileFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFileFragment/multiFileFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/multiFileFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFileFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/multiFileFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFileFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/multiFileFragment/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFileFragment/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/multiFileFragment/res/layout/layout1.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFileFragment/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/simple/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/simple/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/simple/simple.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/simple.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/simple/simple.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/simple.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/simpleFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/simpleFragment/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/simpleFragment/simpleFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/simpleFragment.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/simpleFragment/simpleFragment.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/simpleFragment.kt
diff --git a/plugins/android-idea-plugin/testData/android/rename/simpleView/res/layout/layout.xml b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleView/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/simpleView/res/layout/layout.xml
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleView/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/rename/simpleView/simpleView.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleView/simpleView.kt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/rename/simpleView/simpleView.kt
rename to plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleView/simpleView.kt
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
similarity index 100%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
similarity index 100%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
similarity index 100%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
similarity index 100%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java
similarity index 73%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java
index fcbd15f4854..10d6a023e15 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java
@@ -27,71 +27,71 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("plugins/android-idea-plugin/testData/android/completion")
+@TestMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidCompletionTestGenerated extends AbstractAndroidCompletionTest {
     public void testAllFilesPresentInCompletion() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/completion"), Pattern.compile("^([^\\.]+)$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-idea/testData/android/completion"), Pattern.compile("^([^\\.]+)$"), false);
     }
 
     @TestMetadata("fqNameInAttr")
     public void testFqNameInAttr() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttr/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInAttrFragment")
     public void testFqNameInAttrFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInAttrFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInAttrFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTag")
     public void testFqNameInTag() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInTag/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTag/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTagFragment")
     public void testFqNameInTagFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInTagFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/fqNameInTagFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFile")
     public void testMultiFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/multiFile/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFile/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFileFragment")
     public void testMultiFileFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/multiFileFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/multiFileFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("propertiesSimple")
     public void testPropertiesSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimple/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimple/");
         doTest(fileName);
     }
 
     @TestMetadata("propertiesSimpleFragment")
     public void testPropertiesSimpleFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimpleFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("propertiesSimpleView")
     public void testPropertiesSimpleView() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimpleView/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/propertiesSimpleView/");
         doTest(fileName);
     }
 
     @TestMetadata("withoutImport")
     public void testWithoutImport() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/withoutImport/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/completion/withoutImport/");
         doTest(fileName);
     }
 }
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java
similarity index 73%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java
index 9c183eda79e..7201122c537 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java
@@ -27,71 +27,71 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("plugins/android-idea-plugin/testData/android/findUsages")
+@TestMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidFindUsagesTestGenerated extends AbstractAndroidFindUsagesTest {
     public void testAllFilesPresentInFindUsages() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/findUsages"), Pattern.compile("^([^\\.]+)$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-idea/testData/android/findUsages"), Pattern.compile("^([^\\.]+)$"), false);
     }
 
     @TestMetadata("fqNameInAttr")
     public void testFqNameInAttr() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttr/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInAttrFragment")
     public void testFqNameInAttrFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttrFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInAttrFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTag")
     public void testFqNameInTag() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTag/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTagFragment")
     public void testFqNameInTagFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInTagFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/fqNameInTagFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFile")
     public void testMultiFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/multiFile/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFile/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFileFragment")
     public void testMultiFileFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/multiFileFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simple/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simple/");
         doTest(fileName);
     }
 
     @TestMetadata("simpleFragment")
     public void testSimpleFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simpleFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("simpleView")
     public void testSimpleView() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simpleView/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/simpleView/");
         doTest(fileName);
     }
 
     @TestMetadata("wrongIdFormat")
     public void testWrongIdFormat() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/findUsages/wrongIdFormat/");
         doTest(fileName);
     }
 }
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java
similarity index 74%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java
index c316eb512fa..68b53849de5 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java
@@ -27,65 +27,65 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("plugins/android-idea-plugin/testData/android/goto")
+@TestMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidGotoTestGenerated extends AbstractAndroidGotoTest {
     public void testAllFilesPresentInGoto() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/goto"), Pattern.compile("^([^\\.]+)$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-idea/testData/android/goto"), Pattern.compile("^([^\\.]+)$"), false);
     }
 
     @TestMetadata("fqNameInAttr")
     public void testFqNameInAttr() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttr/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInAttrFragment")
     public void testFqNameInAttrFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInAttrFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInAttrFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTag")
     public void testFqNameInTag() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInTag/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTag/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTagFragment")
     public void testFqNameInTagFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInTagFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/fqNameInTagFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFile")
     public void testMultiFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/multiFile/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFile/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFileFragment")
     public void testMultiFileFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/multiFileFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/multiFileFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simple/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/simple/");
         doTest(fileName);
     }
 
     @TestMetadata("simpleFragment")
     public void testSimpleFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simpleFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("simpleView")
     public void testSimpleView() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simpleView/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/goto/simpleView/");
         doTest(fileName);
     }
 }
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java
similarity index 74%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java
index 96771233901..72480793492 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java
@@ -27,65 +27,65 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("plugins/android-idea-plugin/testData/android/rename")
+@TestMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidRenameTestGenerated extends AbstractAndroidRenameTest {
     public void testAllFilesPresentInRename() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/rename"), Pattern.compile("^([^\\.]+)$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-idea/testData/android/rename"), Pattern.compile("^([^\\.]+)$"), false);
     }
 
     @TestMetadata("fqNameInAttr")
     public void testFqNameInAttr() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttr/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInAttrFragment")
     public void testFqNameInAttrFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInAttrFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInAttrFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTag")
     public void testFqNameInTag() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInTag/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTag/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTagFragment")
     public void testFqNameInTagFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInTagFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/fqNameInTagFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFile")
     public void testMultiFile() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/multiFile/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFile/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFileFragment")
     public void testMultiFileFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/multiFileFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/multiFileFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simple/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/");
         doTest(fileName);
     }
 
     @TestMetadata("simpleFragment")
     public void testSimpleFragment() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simpleFragment/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/");
         doTest(fileName);
     }
 
     @TestMetadata("simpleView")
     public void testSimpleView() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simpleView/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleView/");
         doTest(fileName);
     }
 }
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
similarity index 98%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
index 68b10bd4ee1..e41a3a4cf6e 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
@@ -181,7 +181,7 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
     }
 
     protected void createManifest() throws IOException {
-        myFixture.copyFileToProject("plugins/android-idea-plugin/testData/android/AndroidManifest.xml",
+        myFixture.copyFileToProject("plugins/android-extensions/android-extensions-idea/testData/android/AndroidManifest.xml",
                                     SdkConstants.FN_ANDROID_MANIFEST_XML);
     }
 
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java
similarity index 99%
rename from plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java
rename to plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java
index 5d683e46b5b..e6ed93c0adc 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java
@@ -52,7 +52,7 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase {
     protected Sdk androidSdk;
     protected VirtualFile androidJar;
 
-    private static final String TEST_DATA_PROJECT_RELATIVE = "/plugins/android-idea-plugin/testData/android";
+    private static final String TEST_DATA_PROJECT_RELATIVE = "/plugins/android-extensions/android-extensions-idea/testData/android";
 
     protected KotlinAndroidTestCaseBase() {
         IdeaTestCase.initPlatformPrefix();