diff --git a/platform/analysis-api/intellij.platform.analysis.iml b/platform/analysis-api/intellij.platform.analysis.iml
index ca6ba1fdae00..155a97495c97 100644
--- a/platform/analysis-api/intellij.platform.analysis.iml
+++ b/platform/analysis-api/intellij.platform.analysis.iml
@@ -17,5 +17,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
+    <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/analysis-impl/src/com/intellij/webcore/packaging/PackageManagementService.java b/platform/analysis-api/src/com/intellij/webcore/packaging/PackageManagementService.java
similarity index 100%
rename from platform/analysis-impl/src/com/intellij/webcore/packaging/PackageManagementService.java
rename to platform/analysis-api/src/com/intellij/webcore/packaging/PackageManagementService.java
diff --git a/platform/analysis-impl/src/com/intellij/webcore/packaging/PackageVersionComparator.java b/platform/analysis-api/src/com/intellij/webcore/packaging/PackageVersionComparator.java
similarity index 70%
rename from platform/analysis-impl/src/com/intellij/webcore/packaging/PackageVersionComparator.java
rename to platform/analysis-api/src/com/intellij/webcore/packaging/PackageVersionComparator.java
index ea1d5a141044..0252c33127fb 100644
--- a/platform/analysis-impl/src/com/intellij/webcore/packaging/PackageVersionComparator.java
+++ b/platform/analysis-api/src/com/intellij/webcore/packaging/PackageVersionComparator.java
@@ -1,21 +1,6 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.webcore.packaging;
 
-import com.google.common.collect.ImmutableMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -46,10 +31,10 @@ public class PackageVersionComparator implements Comparator<String> {
 
   @Nullable
   private static String replace(@NotNull String s) {
-    final Map<String, String> sub = ImmutableMap.of("pre", "c",
-                                                    "preview", "c",
-                                                    "rc", "c",
-                                                    "dev", "@");
+    final Map<String, String> sub = Map.of("pre", "c",
+                                           "preview", "c",
+                                           "rc", "c",
+                                           "dev", "@");
     final String tmp = sub.get(s);
     if (tmp != null) {
       s = tmp;
diff --git a/platform/analysis-impl/src/com/intellij/webcore/packaging/RepoPackage.java b/platform/analysis-api/src/com/intellij/webcore/packaging/RepoPackage.java
similarity index 100%
rename from platform/analysis-impl/src/com/intellij/webcore/packaging/RepoPackage.java
rename to platform/analysis-api/src/com/intellij/webcore/packaging/RepoPackage.java
diff --git a/python/openapi/intellij.python.community.iml b/python/openapi/intellij.python.community.iml
index ee52aa7dfa1c..1de27bd24532 100644
--- a/python/openapi/intellij.python.community.iml
+++ b/python/openapi/intellij.python.community.iml
@@ -9,9 +9,12 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.python.psi" exported="" />
     <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" exported="" />
     <orderEntry type="library" name="jsoup" level="project" />
     <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/python-grazie/intellij.python.grazie.iml b/python/python-grazie/intellij.python.grazie.iml
index d41317fae26c..177a0d87a6f7 100644
--- a/python/python-grazie/intellij.python.grazie.iml
+++ b/python/python-grazie/intellij.python.grazie.iml
@@ -11,5 +11,6 @@
     <orderEntry type="module" module-name="intellij.grazie" />
     <orderEntry type="module" module-name="intellij.python.community.impl" />
     <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/python-grazie/src/com/intellij/grazie/ide/language/python/PythonTextExtractor.kt b/python/python-grazie/src/com/intellij/grazie/ide/language/python/PythonTextExtractor.kt
index e9b4fc4e92a5..063c96c63939 100644
--- a/python/python-grazie/src/com/intellij/grazie/ide/language/python/PythonTextExtractor.kt
+++ b/python/python-grazie/src/com/intellij/grazie/ide/language/python/PythonTextExtractor.kt
@@ -8,15 +8,14 @@ import com.intellij.grazie.utils.getNotSoDistantSimilarSiblings
 import com.intellij.psi.PsiElement
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import com.intellij.psi.impl.source.tree.PsiCommentImpl
-import com.intellij.psi.tree.TokenSet
-import com.intellij.psi.util.elementType
+import com.intellij.psi.util.PsiUtilCore
 import com.jetbrains.python.PyTokenTypes
 import com.jetbrains.python.PyTokenTypes.FSTRING_TEXT
 import com.jetbrains.python.psi.PyFormattedStringElement
 
 internal class PythonTextExtractor : TextExtractor() {
   override fun buildTextContent(root: PsiElement, allowedDomains: MutableSet<TextContent.TextDomain>): TextContent? {
-    val elementType = root.elementType
+    val elementType = PsiUtilCore.getElementType(root)
     if (elementType in PyTokenTypes.STRING_NODES) {
       val domain = if (elementType == PyTokenTypes.DOCSTRING) TextContent.TextDomain.DOCUMENTATION else TextContent.TextDomain.LITERALS
       return TextContentBuilder.FromPsi.removingIndents(" \t").withUnknown(this::isUnknownFragment).build(root.parent, domain)
diff --git a/python/openapi/src/com/jetbrains/python/psi/PyStringLiteralFileReferenceSet.java b/python/python-psi-impl/src/com/jetbrains/python/psi/PyStringLiteralFileReferenceSet.java
similarity index 100%
rename from python/openapi/src/com/jetbrains/python/psi/PyStringLiteralFileReferenceSet.java
rename to python/python-psi-impl/src/com/jetbrains/python/psi/PyStringLiteralFileReferenceSet.java
diff --git a/python/openapi/src/com/jetbrains/python/psi/RootFileReferenceSet.java b/python/python-psi-impl/src/com/jetbrains/python/psi/RootFileReferenceSet.java
similarity index 100%
rename from python/openapi/src/com/jetbrains/python/psi/RootFileReferenceSet.java
rename to python/python-psi-impl/src/com/jetbrains/python/psi/RootFileReferenceSet.java
diff --git a/python/openapi/src/com/jetbrains/python/psi/FileReferenceWithOneContext.java b/python/src/com/jetbrains/python/psi/FileReferenceWithOneContext.java
similarity index 100%
rename from python/openapi/src/com/jetbrains/python/psi/FileReferenceWithOneContext.java
rename to python/src/com/jetbrains/python/psi/FileReferenceWithOneContext.java
diff --git a/python/openapi/src/com/jetbrains/python/psi/WeakFileReference.java b/python/src/com/jetbrains/python/psi/WeakFileReference.java
similarity index 100%
rename from python/openapi/src/com/jetbrains/python/psi/WeakFileReference.java
rename to python/src/com/jetbrains/python/psi/WeakFileReference.java