diff --git a/.idea/inspectionProfiles/idea_fatal_errors.xml b/.idea/inspectionProfiles/idea_fatal_errors.xml
index 7cc4c1fdd186..45a81f75f4df 100644
--- a/.idea/inspectionProfiles/idea_fatal_errors.xml
+++ b/.idea/inspectionProfiles/idea_fatal_errors.xml
@@ -3925,17 +3925,6 @@
     <inspection_tool class="SuspiciousPackagePrivateAccess" enabled="true" level="ERROR" enabled_by_default="true">
       <scope name="Tests" level="WARNING" enabled="false" />
       <option name="MODULES_SETS_LOADED_TOGETHER">
-        <modules-set>
-          <module name="intellij.java.impl" />
-          <module name="intellij.java.analysis.impl" />
-          <module name="intellij.java.execution" />
-          <module name="intellij.java" />
-          <module name="intellij.java.psi" />
-          <module name="intellij.java.ui" />
-          <module name="intellij.java.psi.impl" />
-          <module name="intellij.java.analysis" />
-          <module name="intellij.java.impl.refactorings" />
-        </modules-set>
         <modules-set>
           <module name="intellij.android.profilers.ui" />
           <module name="intellij.android.profilers" />
@@ -3944,14 +3933,6 @@
           <module name="intellij.android.wizard" />
           <module name="intellij.android.wizard.model" />
         </modules-set>
-        <modules-set>
-          <module name="intellij.java.compiler.impl" />
-          <module name="intellij.java.compiler" />
-        </modules-set>
-        <modules-set>
-          <module name="intellij.java.compiler.instrumentationUtil.java8" />
-          <module name="intellij.java.compiler.instrumentationUtil" />
-        </modules-set>
       </option>
     </inspection_tool>
     <inspection_tool class="SuspiciousReturnByteInputStream" enabled="false" level="WARNING" enabled_by_default="false" />
diff --git a/java/java-impl/resources/META-INF/InspectionGadgets.xml b/java/java-impl/resources/META-INF/InspectionGadgets.xml
index 92b31e896ca3..1f3eb3d0796c 100644
--- a/java/java-impl/resources/META-INF/InspectionGadgets.xml
+++ b/java/java-impl/resources/META-INF/InspectionGadgets.xml
@@ -534,11 +534,11 @@
     <localInspection groupPath="Java" language="JAVA" suppressId="OverlyComplexAnonymousInnerClass" shortName="AnonymousClassComplexity"
                      bundle="messages.InspectionGadgetsBundle" key="overly.complex.anonymous.inner.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.siyeh.ig.classmetrics.AnonymousClassComplexityInspection"/>
+                     implementationClass="com.siyeh.ig.classmetrics.impl.AnonymousClassComplexityInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="AnonymousInnerClassWithTooManyMethods" shortName="AnonymousClassMethodCount"
                      bundle="messages.InspectionGadgetsBundle" key="anonymous.inner.class.with.too.many.methods.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.siyeh.ig.classmetrics.AnonymousClassMethodCountInspection"/>
+                     implementationClass="com.siyeh.ig.classmetrics.impl.AnonymousClassMethodCountInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="OverlyComplexClass" shortName="ClassComplexity" bundle="messages.InspectionGadgetsBundle"
                      key="overly.complex.class.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.classmetrics.ClassComplexityInspection"/>
@@ -1480,7 +1480,7 @@
     <localInspection groupPath="Java" language="JAVA" suppressId="ConstructorWithTooManyParameters" shortName="ParametersPerConstructor"
                      bundle="messages.InspectionGadgetsBundle" key="parameters.per.constructor.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.siyeh.ig.methodmetrics.ParametersPerConstructorInspection"/>
+                     implementationClass="com.siyeh.ig.methodmetrics.impl.ParametersPerConstructorInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="OverlyComplexMethod" shortName="CyclomaticComplexity" bundle="messages.InspectionGadgetsBundle"
                      key="cyclomatic.complexity.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics"
                      enabledByDefault="false" level="WARNING"
diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index 51c7cfe88103..ec5d20f02c11 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -416,7 +416,7 @@
     <projectService serviceInterface="com.intellij.testIntegration.TestFailedLineManager"
                     serviceImplementation="com.intellij.execution.codeInspection.TestFailedLineManagerImpl"/>
     <projectService serviceInterface="com.intellij.codeInspection.ex.EntryPointsManager"
-                    serviceImplementation="com.intellij.codeInspection.ex.EntryPointsManagerImpl"/>
+                    serviceImplementation="com.intellij.codeInspection.ex.impl.EntryPointsManagerImpl"/>
     <projectService serviceInterface="com.intellij.openapi.roots.JavaProjectModelModificationService"
                     serviceImplementation="com.intellij.openapi.roots.impl.JavaProjectModelModificationServiceImpl"/>
     <projectService serviceInterface="com.intellij.refactoring.listeners.JavaRefactoringListenerManager"
