diff --git a/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java b/platform/core-api/src/com/intellij/psi/PsiReferenceBase.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java
rename to platform/core-api/src/com/intellij/psi/PsiReferenceBase.java
diff --git a/platform/lang-impl/src/com/intellij/psi/scope/processor/FilterElementProcessor.java b/platform/core-impl/src/com/intellij/psi/scope/processor/FilterElementProcessor.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/scope/processor/FilterElementProcessor.java
rename to platform/core-impl/src/com/intellij/psi/scope/processor/FilterElementProcessor.java
diff --git a/xml/openapi/src/com/intellij/html/RelaxedHtmlNSDescriptor.java b/xml/xml-psi-api/src/com/intellij/html/RelaxedHtmlNSDescriptor.java
similarity index 100%
rename from xml/openapi/src/com/intellij/html/RelaxedHtmlNSDescriptor.java
rename to xml/xml-psi-api/src/com/intellij/html/RelaxedHtmlNSDescriptor.java
diff --git a/xml/openapi/src/com/intellij/pom/package.html b/xml/xml-psi-api/src/com/intellij/pom/package.html
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/package.html
rename to xml/xml-psi-api/src/com/intellij/pom/package.html
diff --git a/xml/openapi/src/com/intellij/pom/xml/XmlAspect.java b/xml/xml-psi-api/src/com/intellij/pom/xml/XmlAspect.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/XmlAspect.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/XmlAspect.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/XmlChangeSet.java b/xml/xml-psi-api/src/com/intellij/pom/xml/XmlChangeSet.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/XmlChangeSet.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/XmlChangeSet.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlAttributeSet.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlAttributeSet.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlAttributeSet.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlAttributeSet.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlChange.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlChange.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlChange.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlChange.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlDocumentChanged.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlDocumentChanged.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlDocumentChanged.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlDocumentChanged.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlElementChanged.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlElementChanged.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlElementChanged.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlElementChanged.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildAdd.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTagChildAdd.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildAdd.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTagChildAdd.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildChanged.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTagChildChanged.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildChanged.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTagChildChanged.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildRemoved.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTagChildRemoved.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlTagChildRemoved.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTagChildRemoved.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTagNameChanged.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlTagNameChanged.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTagNameChanged.java
diff --git a/xml/openapi/src/com/intellij/pom/xml/events/XmlTextChanged.java b/xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTextChanged.java
similarity index 100%
rename from xml/openapi/src/com/intellij/pom/xml/events/XmlTextChanged.java
rename to xml/xml-psi-api/src/com/intellij/pom/xml/events/XmlTextChanged.java
diff --git a/xml/openapi/src/com/intellij/xml/XmlSchemaProvider.java b/xml/xml-psi-api/src/com/intellij/xml/XmlSchemaProvider.java
similarity index 96%
rename from xml/openapi/src/com/intellij/xml/XmlSchemaProvider.java
rename to xml/xml-psi-api/src/com/intellij/xml/XmlSchemaProvider.java
index 8302e635f44a..25e4f1d7e87d 100644
--- a/xml/openapi/src/com/intellij/xml/XmlSchemaProvider.java
+++ b/xml/xml-psi-api/src/com/intellij/xml/XmlSchemaProvider.java
@@ -19,7 +19,7 @@ package com.intellij.xml;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiDirectory;
@@ -63,7 +63,7 @@ public abstract class XmlSchemaProvider {
   @Nullable
   public static XmlFile findSchema(@NotNull @NonNls String namespace, @NotNull PsiFile baseFile) {
     final PsiDirectory directory = baseFile.getParent();
-    final Module module = ModuleUtil.findModuleForPsiElement(directory == null ? baseFile : directory);
+    final Module module = ModuleUtilCore.findModuleForPsiElement(directory == null ? baseFile : directory);
     return findSchema(namespace, module, baseFile);
   }
 
diff --git a/xml/xml-psi-api/xml-psi-api.iml b/xml/xml-psi-api/xml-psi-api.iml
index 794de36364c4..c571537f090b 100644
--- a/xml/xml-psi-api/xml-psi-api.iml
+++ b/xml/xml-psi-api/xml-psi-api.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core-api" />
+    <orderEntry type="module" module-name="projectModel-api" />
   </component>
 </module>
 
diff --git a/xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java
similarity index 100%
rename from xml/impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java
rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/injected/XmlCommentLiteralEscaper.java
diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java
similarity index 100%
rename from xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java
rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java
diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlCommentImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlCommentImpl.java
similarity index 100%
rename from xml/impl/src/com/intellij/psi/impl/source/xml/XmlCommentImpl.java
rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlCommentImpl.java
diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java
similarity index 100%
rename from xml/impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java
rename to xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java