diff --git a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
index 381ea18d28e5..f82369c63206 100644
--- a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
+++ b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
@@ -86,6 +86,14 @@
                  description="Enable checks that the import layout is compatible"
                  restartRequired="true"/>
 
+    <declarationRangeHandler key="com.intellij.psi.PsiClassInitializer"
+                             implementationClass="com.intellij.codeInsight.hint.ClassInitializerDeclarationRangeHandler"/>
+    <declarationRangeHandler key="com.intellij.psi.PsiClass"
+                             implementationClass="com.intellij.codeInsight.hint.ClassDeclarationRangeHandler"/>
+    <declarationRangeHandler key="com.intellij.psi.PsiLambdaExpression"
+                             implementationClass="com.intellij.codeInsight.hint.LambdaDeclarationRangeHandler"/>
+    <declarationRangeHandler key="com.intellij.psi.PsiMethod"
+                             implementationClass="com.intellij.codeInsight.hint.MethodDeclarationRangeHandler"/>
 
   </extensions>
 </idea-plugin>
diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java b/java/java-frontback-impl/src/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java
rename to java/java-frontback-impl/src/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java
diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java b/java/java-frontback-impl/src/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java
rename to java/java-frontback-impl/src/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java
diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/LambdaDeclarationRangeHandler.java b/java/java-frontback-impl/src/com/intellij/codeInsight/hint/LambdaDeclarationRangeHandler.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/hint/LambdaDeclarationRangeHandler.java
rename to java/java-frontback-impl/src/com/intellij/codeInsight/hint/LambdaDeclarationRangeHandler.java
diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java b/java/java-frontback-impl/src/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java
rename to java/java-frontback-impl/src/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java
diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index fc8681fc3048..77a445864ebe 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -1200,14 +1200,6 @@
     <liveTemplateContext contextId="COMPLETION" baseContextId="JAVA_CODE"
                          implementation="com.intellij.codeInsight.template.SmartCompletionContextType"/>
     <usageTargetProvider implementation="com.intellij.find.findUsages.JavaUsageTargetProvider"/>
-    <declarationRangeHandler key="com.intellij.psi.PsiClassInitializer"
-                             implementationClass="com.intellij.codeInsight.hint.ClassInitializerDeclarationRangeHandler"/>
-    <declarationRangeHandler key="com.intellij.psi.PsiClass"
-                             implementationClass="com.intellij.codeInsight.hint.ClassDeclarationRangeHandler"/>
-    <declarationRangeHandler key="com.intellij.psi.PsiLambdaExpression"
-                             implementationClass="com.intellij.codeInsight.hint.LambdaDeclarationRangeHandler"/>
-    <declarationRangeHandler key="com.intellij.psi.PsiMethod"
-                             implementationClass="com.intellij.codeInsight.hint.MethodDeclarationRangeHandler"/>
     <copyPastePostProcessor implementation="com.intellij.codeInsight.editorActions.JavaCopyPasteReferenceProcessor"/>
     <copyPastePreProcessor implementation="com.intellij.codeInsight.editorActions.JavadocCopyPastePreProcessor"/>
     <copyPastePreProcessor implementation="com.intellij.codeInsight.editorActions.StringLiteralCopyPasteProcessor"/>