diff --git a/java/java-impl/src/com/intellij/psi/filters/position/InsideElementFilter.java b/java/java-impl/src/com/intellij/psi/filters/position/InsideElementFilter.java
index e8af28594e41..2baa9f4b2a19 100644
--- a/java/java-impl/src/com/intellij/psi/filters/position/InsideElementFilter.java
+++ b/java/java-impl/src/com/intellij/psi/filters/position/InsideElementFilter.java
@@ -16,7 +16,6 @@
 package com.intellij.psi.filters.position;
 
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.filters.position.PositionElementFilter;
 import com.intellij.psi.filters.ElementFilter;
 
 /**
diff --git a/platform/lang-api/src/com/intellij/lang/LanguageUtil.java b/platform/core-api/src/com/intellij/lang/LanguageUtil.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/lang/LanguageUtil.java
rename to platform/core-api/src/com/intellij/lang/LanguageUtil.java
diff --git a/platform/lang-api/src/com/intellij/lang/LighterAST.java b/platform/core-api/src/com/intellij/lang/LighterAST.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/lang/LighterAST.java
rename to platform/core-api/src/com/intellij/lang/LighterAST.java
diff --git a/platform/lang-api/src/com/intellij/lang/PsiBuilderUtil.java b/platform/core-api/src/com/intellij/lang/PsiBuilderUtil.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/lang/PsiBuilderUtil.java
rename to platform/core-api/src/com/intellij/lang/PsiBuilderUtil.java
diff --git a/platform/lang-api/src/com/intellij/psi/filters/ElementFilter.java b/platform/core-api/src/com/intellij/psi/filters/ElementFilter.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/filters/ElementFilter.java
rename to platform/core-api/src/com/intellij/psi/filters/ElementFilter.java
diff --git a/platform/lang-api/src/com/intellij/psi/meta/MetaDataContributor.java b/platform/core-api/src/com/intellij/psi/meta/MetaDataContributor.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/meta/MetaDataContributor.java
rename to platform/core-api/src/com/intellij/psi/meta/MetaDataContributor.java
diff --git a/platform/lang-api/src/com/intellij/psi/meta/MetaDataRegistrar.java b/platform/core-api/src/com/intellij/psi/meta/MetaDataRegistrar.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/meta/MetaDataRegistrar.java
rename to platform/core-api/src/com/intellij/psi/meta/MetaDataRegistrar.java
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/ILightStubElementType.java b/platform/core-api/src/com/intellij/psi/stubs/ILightStubElementType.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/stubs/ILightStubElementType.java
rename to platform/core-api/src/com/intellij/psi/stubs/ILightStubElementType.java
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/LightStubBuilder.java b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/stubs/LightStubBuilder.java
rename to platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/NamedStub.java b/platform/core-api/src/com/intellij/psi/stubs/NamedStub.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/stubs/NamedStub.java
rename to platform/core-api/src/com/intellij/psi/stubs/NamedStub.java
diff --git a/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguage.java b/platform/core-api/src/com/intellij/psi/templateLanguages/TemplateLanguage.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguage.java
rename to platform/core-api/src/com/intellij/psi/templateLanguages/TemplateLanguage.java
diff --git a/platform/lang-api/src/com/intellij/psi/tree/ILightStubFileElementType.java b/platform/core-api/src/com/intellij/psi/tree/ILightStubFileElementType.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/tree/ILightStubFileElementType.java
rename to platform/core-api/src/com/intellij/psi/tree/ILightStubFileElementType.java
diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiCacheKey.java b/platform/core-api/src/com/intellij/psi/util/PsiCacheKey.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/util/PsiCacheKey.java
rename to platform/core-api/src/com/intellij/psi/util/PsiCacheKey.java