diff --git a/java/java-impl/src/com/intellij/codeInsight/options/JavaInspectionButtons.java b/java/java-impl/src/com/intellij/codeInsight/options/JavaInspectionButtons.java
index 4fe93bccde00..9f4b34236033 100644
--- a/java/java-impl/src/com/intellij/codeInsight/options/JavaInspectionButtons.java
+++ b/java/java-impl/src/com/intellij/codeInsight/options/JavaInspectionButtons.java
@@ -2,7 +2,7 @@
 package com.intellij.codeInsight.options;
 
 import com.intellij.codeInsight.NullableNotNullDialog;
-import com.intellij.codeInspection.ex.EntryPointsManagerImpl;
+import com.intellij.codeInspection.ex.impl.EntryPointsManagerImpl;
 import com.intellij.codeInspection.ui.CustomComponentExtensionWithSwingRenderer;
 import com.intellij.openapi.project.Project;
 import com.intellij.packageDependencies.ui.DependencyConfigurable;
diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/ClassPatternsPanel.java b/java/java-impl/src/com/intellij/codeInspection/ex/impl/ClassPatternsPanel.java
similarity index 98%
rename from java/java-impl/src/com/intellij/codeInspection/ex/ClassPatternsPanel.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/impl/ClassPatternsPanel.java
index ead0333e2b8a..18ef2979188b 100644
--- a/java/java-impl/src/com/intellij/codeInspection/ex/ClassPatternsPanel.java
+++ b/java/java-impl/src/com/intellij/codeInspection/ex/impl/ClassPatternsPanel.java
@@ -1,6 +1,7 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.codeInspection.ex;
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.codeInspection.ex.impl;
 
+import com.intellij.codeInspection.ex.EntryPointsManagerBase;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.util.ClassFilter;
 import com.intellij.ide.util.TreeClassChooser;
diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/impl/EntryPointsManagerImpl.java
similarity index 96%
rename from java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/impl/EntryPointsManagerImpl.java
index 356aa014c37a..085cc6d260e3 100644
--- a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
+++ b/java/java-impl/src/com/intellij/codeInspection/ex/impl/EntryPointsManagerImpl.java
@@ -1,8 +1,9 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.codeInspection.ex;
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.codeInspection.ex.impl;
 
 import com.intellij.codeInsight.AnnotationTargetUtil;
 import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx;
+import com.intellij.codeInspection.ex.EntryPointsManagerBase;
 import com.intellij.codeInspection.util.SpecialAnnotationsUtil;
 import com.intellij.java.JavaBundle;
 import com.intellij.openapi.components.PersistentStateComponent;
diff --git a/java/java-impl/src/com/siyeh/ig/classmetrics/AnonymousClassComplexityInspection.java b/java/java-impl/src/com/siyeh/ig/classmetrics/impl/AnonymousClassComplexityInspection.java
similarity index 95%
rename from java/java-impl/src/com/siyeh/ig/classmetrics/AnonymousClassComplexityInspection.java
rename to java/java-impl/src/com/siyeh/ig/classmetrics/impl/AnonymousClassComplexityInspection.java
index 90329617d801..0e3875c4d2b5 100644
--- a/java/java-impl/src/com/siyeh/ig/classmetrics/AnonymousClassComplexityInspection.java
+++ b/java/java-impl/src/com/siyeh/ig/classmetrics/impl/AnonymousClassComplexityInspection.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.siyeh.ig.classmetrics;
+package com.siyeh.ig.classmetrics.impl;
 
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.psi.*;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspectionVisitor;
+import com.siyeh.ig.classmetrics.ClassMetricInspection;
+import com.siyeh.ig.classmetrics.CyclomaticComplexityVisitor;
 import com.siyeh.ig.fixes.MoveAnonymousToInnerClassFix;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java/java-impl/src/com/siyeh/ig/classmetrics/AnonymousClassMethodCountInspection.java b/java/java-impl/src/com/siyeh/ig/classmetrics/impl/AnonymousClassMethodCountInspection.java
similarity index 96%
rename from java/java-impl/src/com/siyeh/ig/classmetrics/AnonymousClassMethodCountInspection.java
rename to java/java-impl/src/com/siyeh/ig/classmetrics/impl/AnonymousClassMethodCountInspection.java
index 0bff2bcd6e8f..10c0c842310a 100644
--- a/java/java-impl/src/com/siyeh/ig/classmetrics/AnonymousClassMethodCountInspection.java
+++ b/java/java-impl/src/com/siyeh/ig/classmetrics/impl/AnonymousClassMethodCountInspection.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.siyeh.ig.classmetrics;
+package com.siyeh.ig.classmetrics.impl;
 
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.psi.PsiAnonymousClass;
@@ -21,6 +21,7 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiEnumConstantInitializer;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspectionVisitor;
+import com.siyeh.ig.classmetrics.ClassMetricInspection;
 import com.siyeh.ig.fixes.MoveAnonymousToInnerClassFix;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java/java-impl/src/com/siyeh/ig/methodmetrics/ParametersPerConstructorInspection.java b/java/java-impl/src/com/siyeh/ig/methodmetrics/impl/ParametersPerConstructorInspection.java
