diff --git a/.idea/artifacts/KotlinJpsPlugin.xml b/.idea/artifacts/KotlinJpsPlugin.xml
index 99950f45f18..c29eb0c43cc 100644
--- a/.idea/artifacts/KotlinJpsPlugin.xml
+++ b/.idea/artifacts/KotlinJpsPlugin.xml
@@ -23,7 +23,7 @@
       <element id="module-output" name="daemon-common" />
       <element id="module-output" name="deserialization" />
       <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/native-platform-uberjar.jar" path-in-jar="/" />
-      <element id="module-output" name="android-jps-plugin" />
+      <element id="module-output" name="android-extensions-jps" />
       <element id="module-output" name="build-common" />
     </root>
   </artifact>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index f06b1fabcd4..f8d3114e93e 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,7 +5,7 @@
       <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-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$/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml" filepath="$PROJECT_DIR$/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" filepath="$PROJECT_DIR$/plugins/annotation-collector/annotation-collector.iml" group="plugins" />
diff --git a/generators/generators.iml b/generators/generators.iml
index d1366f40093..b38116acf8e 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -26,7 +26,7 @@
     <orderEntry type="module" module-name="util" scope="TEST" />
     <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
     <orderEntry type="module" module-name="android-extensions-idea" scope="TEST" />
-    <orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="android-extensions-jps" scope="TEST" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
     <orderEntry type="module" module-name="idea-completion" scope="TEST" />
     <orderEntry type="module" module-name="annotation-collector" scope="TEST" />
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 55050dae279..5d9e936a50c 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -980,7 +980,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("plugins/android-jps-plugin/tests", "plugins/android-jps-plugin/testData") {
+    testGroup("plugins/android-extensions/android-extensions-jps/tests", "plugins/android-extensions/android-extensions-jps/testData") {
         testClass<AbstractAndroidJpsTestCase>() {
             model("android", recursive = false, extension = null)
         }
diff --git a/plugins/android-jps-plugin/android-jps-plugin.iml b/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
similarity index 77%
rename from plugins/android-jps-plugin/android-jps-plugin.iml
rename to plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
index 8ad3bdc606c..5d5c696f8a3 100644
--- a/plugins/android-jps-plugin/android-jps-plugin.iml
+++ b/plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
@@ -19,14 +19,14 @@
     <orderEntry type="module-library" scope="TEST">
       <library name="idea-gradle-plugin">
         <CLASSES>
-          <root url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" />
+          <root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" />
+          <root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
         </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" recursive="false" />
-        <jarDirectory url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
+        <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
       </library>
     </orderEntry>
   </component>
diff --git a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt b/plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
similarity index 99%
rename from plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
rename to plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
index b360810bc7b..b6798e3c64a 100644
--- a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
+++ b/plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
@@ -16,14 +16,14 @@
 
 package org.jetbrains.kotlin.android.jps
 
-import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.model.module.JpsModule
-import java.io.File
-import org.jetbrains.jps.android.AndroidJpsUtil
 import com.intellij.util.PathUtil
+import org.jetbrains.jps.android.AndroidJpsUtil
+import org.jetbrains.jps.incremental.CompileContext
+import org.jetbrains.jps.incremental.ModuleBuildTarget
+import org.jetbrains.jps.model.module.JpsModule
+import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
 import org.w3c.dom.Document
+import java.io.File
 import javax.xml.parsers.DocumentBuilderFactory
 
 class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
@@ -70,7 +70,7 @@ class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
                         val libDirectory = File(PathUtil.getJarPathForClass(javaClass)).parentFile.parentFile
                         File(libDirectory, JAR_FILE_NAME).absolutePath
                     } else {
-                        // We're in tests now (in out/production/android-jps-plugin)
+                        // We're in tests now (in out/production/android-extensions/android-extensions-jps)
                         val kotlinProjectDirectory = File(PathUtil.getJarPathForClass(javaClass)).parentFile.parentFile.parentFile
                         File(kotlinProjectDirectory, "dist/kotlinc/lib/$JAR_FILE_NAME").absolutePath
                     })
diff --git a/plugins/android-jps-plugin/src/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider b/plugins/android-extensions/android-extensions-jps/src/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
similarity index 100%
rename from plugins/android-jps-plugin/src/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
rename to plugins/android-extensions/android-extensions-jps/src/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
diff --git a/plugins/android-jps-plugin/testData/android/simple/AndroidManifest.xml b/plugins/android-extensions/android-extensions-jps/testData/android/simple/AndroidManifest.xml
similarity index 100%
rename from plugins/android-jps-plugin/testData/android/simple/AndroidManifest.xml
rename to plugins/android-extensions/android-extensions-jps/testData/android/simple/AndroidManifest.xml
diff --git a/plugins/android-jps-plugin/testData/android/simple/res/layout/activity_main.xml b/plugins/android-extensions/android-extensions-jps/testData/android/simple/res/layout/activity_main.xml
similarity index 100%
rename from plugins/android-jps-plugin/testData/android/simple/res/layout/activity_main.xml
rename to plugins/android-extensions/android-extensions-jps/testData/android/simple/res/layout/activity_main.xml
diff --git a/plugins/android-jps-plugin/testData/android/simple/res/layout/fragment.xml b/plugins/android-extensions/android-extensions-jps/testData/android/simple/res/layout/fragment.xml
similarity index 100%
rename from plugins/android-jps-plugin/testData/android/simple/res/layout/fragment.xml
rename to plugins/android-extensions/android-extensions-jps/testData/android/simple/res/layout/fragment.xml
diff --git a/plugins/android-jps-plugin/testData/android/simple/simple.iml b/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.iml
similarity index 100%
rename from plugins/android-jps-plugin/testData/android/simple/simple.iml
rename to plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.iml
diff --git a/plugins/android-jps-plugin/testData/android/simple/simple.ipr b/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.ipr
similarity index 100%
rename from plugins/android-jps-plugin/testData/android/simple/simple.ipr
rename to plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.ipr
diff --git a/plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt b/plugins/android-extensions/android-extensions-jps/testData/android/simple/src/com/example/myapp/MyActivity.kt
similarity index 100%
rename from plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt
rename to plugins/android-extensions/android-extensions-jps/testData/android/simple/src/com/example/myapp/MyActivity.kt
diff --git a/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
similarity index 100%
rename from plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
rename to plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
diff --git a/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java b/plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
similarity index 84%
rename from plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
rename to plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
index 4acc6490191..2298ef53f7a 100644
--- a/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
+++ b/plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
@@ -27,17 +27,17 @@ 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-jps-plugin/testData/android")
+@TestMetadata("plugins/android-extensions/android-extensions-jps/testData/android")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class AndroidJpsTestCaseGenerated extends AbstractAndroidJpsTestCase {
     public void testAllFilesPresentInAndroid() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-jps/testData/android"), Pattern.compile("^([^\\.]+)$"), false);
     }
 
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-jps-plugin/testData/android/simple/");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-jps/testData/android/simple/");
         doTest(fileName);
     }
 }