diff --git a/java/openapi/openapi.iml b/java/openapi/openapi.iml
index cfcf69cb8fd6..ab9a29f38e4f 100644
--- a/java/openapi/openapi.iml
+++ b/java/openapi/openapi.iml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="Flex.Build.Configuration" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -34,7 +35,6 @@
     <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="psi-extapi" exported="" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="module" module-name="dom-openapi" />
     <orderEntry type="module" module-name="testFramework" exported="" />
diff --git a/platform/lang-impl/lang-impl.iml b/platform/lang-impl/lang-impl.iml
index b978a8c8c6ea..5cd94ff02b08 100644
--- a/platform/lang-impl/lang-impl.iml
+++ b/platform/lang-impl/lang-impl.iml
@@ -14,7 +14,6 @@
     <orderEntry type="library" name="JUnit3" level="project" />
     <orderEntry type="library" name="Velocity" level="project" />
     <orderEntry type="library" name="commons-collections" level="project" />
-    <orderEntry type="module" module-name="psi-extapi" exported="" />
     <orderEntry type="module" module-name="vcs-impl" />
     <orderEntry type="module" module-name="platform-impl" exported="" />
     <orderEntry type="module" module-name="usageView" exported="" />
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java b/platform/lang-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/ASTWrapperPsiElement.java b/platform/lang-impl/src/com/intellij/extapi/psi/ASTWrapperPsiElement.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/ASTWrapperPsiElement.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/ASTWrapperPsiElement.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/LightPsiFileBase.java b/platform/lang-impl/src/com/intellij/extapi/psi/LightPsiFileBase.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/LightPsiFileBase.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/LightPsiFileBase.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/MetadataPsiElementBase.java b/platform/lang-impl/src/com/intellij/extapi/psi/MetadataPsiElementBase.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/MetadataPsiElementBase.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/MetadataPsiElementBase.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/MetadataPsiFileBase.java b/platform/lang-impl/src/com/intellij/extapi/psi/MetadataPsiFileBase.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/MetadataPsiFileBase.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/MetadataPsiFileBase.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/PsiElementBase.java b/platform/lang-impl/src/com/intellij/extapi/psi/PsiElementBase.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/PsiElementBase.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/PsiElementBase.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/PsiFileBase.java b/platform/lang-impl/src/com/intellij/extapi/psi/PsiFileBase.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/PsiFileBase.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/PsiFileBase.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/StubBasedPsiElementBase.java b/platform/lang-impl/src/com/intellij/extapi/psi/StubBasedPsiElementBase.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/StubBasedPsiElementBase.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/StubBasedPsiElementBase.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/StubPath.java b/platform/lang-impl/src/com/intellij/extapi/psi/StubPath.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/StubPath.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/StubPath.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/StubPathBuilder.java b/platform/lang-impl/src/com/intellij/extapi/psi/StubPathBuilder.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/StubPathBuilder.java
rename to platform/lang-impl/src/com/intellij/extapi/psi/StubPathBuilder.java
diff --git a/platform/psi-extapi/src/com/intellij/extapi/psi/package.html b/platform/lang-impl/src/com/intellij/extapi/psi/package.html
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/extapi/psi/package.html
rename to platform/lang-impl/src/com/intellij/extapi/psi/package.html
diff --git a/platform/psi-extapi/src/com/intellij/psi/impl/FakePsiElement.java b/platform/lang-impl/src/com/intellij/psi/impl/FakePsiElement.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/psi/impl/FakePsiElement.java
rename to platform/lang-impl/src/com/intellij/psi/impl/FakePsiElement.java
diff --git a/platform/psi-extapi/src/com/intellij/testFramework/TestEditorManagerImpl.java b/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java
similarity index 100%
rename from platform/psi-extapi/src/com/intellij/testFramework/TestEditorManagerImpl.java
rename to platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java
diff --git a/xml/dom-openapi/dom-openapi.iml b/xml/dom-openapi/dom-openapi.iml
index 8646f1bd1b53..4f2113528268 100644
--- a/xml/dom-openapi/dom-openapi.iml
+++ b/xml/dom-openapi/dom-openapi.iml
@@ -13,9 +13,8 @@
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="platform-api" />
     <orderEntry type="module" module-name="extensions" />
-    <orderEntry type="module" module-name="Annotations" />
-    <orderEntry type="module" module-name="psi-extapi" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="lang-impl" />
   </component>
   <component name="copyright">
     <Base>