diff --git a/platform/analysis-api/analysis-api.iml b/platform/analysis-api/analysis-api.iml
index 177ad6224f2a..9d483ed1ea84 100644
--- a/platform/analysis-api/analysis-api.iml
+++ b/platform/analysis-api/analysis-api.iml
@@ -11,6 +11,7 @@
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="module" module-name="extensions" />
     <orderEntry type="module" module-name="core-api" />
+    <orderEntry type="module" module-name="projectModel-api" />
   </component>
 </module>
 
diff --git a/platform/lang-api/src/com/intellij/packageDependencies/DependencyRule.java b/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/packageDependencies/DependencyRule.java
rename to platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java
diff --git a/platform/lang-api/src/com/intellij/packageDependencies/DependencyValidationManager.java b/platform/analysis-api/src/com/intellij/packageDependencies/DependencyValidationManager.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/packageDependencies/DependencyValidationManager.java
rename to platform/analysis-api/src/com/intellij/packageDependencies/DependencyValidationManager.java
diff --git a/platform/lang-api/src/com/intellij/packageDependencies/package.html b/platform/analysis-api/src/com/intellij/packageDependencies/package.html
similarity index 100%
rename from platform/lang-api/src/com/intellij/packageDependencies/package.html
rename to platform/analysis-api/src/com/intellij/packageDependencies/package.html
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/ProjectFilesScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectFilesScope.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/ProjectFilesScope.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/ProjectFilesScope.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/ProjectProductionScope.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/TestsScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/TestsScope.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/TestsScope.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/TestsScope.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/AbstractPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/AbstractPackageSet.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/AbstractPackageSet.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/AbstractPackageSet.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/ComplementPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/ComplementPackageSet.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/ComplementPackageSet.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/ComplementPackageSet.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/CustomScopesProvider.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/CustomScopesProvider.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/CustomScopesProvider.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/CustomScopesProvider.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/CustomScopesProviderEx.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/CustomScopesProviderEx.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/CustomScopesProviderEx.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/CustomScopesProviderEx.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/IntersectionPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/IntersectionPackageSet.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/IntersectionPackageSet.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/IntersectionPackageSet.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/InvalidPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/InvalidPackageSet.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/InvalidPackageSet.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/InvalidPackageSet.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedPackageSetReference.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedPackageSetReference.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedPackageSetReference.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedPackageSetReference.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScope.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScope.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScope.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopesHolder.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScopesHolder.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopesHolder.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScopesHolder.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/PackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSet.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/PackageSet.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSet.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/PackageSetBase.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSetBase.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/PackageSetBase.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSetBase.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/PackageSetFactory.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSetFactory.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/PackageSetFactory.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PackageSetFactory.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/ParsingException.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/ParsingException.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/ParsingException.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/ParsingException.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/PatternBasedPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PatternBasedPackageSet.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/PatternBasedPackageSet.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/PatternBasedPackageSet.java
diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java
rename to platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java