diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml
index f9524743de4d..5e152f6142ba 100644
--- a/python/pluginResources/intellij.python.community.impl.xml
+++ b/python/pluginResources/intellij.python.community.impl.xml
@@ -250,8 +250,6 @@
     <applicationService serviceImplementation="com.jetbrains.python.packaging.PyPackageService"/>
     <applicationService serviceInterface="com.jetbrains.python.sdk.add.v2.EelFileSystemFactory"
                         serviceImplementation="com.jetbrains.python.sdk.add.v2.EelFileSystemFactoryImpl"/>
-    <projectService serviceInterface="com.jetbrains.python.module.PyModuleService"
-                    serviceImplementation="com.jetbrains.python.module.PyModuleServiceImpl"/>
     <applicationService serviceInterface="com.jetbrains.python.psi.resolve.PackageAvailabilityService"
                         serviceImplementation="com.jetbrains.python.packaging.PackageAvailabilityServiceImpl"/>
     <typedHandler implementation="com.jetbrains.python.codeInsight.PyMethodNameTypedHandler" id="pyMethodNameTypedHandler"/>
diff --git a/python/python-core-impl/BUILD.bazel b/python/python-core-impl/BUILD.bazel
index 2588841a9b88..9a9c081e021f 100644
--- a/python/python-core-impl/BUILD.bazel
+++ b/python/python-core-impl/BUILD.bazel
@@ -15,8 +15,10 @@ jvm_library(
     "//jps/model-api:model",
     "//platform/projectModel-api:projectModel",
     "//python/python-psi-api:psi",
+    "//python/openapi:community",
     "//platform/analysis-impl",
     "//platform/lang-api:lang",
+    "//platform/lang-core",
     "//platform/lang-impl",
     "//RegExpSupport:regexp",
     "//libraries/guava",
@@ -24,6 +26,7 @@ jvm_library(
     "//python/python-sdk:sdk",
     "@lib//:kotlin-stdlib",
     "//platform/core-impl",
+    "//libraries/kotlinx/coroutines/core",
   ]
 )
 
@@ -41,14 +44,17 @@ jvm_library(
     "//jps/model-api:model_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
     "//python/python-psi-api:psi_test_lib",
+    "//python/openapi:community_test_lib",
     "//platform/analysis-impl:analysis-impl_test_lib",
     "//platform/lang-api:lang_test_lib",
+    "//platform/lang-core:lang-core_test_lib",
     "//platform/lang-impl:lang-impl_test_lib",
     "//RegExpSupport:regexp_test_lib",
     "//libraries/guava:guava_test_lib",
     "//python/python-psi-impl:psi-impl_test_lib",
     "//python/python-sdk:sdk_test_lib",
     "//platform/core-impl:core-impl_test_lib",
+    "//libraries/kotlinx/coroutines/core:core_test_lib",
   ]
 )
 ### auto-generated section `build intellij.python.community.core.impl` end
diff --git a/python/python-core-impl/intellij.python.community.core.impl.iml b/python/python-core-impl/intellij.python.community.core.impl.iml
index 8b40b9610e39..d3429388a803 100644
--- a/python/python-core-impl/intellij.python.community.core.impl.iml
+++ b/python/python-core-impl/intellij.python.community.core.impl.iml
@@ -14,8 +14,10 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.python.psi" />
+    <orderEntry type="module" module-name="intellij.python.community" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.regexp" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
@@ -23,5 +25,6 @@
     <orderEntry type="module" module-name="intellij.python.sdk" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/python-core-impl/resources/intellij.python.community.core.impl.xml b/python/python-core-impl/resources/intellij.python.community.core.impl.xml
index 2adbf347f19e..d10fd749ff45 100644
--- a/python/python-core-impl/resources/intellij.python.community.core.impl.xml
+++ b/python/python-core-impl/resources/intellij.python.community.core.impl.xml
@@ -1,7 +1,13 @@
 <idea-plugin visibility="public">
   <dependencies>
+    <module name="intellij.python.community"/>
     <module name="intellij.python.psi.impl"/>
     <module name="intellij.python.sdk"/>
     <module name="intellij.regexp"/>
   </dependencies>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <projectService serviceInterface="com.jetbrains.python.module.PyModuleService"
+                    serviceImplementation="com.jetbrains.python.module.PyModuleServiceImpl"/>
+  </extensions>
 </idea-plugin>
diff --git a/python/src/com/jetbrains/python/module/PyModuleServiceImpl.kt b/python/python-core-impl/src/com/jetbrains/python/module/PyModuleServiceImpl.kt
similarity index 90%
rename from python/src/com/jetbrains/python/module/PyModuleServiceImpl.kt
rename to python/python-core-impl/src/com/jetbrains/python/module/PyModuleServiceImpl.kt
index e5b69517d8c7..d515f00bf897 100644
--- a/python/src/com/jetbrains/python/module/PyModuleServiceImpl.kt
+++ b/python/python-core-impl/src/com/jetbrains/python/module/PyModuleServiceImpl.kt
@@ -11,7 +11,6 @@ import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.util.Consumer
 import com.jetbrains.python.PyNames
-import com.jetbrains.python.PythonModuleTypeBase
 import com.jetbrains.python.facet.PythonFacetSettings
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
@@ -52,9 +51,7 @@ internal class PyModuleServiceImpl(val project: Project, coroutineScope: Corouti
 
   override fun isPythonModule(module: Module): Boolean {
     val type = ModuleType.get(module)
-    if (type is PythonModuleTypeBase || type.id == PyNames.PYTHON_MODULE_ID) {
-      return true
-    }
-    return FacetManager.getInstance(module).allFacets.any { it.configuration is PythonFacetSettings }
+    return type.id == PyNames.PYTHON_MODULE_ID ||
+           FacetManager.getInstance(module).allFacets.any { it.configuration is PythonFacetSettings }
   }
 }