diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1e2ce6f4f11a..81bea36e4865 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -56,6 +56,7 @@
       <module fileurl="file://$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" filepath="$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />
+      <module fileurl="file://$PROJECT_DIR$/java/java-indexing-impl/java-indexing-impl.iml" filepath="$PROJECT_DIR$/java/java-indexing-impl/java-indexing-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-psi-api/java-psi-api.iml" filepath="$PROJECT_DIR$/java/java-psi-api/java-psi-api.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-psi-impl/java-psi-impl.iml" filepath="$PROJECT_DIR$/java/java-psi-impl/java-psi-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-runtime/java-runtime.iml" filepath="$PROJECT_DIR$/java/java-runtime/java-runtime.iml" group="java" />
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 923a39ebf639..1790ca85e78d 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -59,6 +59,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
           "instrumentation-util",
           "platform-main",
           "java-psi-impl",
+          "java-indexing-impl",
           "java-impl",
           "compiler-impl",
           "debugger-impl",
@@ -530,6 +531,7 @@ def layout_core_upsource(String home, String target) {
       module("java-psi-impl")
       module("projectModel-api")
       module("projectModel-impl")
+      module("java-indexing-impl")
     }
 
     jar("annotations.jar") {
diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index 8f8444f32442..9735a4a7fad1 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -31,6 +31,7 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="java-psi-impl" exported="" />
     <orderEntry type="module" module-name="RegExpSupport" />
+    <orderEntry type="module" module-name="java-indexing-impl" exported="" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/java-indexing-impl/java-indexing-impl.iml b/java/java-indexing-impl/java-indexing-impl.iml
new file mode 100644
index 000000000000..94f91bbb0a10
--- /dev/null
+++ b/java/java-indexing-impl/java-indexing-impl.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="java-psi-api" exported="" />
+    <orderEntry type="module" module-name="java-psi-impl" exported="" />
+    <orderEntry type="module" module-name="indexing-api" exported="" />
+    <orderEntry type="module" module-name="indexing-impl" exported="" />
+    <orderEntry type="module" module-name="projectModel-api" />
+    <orderEntry type="module" module-name="projectModel-impl" />
+  </component>
+</module>
+
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
similarity index 100%
rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
rename to java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java
similarity index 92%
rename from java/java-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java
rename to java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java
index a0178fb407de..086a20eabcf7 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaSourceFilterScope.java
@@ -19,7 +19,7 @@
  */
 package com.intellij.psi.impl.search;
 
-import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.ide.highlighter.JavaClassFileType;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -41,7 +41,7 @@ public class JavaSourceFilterScope extends DelegatingGlobalSearchScope {
       return false;
     }
 
-    if (StdFileTypes.CLASS == file.getFileType()) {
+    if (JavaClassFileType.INSTANCE == file.getFileType()) {
       return myIndex.isInLibraryClasses(file);
     }
 
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java b/platform/indexing-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java
rename to platform/indexing-api/src/com/intellij/psi/stubs/StringStubIndexExtension.java