diff --git a/python/python-psi-impl/src/META-INF/python-psi-impl.xml b/python/python-psi-impl/src/META-INF/python-psi-impl.xml
index 23c64ac30800..7a593d587285 100644
--- a/python/python-psi-impl/src/META-INF/python-psi-impl.xml
+++ b/python/python-psi-impl/src/META-INF/python-psi-impl.xml
@@ -52,9 +52,6 @@
     <psi.referenceContributor implementation="com.jetbrains.python.documentation.docstrings.DocStringReferenceContributor"
                               language="Python"/>
 
-    <projectService serviceImplementation="com.jetbrains.python.codeInsight.typing.PyStubPackagesInstallingStatus"/>
-
-
     <!-- PyDocstring -->
     <languageInjector implementation="com.jetbrains.python.documentation.doctest.PyDocstringLanguageInjector"/>
     <lang.parserDefinition language="PyDocstring" implementationClass="com.jetbrains.python.documentation.doctest.PyDocstringParserDefinition"/>
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 8414f183dc43..209a2788619c 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -548,6 +548,7 @@
     <applicationService serviceInterface="com.jetbrains.python.packaging.PyPackageManagers"
                         serviceImplementation="com.jetbrains.python.packaging.PyPackageManagersImpl"/>
     <applicationService serviceImplementation="com.jetbrains.python.codeInsight.typing.PyStubPackagesAdvertiserCache"/>
+    <projectService serviceImplementation="com.jetbrains.python.codeInsight.typing.PyStubPackagesInstallingStatus"/>
 
     <qualifiedNameProvider implementation="com.jetbrains.python.actions.PyQualifiedNameProvider"/>
 
diff --git a/python/src/com/jetbrains/python/codeInsight/typing/PyStubPackagesCompatibilityInspection.kt b/python/src/com/jetbrains/python/codeInsight/typing/PyStubPackagesCompatibilityInspection.kt
index 5cd84595b7cf..aabd816a967e 100644
--- a/python/src/com/jetbrains/python/codeInsight/typing/PyStubPackagesCompatibilityInspection.kt
+++ b/python/src/com/jetbrains/python/codeInsight/typing/PyStubPackagesCompatibilityInspection.kt
@@ -13,8 +13,6 @@ import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.profile.codeInspection.ProjectInspectionProfileManager
 import com.intellij.psi.PsiElementVisitor
-import com.jetbrains.python.codeInsight.typing.PyStubPackagesInstallingStatus
-import com.jetbrains.python.codeInsight.typing.STUBS_SUFFIX
 import com.jetbrains.python.inspections.PyInspection
 import com.jetbrains.python.inspections.PyInspectionVisitor
 import com.jetbrains.python.inspections.PyInterpreterInspection
diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyStubPackagesInstallingStatus.kt b/python/src/com/jetbrains/python/codeInsight/typing/PyStubPackagesInstallingStatus.kt
similarity index 100%
rename from python/python-psi-impl/src/com/jetbrains/python/codeInsight/typing/PyStubPackagesInstallingStatus.kt
rename to python/src/com/jetbrains/python/codeInsight/typing/PyStubPackagesInstallingStatus.kt