diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
index 01f6a428e305..6285728cf954 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
@@ -24,7 +24,6 @@ import com.intellij.codeInsight.generation.PsiFieldMember;
 import com.intellij.codeInsight.generation.PsiMethodMember;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.intention.impl.AssignFieldFromParameterAction;
-import com.intellij.codeInsight.intention.impl.CreateFieldFromParameterAction;
 import com.intellij.codeInsight.intention.impl.FieldFromParameterUtils;
 import com.intellij.ide.util.MemberChooser;
 import com.intellij.openapi.application.ApplicationManager;
diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
index d74b81bc4df3..e09a0bed531f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -47,7 +47,6 @@ import org.jetbrains.annotations.Nullable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class JavaDocInfoGenerator {
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/SimpleAccessorScopeProvider.java b/java/java-impl/src/com/intellij/psi/impl/search/SimpleAccessorScopeProvider.java
new file mode 100644
index 000000000000..5d9023fed400
--- /dev/null
+++ b/java/java-impl/src/com/intellij/psi/impl/search/SimpleAccessorScopeProvider.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi.impl.search;
+
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.SearchScope;
+
+public class SimpleAccessorScopeProvider implements CustomPropertyScopeProvider {
+  public SearchScope getScope(final Project project) {
+    return GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(project),
+                                                           StdFileTypes.JSP, StdFileTypes.JSPX,
+                                                           StdFileTypes.XML, StdFileTypes.XHTML);
+  }
+}
diff --git a/java/java-indexing-api/java-indexing-api.iml b/java/java-indexing-api/java-indexing-api.iml
index 7ca2c64e089c..51bc4aabe081 100644
--- a/java/java-indexing-api/java-indexing-api.iml
+++ b/java/java-indexing-api/java-indexing-api.iml
@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core-api" />
     <orderEntry type="module" module-name="java-psi-api" />
+    <orderEntry type="module" module-name="indexing-api" />
   </component>
 </module>
 
diff --git a/java/openapi/src/com/intellij/psi/search/searches/MethodReferencesSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/search/searches/MethodReferencesSearch.java
rename to java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/MethodTextOccurrenceProcessor.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodTextOccurrenceProcessor.java
similarity index 100%
rename from java/java-impl/src/com/intellij/psi/impl/search/MethodTextOccurrenceProcessor.java
rename to java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodTextOccurrenceProcessor.java
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
similarity index 100%
rename from java/java-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
rename to java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java
similarity index 86%
rename from java/java-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java
rename to java/java-indexing-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java
index 57b1943f8a72..16870688e738 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java
@@ -17,7 +17,6 @@ package com.intellij.psi.impl.search;
 
 import com.intellij.openapi.application.QueryExecutorBase;
 import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
@@ -51,10 +50,7 @@ public class SimpleAccessorReferenceSearcher extends QueryExecutorBase<PsiRefere
   static void addPropertyAccessUsages(PsiMethod method, SearchScope scope, SearchRequestCollector collector) {
     final String propertyName = PropertyUtil.getPropertyName(method);
     if (StringUtil.isNotEmpty(propertyName)) {
-      SearchScope additional = GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(method.getProject()),
-                                                                               StdFileTypes.JSP, StdFileTypes.JSPX,
-                                                                               StdFileTypes.XML, StdFileTypes.XHTML);
-
+      SearchScope additional = GlobalSearchScope.EMPTY_SCOPE;
       for (CustomPropertyScopeProvider provider : Extensions.getExtensions(CustomPropertyScopeProvider.EP_NAME)) {
         additional = additional.union(provider.getScope(method.getProject()));
       }
diff --git a/java/java-psi-api/java-psi-api.iml b/java/java-psi-api/java-psi-api.iml
index caff682b4a06..425683850d37 100644
--- a/java/java-psi-api/java-psi-api.iml
+++ b/java/java-psi-api/java-psi-api.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core-api" exported="" />
+    <orderEntry type="module" module-name="projectModel-api" />
   </component>
 </module>
 
diff --git a/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
rename to java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
diff --git a/java/openapi/src/com/intellij/codeInsight/ExternalAnnotationsManager.java b/java/java-psi-api/src/com/intellij/codeInsight/ExternalAnnotationsManager.java
similarity index 100%
rename from java/openapi/src/com/intellij/codeInsight/ExternalAnnotationsManager.java
rename to java/java-psi-api/src/com/intellij/codeInsight/ExternalAnnotationsManager.java
diff --git a/java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
similarity index 100%
rename from java/openapi/src/com/intellij/codeInsight/NullableNotNullManager.java
rename to java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
diff --git a/java/openapi/src/com/intellij/psi/util/PropertyUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PropertyUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/PropertyUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/PropertyUtil.java
diff --git a/platform/lang-impl/src/com/intellij/psi/ResolvingHint.java b/platform/core-impl/src/com/intellij/psi/ResolvingHint.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/ResolvingHint.java
rename to platform/core-impl/src/com/intellij/psi/ResolvingHint.java
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/CustomPropertyScopeProvider.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/CustomPropertyScopeProvider.java
similarity index 100%
rename from java/java-impl/src/com/intellij/psi/impl/search/CustomPropertyScopeProvider.java
rename to platform/indexing-impl/src/com/intellij/psi/impl/search/CustomPropertyScopeProvider.java
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index df858b547c50..35664d69264a 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -181,6 +181,8 @@
     <codeInsight.lineMarkerProvider language="" implementationClass="com.intellij.ui.ColorLineMarkerProvider"/>
     <!--<expectedTypesProvider implementation="com.intellij.codeInsight.JavaExpectedTypesProvider"/>-->
 
+    <customPropertyScopeProvider implementation="com.intellij.psi.impl.search.SimpleAccessorScopeProvider"/>
+
     <referencesSearch implementation="com.intellij.psi.impl.search.PsiAnnotationMethodReferencesSearcher"/>
     <referencesSearch implementation="com.intellij.psi.impl.search.ConstructorReferencesSearcher"/>
     <referencesSearch implementation="com.intellij.psi.impl.search.SimpleAccessorReferenceSearcher"/>