diff --git a/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml b/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
index c2d9764ddaea..244e7fb5bbb5 100644
--- a/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
+++ b/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
@@ -446,6 +446,9 @@
     <pyClassMembersProvider implementation="com.jetbrains.python.codeInsight.stdlib.PyStdlibClassMembersProvider"/>
     <pyModuleMembersProvider implementation="com.jetbrains.python.codeInsight.stdlib.PyStdlibOverridingModuleMembersProvider"/>
 
+    <!-- TensorFlow -->
+    <importResolver implementation="com.jetbrains.tensorFlow.PyTensorFlowImportResolver"/>
+    <pyModuleMembersProvider implementation="com.jetbrains.tensorFlow.PyTensorFlowModuleMembersProvider"/>
 
   </extensions>
 
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersion.kt b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersion.kt
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersion.kt
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersion.kt
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersionComparator.kt
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyPackageVersionNormalizer.java
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyRequirementImpl.kt b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirementImpl.kt
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyRequirementImpl.kt
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirementImpl.kt
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyRequirementParser.java b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirementParser.java
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyRequirementParser.java
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirementParser.java
diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyRequirements.kt b/python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirements.kt
similarity index 100%
rename from python/python-sdk/src/com/jetbrains/python/packaging/PyRequirements.kt
rename to python/python-psi-impl/src/com/jetbrains/python/packaging/PyRequirements.kt
diff --git a/python/src/com/jetbrains/tensorFlow/PyTensorFlow.kt b/python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlow.kt
similarity index 100%
rename from python/src/com/jetbrains/tensorFlow/PyTensorFlow.kt
rename to python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlow.kt
diff --git a/python/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt b/python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt
similarity index 100%
rename from python/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt
rename to python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlowImportResolver.kt
diff --git a/python/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt b/python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt
similarity index 100%
rename from python/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt
rename to python/python-psi-impl/src/com/jetbrains/tensorFlow/PyTensorFlowModuleMembersProvider.kt
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 0dd4d94cd1b5..df917aa66b43 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -503,10 +503,6 @@
     <!-- PyQt -->
     <typeProvider implementation="com.jetbrains.pyqt.PyQtTypeProvider"/>
 
-    <!-- TensorFlow -->
-    <importResolver implementation="com.jetbrains.tensorFlow.PyTensorFlowImportResolver"/>
-    <pyModuleMembersProvider implementation="com.jetbrains.tensorFlow.PyTensorFlowModuleMembersProvider"/>
-
     <!-- PyFunctionTypeAnnotation -->
     <visitorFilter language="PyFunctionTypeComment"
                    implementationClass="com.jetbrains.python.inspections.PyFunctionTypeAnnotationVisitorFilter"/>