diff --git a/python/python-psi-impl/resources/META-INF/python-psi-impl.xml b/python/python-psi-impl/resources/META-INF/python-psi-impl.xml
index ba4a79247249..7c6090c5dd06 100644
--- a/python/python-psi-impl/resources/META-INF/python-psi-impl.xml
+++ b/python/python-psi-impl/resources/META-INF/python-psi-impl.xml
@@ -51,8 +51,14 @@
 
     <moduleService serviceImplementation="com.jetbrains.python.documentation.PyDocumentationSettings$ModuleService"/>
     <applicationService serviceImplementation="com.jetbrains.python.documentation.PyDocumentationSettings$AppService"/>
+
+    <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PyStdReferenceContributor" language="Python"/>
+    <!-- We run it before FilePathCompletionContributor (id="filePath") to get help text about full path results in the extended completion -->
+    <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PySoftFileReferenceContributor" language="Python" order="before filePath"/>
     <psi.referenceContributor implementation="com.jetbrains.python.documentation.docstrings.DocStringReferenceContributor"
                               language="Python"/>
+    <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PythonFormattedStringReferenceContributor"
+                              language="Python"/>
 
     <!-- PyDocstring -->
     <languageInjector implementation="com.jetbrains.python.documentation.doctest.PyDocstringLanguageInjector"/>
diff --git a/python/src/com/jetbrains/python/codeInsight/PyDunderSlotsReference.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PyDunderSlotsReference.java
similarity index 100%
rename from python/src/com/jetbrains/python/codeInsight/PyDunderSlotsReference.java
rename to python/python-psi-impl/src/com/jetbrains/python/codeInsight/PyDunderSlotsReference.java
diff --git a/python/src/com/jetbrains/python/codeInsight/PySoftFileReferenceContributor.kt b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PySoftFileReferenceContributor.kt
similarity index 100%
rename from python/src/com/jetbrains/python/codeInsight/PySoftFileReferenceContributor.kt
rename to python/python-psi-impl/src/com/jetbrains/python/codeInsight/PySoftFileReferenceContributor.kt
diff --git a/python/src/com/jetbrains/python/codeInsight/PyStdReferenceContributor.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PyStdReferenceContributor.java
similarity index 100%
rename from python/src/com/jetbrains/python/codeInsight/PyStdReferenceContributor.java
rename to python/python-psi-impl/src/com/jetbrains/python/codeInsight/PyStdReferenceContributor.java
diff --git a/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
similarity index 100%
rename from python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
rename to python/python-psi-impl/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
diff --git a/python/src/com/jetbrains/python/codeInsight/PythonFormattedStringReferenceContributor.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PythonFormattedStringReferenceContributor.java
similarity index 100%
rename from python/src/com/jetbrains/python/codeInsight/PythonFormattedStringReferenceContributor.java
rename to python/python-psi-impl/src/com/jetbrains/python/codeInsight/PythonFormattedStringReferenceContributor.java
diff --git a/python/src/com/jetbrains/python/codeInsight/PythonFormattedStringReferenceProvider.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/PythonFormattedStringReferenceProvider.java
similarity index 100%
rename from python/src/com/jetbrains/python/codeInsight/PythonFormattedStringReferenceProvider.java
rename to python/python-psi-impl/src/com/jetbrains/python/codeInsight/PythonFormattedStringReferenceProvider.java
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index b3df41bb6863..268a22432d79 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -496,9 +496,6 @@
 
     <editorSmartKeysConfigurable instance="com.jetbrains.python.codeInsight.PySmartKeysOptions" id="editor.preferences.pyOptions"/>
 
-    <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PyStdReferenceContributor" language="Python"/>
-    <!-- We run it before FilePathCompletionContributor (id="filePath") to get help text about full path results in the extended completion -->
-    <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PySoftFileReferenceContributor" language="Python" order="before filePath"/>
     <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PyConsoleFileReferenceContributor" language="Python" order="before filePath"/>
     <psi.referenceContributor implementation="com.jetbrains.python.testing.pyTestFixtures.PyTestFixtureReferenceContributor" language="Python"/>
 
@@ -509,8 +506,6 @@
                          id="com.jetbrains.python.configuration.PyIntegratedToolsModulesConfigurable" displayName="Python Integrated Tools"
                          />
     <search.optionContributor implementation="com.jetbrains.python.PySearchableOptionContributor"/>
-    <psi.referenceContributor implementation="com.jetbrains.python.codeInsight.PythonFormattedStringReferenceContributor"
-                              language="Python"/>
 
     <treeStructureProvider implementation="com.jetbrains.python.projectView.PyTreeStructureProvider"/>