similarity index 97%
rename from java/java-impl/src/com/siyeh/ig/methodmetrics/ParametersPerConstructorInspection.java
rename to java/java-impl/src/com/siyeh/ig/methodmetrics/impl/ParametersPerConstructorInspection.java
index 90b02f527b45..a8bcc8cced32 100644
--- a/java/java-impl/src/com/siyeh/ig/methodmetrics/ParametersPerConstructorInspection.java
+++ b/java/java-impl/src/com/siyeh/ig/methodmetrics/impl/ParametersPerConstructorInspection.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.siyeh.ig.methodmetrics;
+package com.siyeh.ig.methodmetrics.impl;
 
 import com.intellij.codeInspection.options.OptPane;
 import com.intellij.openapi.util.NlsContexts;
@@ -22,6 +22,7 @@ import com.intellij.psi.PsiModifier;
 import com.intellij.psi.PsiParameterList;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspectionVisitor;
+import com.siyeh.ig.methodmetrics.MethodMetricInspection;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/java/java-tests/testData/ig/com/siyeh/igtest/classmetrics/anonymous_class_complexity/AnonymousClassComplexity.java b/java/java-tests/testData/ig/com/siyeh/igtest/classmetrics/impl/anonymous_class_complexity/AnonymousClassComplexity.java
similarity index 100%
rename from java/java-tests/testData/ig/com/siyeh/igtest/classmetrics/anonymous_class_complexity/AnonymousClassComplexity.java
rename to java/java-tests/testData/ig/com/siyeh/igtest/classmetrics/impl/anonymous_class_complexity/AnonymousClassComplexity.java
diff --git a/java/java-tests/testSrc/com/siyeh/ig/classmetrics/AnonymousClassComplexityInspectionTest.java b/java/java-tests/testSrc/com/siyeh/ig/classmetrics/AnonymousClassComplexityInspectionTest.java
index 71101a044133..b4812789d154 100644
--- a/java/java-tests/testSrc/com/siyeh/ig/classmetrics/AnonymousClassComplexityInspectionTest.java
+++ b/java/java-tests/testSrc/com/siyeh/ig/classmetrics/AnonymousClassComplexityInspectionTest.java
@@ -17,6 +17,7 @@ package com.siyeh.ig.classmetrics;
 
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.siyeh.ig.LightJavaInspectionTestCase;
+import com.siyeh.ig.classmetrics.impl.AnonymousClassComplexityInspection;
 import org.jetbrains.annotations.Nullable;
 
 /**
diff --git a/platform/analysis-impl/resources/com/intellij/codeInspection/inspection-black-list.txt b/platform/analysis-impl/resources/com/intellij/codeInspection/inspection-black-list.txt
index 536f51b32f07..b6af62adeb15 100644
--- a/platform/analysis-impl/resources/com/intellij/codeInspection/inspection-black-list.txt
+++ b/platform/analysis-impl/resources/com/intellij/codeInspection/inspection-black-list.txt
@@ -68,8 +68,6 @@ com.siyeh.ig.classlayout.InnerClassOnInterfaceInspection
 com.siyeh.ig.classlayout.ListenerMayUseAdapterInspection
 com.siyeh.ig.classlayout.UtilityClassInspection
 com.siyeh.ig.classlayout.UtilityClassWithoutPrivateConstructorInspection
-com.siyeh.ig.classmetrics.AnonymousClassComplexityInspection
-com.siyeh.ig.classmetrics.AnonymousClassMethodCountInspection
 com.siyeh.ig.classmetrics.ClassComplexityInspection
 com.siyeh.ig.classmetrics.ClassCouplingInspection
 com.siyeh.ig.classmetrics.ClassInheritanceDepthInspection
@@ -77,6 +75,8 @@ com.siyeh.ig.classmetrics.ClassNestingDepthInspection
 com.siyeh.ig.classmetrics.ConstructorCountInspection
 com.siyeh.ig.classmetrics.FieldCountInspection
 com.siyeh.ig.classmetrics.MethodCountInspection
+com.siyeh.ig.classmetrics.impl.AnonymousClassComplexityInspection
+com.siyeh.ig.classmetrics.impl.AnonymousClassMethodCountInspection
 com.siyeh.ig.cloneable.CloneableImplementsCloneInspection
 com.siyeh.ig.controlflow.ConfusingElseInspection
 com.siyeh.ig.controlflow.DuplicateConditionInspection