diff --git a/platform/platform-api/src/com/intellij/openapi/application/QueryExecutorBase.java b/platform/core-api/src/com/intellij/openapi/application/QueryExecutorBase.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/application/QueryExecutorBase.java
rename to platform/core-api/src/com/intellij/openapi/application/QueryExecutorBase.java
diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java
index d473ffbc78fb..ce183fee50d9 100644
--- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java
+++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
  * @author max
  */
 public class ReferencesSearch extends ExtensibleQueryFactory<PsiReference, ReferencesSearch.SearchParameters> {
-  public static ExtensionPointName<ReferencesSearch> EP_NAME = ExtensionPointName.create("com.intellij.referencesSearch");
+  public static ExtensionPointName<QueryExecutor> EP_NAME = ExtensionPointName.create("com.intellij.referencesSearch");
   private static final ReferencesSearch INSTANCE = new ReferencesSearch();
 
   private ReferencesSearch() {
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java
rename to platform/indexing-impl/src/com/intellij/psi/impl/search/CachesBasedRefSearcher.java