diff --git a/ExtendedApi/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/codeInsight/CodeInsightTestCase.java
rename to java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
diff --git a/ExtendedApi/src/com/intellij/codeInsight/CodeInsightTestData.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestData.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/codeInsight/CodeInsightTestData.java
rename to java/testFramework/src/com/intellij/codeInsight/CodeInsightTestData.java
diff --git a/ExtendedApi/src/com/intellij/codeInsight/EditorInfo.java b/java/testFramework/src/com/intellij/codeInsight/EditorInfo.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/codeInsight/EditorInfo.java
rename to java/testFramework/src/com/intellij/codeInsight/EditorInfo.java
diff --git a/ExtendedApi/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
rename to java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
diff --git a/ExtendedApi/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
rename to java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
diff --git a/ExtendedApi/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java
rename to java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java
diff --git a/ExtendedApi/src/com/intellij/codeInsight/daemon/quickFix/QuickFixTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/QuickFixTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/codeInsight/daemon/quickFix/QuickFixTestCase.java
rename to java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/QuickFixTestCase.java
diff --git a/ExtendedApi/src/com/intellij/refactoring/MultiFileTestCase.java b/java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/refactoring/MultiFileTestCase.java
rename to java/testFramework/src/com/intellij/refactoring/MultiFileTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/EditorActionTestCase.java b/java/testFramework/src/com/intellij/testFramework/EditorActionTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/EditorActionTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/EditorActionTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/IdeaTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/IdeaTestUtil.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/IdeaTestUtil.java
rename to java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/InspectionTestCase.java b/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/InspectionTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/LightCodeInsightTestCase.java b/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/LightCodeInsightTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/LightIdeaTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/LightIdeaTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/ModuleTestCase.java b/java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/ModuleTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/PsiTestCase.java b/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/PsiTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/PsiTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/PsiTestData.java b/java/testFramework/src/com/intellij/testFramework/PsiTestData.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/PsiTestData.java
rename to java/testFramework/src/com/intellij/testFramework/PsiTestData.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/ResolveTestCase.java b/java/testFramework/src/com/intellij/testFramework/ResolveTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/ResolveTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/ResolveTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/TestSourceBasedTestCase.java b/java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/TestSourceBasedTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/TestSourceBasedTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/Timings.java b/java/testFramework/src/com/intellij/testFramework/Timings.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/Timings.java
rename to java/testFramework/src/com/intellij/testFramework/Timings.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/builders/JavaModuleFixtureBuilder.java b/java/testFramework/src/com/intellij/testFramework/builders/JavaModuleFixtureBuilder.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/builders/JavaModuleFixtureBuilder.java
rename to java/testFramework/src/com/intellij/testFramework/builders/JavaModuleFixtureBuilder.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java b/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/InjectedLanguageFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/InjectedLanguageFixtureTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/InjectedLanguageFixtureTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/InjectedLanguageFixtureTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/JavaCodeInsightTestFixture.java b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightTestFixture.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/JavaCodeInsightTestFixture.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightTestFixture.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/JavaTestFixtureFactory.java b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaTestFixtureFactory.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/JavaTestFixtureFactory.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/JavaTestFixtureFactory.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/impl/JavaCodeInsightTestFixtureImpl.java b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaCodeInsightTestFixtureImpl.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/impl/JavaCodeInsightTestFixtureImpl.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaCodeInsightTestFixtureImpl.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/fixtures/impl/JavaTestFixtureFactoryImpl.java b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaTestFixtureFactoryImpl.java
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/fixtures/impl/JavaTestFixtureFactoryImpl.java
rename to java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaTestFixtureFactoryImpl.java
diff --git a/ExtendedApi/src/com/intellij/testFramework/package.html b/java/testFramework/src/com/intellij/testFramework/package.html
similarity index 100%
rename from ExtendedApi/src/com/intellij/testFramework/package.html
rename to java/testFramework/src/com/intellij/testFramework/package.html
diff --git a/ExtendedApi/ExtendedApi.iml b/java/testFramework/testFramework-java.iml
similarity index 100%
rename from ExtendedApi/ExtendedApi.iml
rename to java/testFramework/testFramework-java.iml
diff --git a/plugins/ant/ant.iml b/plugins/ant/ant.iml
index 926c04894843..4c1faf0352d4 100644
--- a/plugins/ant/ant.iml
+++ b/plugins/ant/ant.iml
@@ -9,7 +9,7 @@
-
+