diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml
index d2dd8f382357..e04f386811e9 100644
--- a/python/pluginResources/intellij.python.community.impl.xml
+++ b/python/pluginResources/intellij.python.community.impl.xml
@@ -251,7 +251,7 @@
                      implementationClass="com.jetbrains.python.inspections.PyPep8Inspection" unfair="true"/>
     <localInspection language="Python" shortName="PyInterpreterInspection" suppressId="PyInterpreter" bundle="messages.PyPsiBundle"
                      key="INSP.NAME.invalid.interpreter" groupKey="INSP.GROUP.python" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.jetbrains.python.inspections.PyInterpreterInspection"/>
+                     implementationClass="com.jetbrains.python.inspections.interpreter.PyInterpreterInspection"/>
     <localInspection language="Python" shortName="PyStubPackagesCompatibilityInspection" suppressId="PyStubPackagesCompatibility"
                      bundle="messages.PyPsiBundle" key="INSP.stub.packages.compatibility" groupKey="INSP.GROUP.python"
                      enabledByDefault="true" level="WARNING"
diff --git a/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLangSupport.kt b/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLangSupport.kt
index 75b2df4611c5..4ed11b82c6cb 100644
--- a/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLangSupport.kt
+++ b/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLangSupport.kt
@@ -24,7 +24,7 @@ import com.jetbrains.python.Result
 import com.jetbrains.python.configuration.PyConfigurableInterpreterList
 import com.jetbrains.python.errorProcessing.ErrorSink
 import com.jetbrains.python.errorProcessing.emit
-import com.jetbrains.python.inspections.PyInterpreterInspection
+import com.jetbrains.python.inspections.interpreter.PyInterpreterInspection
 import com.jetbrains.python.projectCreation.createVenvAndSdk
 import com.jetbrains.python.sdk.PySdkToInstall
 import com.jetbrains.python.sdk.add.PySdkPathChoosingComboBox
diff --git a/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLessonsUtil.kt b/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLessonsUtil.kt
index 9d88f620dc5d..9620318a607f 100644
--- a/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLessonsUtil.kt
+++ b/python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLessonsUtil.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.util.NlsSafe
 import com.intellij.openapi.util.UserDataHolderBase
 import com.intellij.ui.dsl.builder.Panel
 import com.jetbrains.python.configuration.PyConfigurableInterpreterList
-import com.jetbrains.python.inspections.PyInterpreterInspection
+import com.jetbrains.python.inspections.interpreter.PyInterpreterInspection
 import com.jetbrains.python.sdk.findBaseSdks
 import com.jetbrains.python.sdk.flavors.PythonSdkFlavor
 import com.jetbrains.python.sdk.pythonSdk
diff --git a/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java b/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java
index cf0f3bc9bdd7..3e56fb782d93 100644
--- a/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java
+++ b/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java
@@ -4,6 +4,7 @@ package com.jetbrains.python.documentation;
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.psi.PsiFile;
 import com.jetbrains.python.inspections.*;
+import com.jetbrains.python.inspections.interpreter.PyInterpreterInspection;
 import com.jetbrains.python.inspections.unresolvedReference.PyUnresolvedReferencesInspection;
 import com.jetbrains.python.psi.PyFile;
 import com.jetbrains.python.psi.PythonVisitorFilter;
diff --git a/python/src/com/jetbrains/python/inspections/PyTypeAnnotationVisitorFilter.java b/python/src/com/jetbrains/python/inspections/PyTypeAnnotationVisitorFilter.java
index 100855a5d3c4..4bd614bbfebc 100644
--- a/python/src/com/jetbrains/python/inspections/PyTypeAnnotationVisitorFilter.java
+++ b/python/src/com/jetbrains/python/inspections/PyTypeAnnotationVisitorFilter.java
@@ -2,6 +2,7 @@
 package com.jetbrains.python.inspections;
 
 import com.intellij.psi.PsiFile;
+import com.jetbrains.python.inspections.interpreter.PyInterpreterInspection;
 import com.jetbrains.python.psi.PythonVisitorFilter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.kt b/python/src/com/jetbrains/python/inspections/interpreter/PyInterpreterInspection.kt
