diff --git a/java/execution/openapi/src/com/intellij/execution/filters/AuxiliaryCallsFolding.java b/java/execution/impl/src/com/intellij/execution/filters/AuxiliaryCallsFolding.java
similarity index 100%
rename from java/execution/openapi/src/com/intellij/execution/filters/AuxiliaryCallsFolding.java
rename to java/execution/impl/src/com/intellij/execution/filters/AuxiliaryCallsFolding.java
diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index d9a746ec0564..77ee216e9bdd 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -15,7 +15,7 @@
     <orderEntry type="library" name="commons-collections" level="project" />
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="lang-impl" exported="" />
     <orderEntry type="module" module-name="compiler-openapi" />
     <orderEntry type="module" module-name="jsp-openapi" />
     <orderEntry type="module" module-name="jsp-spi" />
@@ -28,6 +28,8 @@
     <orderEntry type="library" name="jcip" level="project" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="library" name="JUnit4" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
similarity index 100%
rename from java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
rename to java/java-impl/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/Constants.java b/java/java-impl/src/com/intellij/psi/impl/source/Constants.java
index 08ab8ea0cbfc..607c7efaa8eb 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/Constants.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/Constants.java
@@ -106,6 +106,12 @@ public interface Constants extends ElementType {
     }
   };
 
+  PsiElementArrayConstructor<PsiAnnotation> PSI_ANNOTATION_ARRAY_CONSTRUCTOR = new PsiElementArrayConstructor<PsiAnnotation>() {
+    public PsiAnnotation[] newPsiElementArray(int length) {
+      return length == 0 ? PsiAnnotation.EMPTY_ARRAY : new PsiAnnotation[length];
+    }
+  };
+
   TokenSet CLASS_BIT_SET = TokenSet.create(CLASS, ANONYMOUS_CLASS, ENUM_CONSTANT_INITIALIZER);
   TokenSet FIELD_BIT_SET = TokenSet.create(FIELD, ENUM_CONSTANT);
   TokenSet METHOD_BIT_SET = TokenSet.create(METHOD, ANNOTATION_METHOD);
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java
index 8b50d8ee6ff0..e042ba85e0b2 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java
@@ -43,7 +43,7 @@ public class PsiMethodReceiverImpl extends CompositePsiElement implements PsiMet
 
   @NotNull
   public PsiAnnotation[] getAnnotations() {
-    return getChildrenAsPsiElements(ElementType.ANNOTATIONS, PsiAnnotation.PSI_ANNOTATION_ARRAY_CONSTRUCTOR);
+    return getChildrenAsPsiElements(ElementType.ANNOTATIONS, Constants.PSI_ANNOTATION_ARRAY_CONSTRUCTOR);
   }
 
   public PsiAnnotation findAnnotation(@NotNull @NonNls String qualifiedName) {
diff --git a/java/openapi/openapi.iml b/java/openapi/openapi.iml
index a85d11a03eaf..51baca32eb85 100644
--- a/java/openapi/openapi.iml
+++ b/java/openapi/openapi.iml
@@ -8,7 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="java-runtime" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="module" module-name="forms_rt" />
@@ -21,10 +20,9 @@
     <orderEntry type="module" module-name="xml-openapi" exported="" />
     <orderEntry type="module" module-name="platform-api" exported="" />
     <orderEntry type="module" module-name="lang-api" exported="" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="vcs-api" exported="" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="module" module-name="dom-openapi" />
-    <orderEntry type="module" module-name="testFramework" exported="" />
     <orderEntry type="module" module-name="resources-en" exported="" />
   </component>
   <component name="copyright">
diff --git a/java/openapi/src/com/intellij/psi/PsiAnnotation.java b/java/openapi/src/com/intellij/psi/PsiAnnotation.java
index 45623e17a642..585671eb666b 100644
--- a/java/openapi/src/com/intellij/psi/PsiAnnotation.java
+++ b/java/openapi/src/com/intellij/psi/PsiAnnotation.java
@@ -16,7 +16,6 @@
 package com.intellij.psi;
 
 import com.intellij.psi.meta.PsiMetaOwner;
-import com.intellij.psi.impl.source.PsiElementArrayConstructor;
 import com.intellij.util.ArrayFactory;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -32,11 +31,6 @@ public interface PsiAnnotation extends PsiAnnotationMemberValue, PsiMetaOwner {
    * The empty array of PSI annotations which can be reused to avoid unnecessary allocations.
    */
   PsiAnnotation[] EMPTY_ARRAY = new PsiAnnotation[0];
-  PsiElementArrayConstructor<PsiAnnotation> PSI_ANNOTATION_ARRAY_CONSTRUCTOR = new PsiElementArrayConstructor<PsiAnnotation>() {
-    public PsiAnnotation[] newPsiElementArray(int length) {
-      return length == 0 ? EMPTY_ARRAY : new PsiAnnotation[length];
-    }
-  };
 
   ArrayFactory<PsiAnnotation> ARRAY_FACTORY = new ArrayFactory<PsiAnnotation>() {
     public PsiAnnotation[] create(final int count) {
diff --git a/java/testFramework/testFramework-java.iml b/java/testFramework/testFramework-java.iml
index 2f47c91bd82a..129c4b2f135a 100644
--- a/java/testFramework/testFramework-java.iml
+++ b/java/testFramework/testFramework-java.iml
@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="execution-impl" exported="" scope="RUNTIME" />
     <orderEntry type="library" name="Groovy" level="project" />
+    <orderEntry type="module" module-name="testFramework" exported="" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/platform/platform-impl/src/com/intellij/ide/util/treeView/AlphaComparator.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AlphaComparator.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/ide/util/treeView/AlphaComparator.java
rename to platform/platform-api/src/com/intellij/ide/util/treeView/AlphaComparator.java
diff --git a/plugins/IdeaTestAssistant/IdeaTestAssistant.iml b/plugins/IdeaTestAssistant/IdeaTestAssistant.iml
index ef81570a1acd..89f6e6488d3b 100644
--- a/plugins/IdeaTestAssistant/IdeaTestAssistant.iml
+++ b/plugins/IdeaTestAssistant/IdeaTestAssistant.iml
@@ -11,6 +11,9 @@
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="idea-tests" scope="TEST" />
+    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="testFramework" />
   </component>
 </module>