similarity index 87%
rename from python/src/com/jetbrains/python/inspections/PyInterpreterInspection.kt
rename to python/src/com/jetbrains/python/inspections/interpreter/PyInterpreterInspection.kt
index ff2752a414c2..0aeb97253c1b 100644
--- a/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.kt
+++ b/python/src/com/jetbrains/python/inspections/interpreter/PyInterpreterInspection.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.jetbrains.python.inspections
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.jetbrains.python.inspections.interpreter
 
 import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo
 import com.intellij.codeInspection.LocalInspectionToolSession
@@ -9,10 +9,10 @@ import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.codeInspection.util.InspectionMessage
 import com.intellij.codeInspection.util.IntentionFamilyName
 import com.intellij.codeInspection.util.IntentionName
-import com.intellij.ide.actions.ShowSettingsUtilImpl.Companion.showSettingsDialog
+import com.intellij.ide.actions.ShowSettingsUtilImpl
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.module.Module
-import com.intellij.openapi.module.ModuleManager.Companion.getInstance
+import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.options.ConfigurableGroup
 import com.intellij.openapi.options.ex.ConfigurableExtensionPointUtil
@@ -32,18 +32,28 @@ import com.intellij.util.containers.ContainerUtil
 import com.intellij.util.containers.toArray
 import com.jetbrains.python.PyPsiBundle
 import com.jetbrains.python.PythonIdeLanguageCustomization
+import com.jetbrains.python.inspections.PyInspection
+import com.jetbrains.python.inspections.PyInspectionExtension
+import com.jetbrains.python.inspections.PyInspectionVisitor
 import com.jetbrains.python.psi.LanguageLevel
 import com.jetbrains.python.psi.PyFile
-import com.jetbrains.python.psi.impl.PyBuiltinCache.Companion.findSdkForFile
+import com.jetbrains.python.psi.impl.PyBuiltinCache
 import com.jetbrains.python.psi.types.TypeEvalContext
-import com.jetbrains.python.sdk.*
-import com.jetbrains.python.sdk.PySdkPopupFactory.Companion.createAndShow
-import com.jetbrains.python.sdk.conda.PyCondaSdkCustomizer.Companion.checkEnvironmentAndPrepareSdkCreatorBlocking
-import com.jetbrains.python.sdk.conda.PyCondaSdkCustomizer.Companion.instance
+import com.jetbrains.python.sdk.PyDetectedSdk
+import com.jetbrains.python.sdk.PySdkPopupFactory
+import com.jetbrains.python.sdk.PythonSdkType
+import com.jetbrains.python.sdk.conda.PyCondaSdkCustomizer
 import com.jetbrains.python.sdk.configuration.CreateSdkInfoWithTool
 import com.jetbrains.python.sdk.configuration.PyProjectSdkConfiguration
-import com.jetbrains.python.sdk.configuration.PyProjectSdkConfiguration.configureSdkUsingCreateSdkInfo
+import com.jetbrains.python.sdk.detectSystemWideSdks
+import com.jetbrains.python.sdk.detectVirtualEnvs
+import com.jetbrains.python.sdk.filterAssociatedSdks
+import com.jetbrains.python.sdk.filterSharedCondaEnvs
+import com.jetbrains.python.sdk.filterSystemWideSdks
+import com.jetbrains.python.sdk.guessedLanguageLevel
 import com.jetbrains.python.sdk.legacy.PythonSdkUtil
+import com.jetbrains.python.sdk.mostPreferred
+import com.jetbrains.python.sdk.setupSdkLaunch
 import com.jetbrains.python.ui.PyUiUtil
 import one.util.streamex.StreamEx
 import java.io.File
@@ -67,7 +77,7 @@ class PyInterpreterInspection : PyInspection() {
     override fun visitPyFile(node: PyFile) {
       if (isFileIgnored(node)) return
       val module = ModuleUtilCore.findModuleForPsiElement(node)
-      val sdk = findSdkForFile(node)
+      val sdk = PyBuiltinCache.Companion.findSdkForFile(node)
       val pyCharm = PythonIdeLanguageCustomization.isMainlyPythonIde()
 
       val fixes: MutableList<LocalQuickFix?> = ArrayList<LocalQuickFix?>()
@@ -141,7 +151,7 @@ class PyInterpreterInspection : PyInspection() {
           }
         }
 
-        if (instance.suggestSharedCondaEnvironments) {
+        if (PyCondaSdkCustomizer.Companion.instance.suggestSharedCondaEnvironments) {
           val sharedCondaEnv = mostPreferred(filterSharedCondaEnvs(module, existingSdks))
           if (sharedCondaEnv != null) {
             return UseExistingInterpreterFix(sharedCondaEnv, module)
@@ -154,10 +164,10 @@ class PyInterpreterInspection : PyInspection() {
           return UseExistingInterpreterFix(systemWideSdk, module)
         }
 
-        val configurator = instance.fallbackConfigurator
+        val configurator = PyCondaSdkCustomizer.Companion.instance.fallbackConfigurator
         if (configurator != null) {
           val fallbackCreateSdkInfo =
-            checkEnvironmentAndPrepareSdkCreatorBlocking(configurator, module)
+            PyCondaSdkCustomizer.Companion.checkEnvironmentAndPrepareSdkCreatorBlocking(configurator, module)
           if (fallbackCreateSdkInfo != null) {
             return UseProvidedInterpreterFix(module, fallbackCreateSdkInfo)
           }
@@ -176,7 +186,7 @@ class PyInterpreterInspection : PyInspection() {
           val model = ProjectSdksModel()
           model.reset(null)
           return ContainerUtil.filter(model.getSdks(),
-                                            Condition { it.getSdkType() is PythonSdkType })
+                                      Condition { it.getSdkType() is PythonSdkType })
         }
 
       private fun detectAssociatedViaRootNameEnv(
@@ -188,7 +198,7 @@ class PyInterpreterInspection : PyInspection() {
         return Companion.findAssociatedViaRootNameEnv(
           associatedName,
           detectVirtualEnvs(module, existingSdks, context),
-          Function { sdk: PyDetectedSdk? -> Companion.getVirtualEnvRootName(sdk!!) }
+          Function { sdk: PyDetectedSdk? -> getVirtualEnvRootName(sdk!!) }
         )
       }
 
@@ -254,7 +264,7 @@ class PyInterpreterInspection : PyInspection() {
         val id = "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
         val group = ConfigurableExtensionPointUtil.getConfigurableGroup(project, true)
         if (ConfigurableVisitor.findById(id, mutableListOf<ConfigurableGroup?>(group)) != null) {
-          showSettingsDialog(project, id, null)
+          ShowSettingsUtilImpl.Companion.showSettingsDialog(project, id, null)
           return
         }
 
@@ -269,7 +279,7 @@ class PyInterpreterInspection : PyInspection() {
 
       private fun justOneModuleInheritingSdk(project: Project, module: Module): Boolean {
         return ProjectRootManager.getInstance(project).getProjectSdk() == null &&
-               ModuleRootManager.getInstance(module).isSdkInherited() && getInstance(project).modules.size < 2
+               ModuleRootManager.getInstance(module).isSdkInherited() && ModuleManager.Companion.getInstance(project).modules.size < 2
       }
     }
   }
@@ -291,7 +301,7 @@ class PyInterpreterInspection : PyInspection() {
       val module = ModuleUtilCore.findModuleForPsiElement(element)
       if (module == null) return
 
-      createAndShow(module)
+      PySdkPopupFactory.Companion.createAndShow(module)
     }
   }
 
@@ -311,7 +321,7 @@ class PyInterpreterInspection : PyInspection() {
 
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
       if (!detectSdkForModulesForJvmIn(project)) {
-        configureSdkUsingCreateSdkInfo(myModule, myCreateSdkInfo)
+        PyProjectSdkConfiguration.configureSdkUsingCreateSdkInfo(myModule, myCreateSdkInfo)
       }
     }
 
@@ -368,4 +378,4 @@ class PyInterpreterInspection : PyInspection() {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/inspections/PyInterpreterInspectionEx.kt b/python/src/com/jetbrains/python/inspections/interpreter/PyInterpreterInspectionEx.kt
similarity index 96%
rename from python/src/com/jetbrains/python/inspections/PyInterpreterInspectionEx.kt
rename to python/src/com/jetbrains/python/inspections/interpreter/PyInterpreterInspectionEx.kt
index 79bd979bc294..d98b3c00fac3 100644
--- a/python/src/com/jetbrains/python/inspections/PyInterpreterInspectionEx.kt
+++ b/python/src/com/jetbrains/python/inspections/interpreter/PyInterpreterInspectionEx.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.jetbrains.python.inspections
+package com.jetbrains.python.inspections.interpreter
 
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
diff --git a/python/src/com/jetbrains/python/packaging/toolwindow/PyPackagingToolWindowPanel.kt b/python/src/com/jetbrains/python/packaging/toolwindow/PyPackagingToolWindowPanel.kt
index 3af124705ff7..9d63bdef86ab 100644
--- a/python/src/com/jetbrains/python/packaging/toolwindow/PyPackagingToolWindowPanel.kt
+++ b/python/src/com/jetbrains/python/packaging/toolwindow/PyPackagingToolWindowPanel.kt
@@ -28,7 +28,7 @@ import com.intellij.ui.SimpleTextAttributes
 import com.intellij.util.asDisposable
 import com.jetbrains.python.PyBundle.message
 import com.jetbrains.python.TraceContext
-import com.jetbrains.python.inspections.PyInterpreterInspection
+import com.jetbrains.python.inspections.interpreter.PyInterpreterInspection
 import com.jetbrains.python.packaging.toolwindow.details.PyPackageInfoPanel
 import com.jetbrains.python.packaging.toolwindow.model.DisplayablePackage
 import com.jetbrains.python.packaging.toolwindow.model.ErrorNode
diff --git a/python/src/com/jetbrains/python/sdk/PySdkExt.kt b/python/src/com/jetbrains/python/sdk/PySdkExt.kt
index ba791a97e43f..a47c2413ada0 100644
--- a/python/src/com/jetbrains/python/sdk/PySdkExt.kt
+++ b/python/src/com/jetbrains/python/sdk/PySdkExt.kt
@@ -464,7 +464,7 @@ fun getInnerVirtualEnvRoot(sdk: Sdk): VirtualFile? {
 }
 
 internal suspend fun suggestAssociatedSdkName(sdkHome: String, associatedPath: String?): String? = withContext(Dispatchers.IO) {
-  // please don't forget to update com.jetbrains.python.inspections.PyInterpreterInspection.Visitor#getSuitableSdkFix
+  // please don't forget to update com.jetbrains.python.inspections.interpreter.PyInterpreterInspection.Visitor#getSuitableSdkFix
   // after changing this method
 
   val baseSdkName = PythonSdkType.suggestBaseSdkName(sdkHome) ?: return@withContext null
diff --git a/python/src/com/jetbrains/python/sdk/PySdkPopupFactory.kt b/python/src/com/jetbrains/python/sdk/PySdkPopupFactory.kt
index f04320897117..afeaf80ff80e 100644
--- a/python/src/com/jetbrains/python/sdk/PySdkPopupFactory.kt
+++ b/python/src/com/jetbrains/python/sdk/PySdkPopupFactory.kt
@@ -16,7 +16,7 @@ import com.intellij.util.text.trimMiddle
 import com.intellij.util.ui.SwingHelper
 import com.jetbrains.python.PyBundle
 import com.jetbrains.python.configuration.PyConfigurableInterpreterList
-import com.jetbrains.python.inspections.PyInterpreterInspection
+import com.jetbrains.python.inspections.interpreter.PyInterpreterInspection
 import com.jetbrains.python.psi.LanguageLevel
 import com.jetbrains.python.run.PythonInterpreterTargetEnvironmentFactory
 import com.jetbrains.python.run.codeCouldProbablyBeRunWithConfig
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyInterpreterInspectionTest.kt b/python/testSrc/com/jetbrains/python/inspections/PyInterpreterInspectionTest.kt
index ca0ea13552c6..e2f610fa6baf 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyInterpreterInspectionTest.kt
+++ b/python/testSrc/com/jetbrains/python/inspections/PyInterpreterInspectionTest.kt
@@ -8,6 +8,7 @@ import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.testFramework.LightProjectDescriptor
 import com.jetbrains.python.PyPsiBundle
 import com.jetbrains.python.fixtures.PyTestCase
+import com.jetbrains.python.inspections.interpreter.PyInterpreterInspection
 
 class PyInterpreterInspectionTest : PyTestCase() {
   override fun getProjectDescriptor(): LightProjectDescriptor? = ourPyLatestDescriptor