From 55fbfb54c2d773afb1a3f64143d87ac3febdb028 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Tue, 3 Sep 2019 01:11:34 +0200
Subject: [PATCH] Rename directory

GitOrigin-RevId: 6939d85c09441c664ab32bf98dce21846418627b
---
 .idea/modules.xml                                             | 4 ++--
 python/{psi-api => python-psi-api}/intellij.python.psi.iml    | 0
 .../resources/icons/com/jetbrains/python/pythonFile.svg       | 0
 .../src/com/jetbrains/python/FunctionParameter.java           | 0
 .../src/com/jetbrains/python/PyNames.java                     | 0
 .../src/com/jetbrains/python/PyTokenTypes.java                | 0
 .../jetbrains/python/PythonDialectsTokenSetContributor.java   | 0
 .../python/PythonDialectsTokenSetContributorBase.java         | 0
 .../src/com/jetbrains/python/PythonFQDNNames.java             | 0
 .../src/com/jetbrains/python/PythonFileType.java              | 0
 .../src/com/jetbrains/python/PythonFunctionParameters.java    | 0
 .../src/com/jetbrains/python/PythonLanguage.java              | 0
 .../src/com/jetbrains/python/codeInsight/PyCustomMember.java  | 0
 .../jetbrains/python/codeInsight/PyCustomMemberTypeInfo.java  | 0
 .../src/com/jetbrains/python/codeInsight/PyPsiPath.java       | 0
 .../jetbrains/python/codeInsight/controlflow/ScopeOwner.java  | 0
 .../jetbrains/python/inspections/PyInspectionExtension.java   | 0
 .../com/jetbrains/python/nameResolver/FQNamesProvider.java    | 0
 .../com/jetbrains/python/nameResolver/NameResolverTools.java  | 0
 .../src/com/jetbrains/python/nameResolver/package-info.java   | 0
 .../src/com/jetbrains/python/psi/AccessDirection.java         | 0
 .../src/com/jetbrains/python/psi/FutureFeature.java           | 0
 .../src/com/jetbrains/python/psi/LanguageLevel.java           | 0
 .../src/com/jetbrains/python/psi/Property.java                | 0
 .../src/com/jetbrains/python/psi/PyAnnotation.java            | 0
 .../src/com/jetbrains/python/psi/PyAnnotationOwner.java       | 0
 .../src/com/jetbrains/python/psi/PyArgumentList.java          | 0
 .../src/com/jetbrains/python/psi/PyAssertStatement.java       | 0
 .../src/com/jetbrains/python/psi/PyAssignmentExpression.java  | 0
 .../src/com/jetbrains/python/psi/PyAssignmentStatement.java   | 0
 .../com/jetbrains/python/psi/PyAugAssignmentStatement.java    | 0
 .../src/com/jetbrains/python/psi/PyBinaryExpression.java      | 0
 .../src/com/jetbrains/python/psi/PyBoolLiteralExpression.java | 0
 .../src/com/jetbrains/python/psi/PyBreakStatement.java        | 0
 .../src/com/jetbrains/python/psi/PyCallExpression.java        | 0
 .../src/com/jetbrains/python/psi/PyCallSiteExpression.java    | 0
 .../src/com/jetbrains/python/psi/PyCallable.java              | 0
 .../src/com/jetbrains/python/psi/PyClass.java                 | 0
 .../com/jetbrains/python/psi/PyComprehensionComponent.java    | 0
 .../src/com/jetbrains/python/psi/PyComprehensionElement.java  | 0
 .../com/jetbrains/python/psi/PyComprehensionForComponent.java | 0
 .../com/jetbrains/python/psi/PyComprehensionIfComponent.java  | 0
 .../src/com/jetbrains/python/psi/PyConditionalExpression.java | 0
 .../com/jetbrains/python/psi/PyConditionalStatementPart.java  | 0
 .../src/com/jetbrains/python/psi/PyContinueStatement.java     | 0
 .../com/jetbrains/python/psi/PyCustomPackageIdentifier.java   | 0
 .../src/com/jetbrains/python/psi/PyDecoratable.java           | 0
 .../src/com/jetbrains/python/psi/PyDecorator.java             | 0
 .../src/com/jetbrains/python/psi/PyDecoratorList.java         | 0
 .../src/com/jetbrains/python/psi/PyDelStatement.java          | 0
 .../src/com/jetbrains/python/psi/PyDictCompExpression.java    | 0
 .../src/com/jetbrains/python/psi/PyDictLiteralExpression.java | 0
 .../src/com/jetbrains/python/psi/PyDocStringOwner.java        | 0
 .../src/com/jetbrains/python/psi/PyDoubleStarExpression.java  | 0
 .../src/com/jetbrains/python/psi/PyElement.java               | 0
 .../src/com/jetbrains/python/psi/PyElementGenerator.java      | 0
 .../src/com/jetbrains/python/psi/PyElementType.java           | 0
 .../src/com/jetbrains/python/psi/PyElementVisitor.java        | 0
 .../src/com/jetbrains/python/psi/PyElsePart.java              | 0
 .../src/com/jetbrains/python/psi/PyEmptyExpression.java       | 0
 .../src/com/jetbrains/python/psi/PyExceptPart.java            | 0
 .../src/com/jetbrains/python/psi/PyExecStatement.java         | 0
 .../src/com/jetbrains/python/psi/PyExpression.java            | 0
 .../com/jetbrains/python/psi/PyExpressionCodeFragment.java    | 0
 .../src/com/jetbrains/python/psi/PyExpressionStatement.java   | 0
 .../src/com/jetbrains/python/psi/PyFStringFragment.java       | 0
 .../com/jetbrains/python/psi/PyFStringFragmentFormatPart.java | 0
 .../src/com/jetbrains/python/psi/PyFile.java                  | 0
 .../src/com/jetbrains/python/psi/PyFinallyPart.java           | 0
 .../src/com/jetbrains/python/psi/PyForPart.java               | 0
 .../src/com/jetbrains/python/psi/PyForStatement.java          | 0
 .../com/jetbrains/python/psi/PyFormattedStringElement.java    | 0
 .../src/com/jetbrains/python/psi/PyFromImportStatement.java   | 0
 .../src/com/jetbrains/python/psi/PyFunction.java              | 0
 .../src/com/jetbrains/python/psi/PyGeneratorExpression.java   | 0
 .../src/com/jetbrains/python/psi/PyGlobalStatement.java       | 0
 .../src/com/jetbrains/python/psi/PyIfPart.java                | 0
 .../src/com/jetbrains/python/psi/PyIfStatement.java           | 0
 .../com/jetbrains/python/psi/PyImplicitImportNameDefiner.java | 0
 .../src/com/jetbrains/python/psi/PyImportElement.java         | 0
 .../src/com/jetbrains/python/psi/PyImportStatement.java       | 0
 .../src/com/jetbrains/python/psi/PyImportStatementBase.java   | 0
 .../src/com/jetbrains/python/psi/PyImportedNameDefiner.java   | 0
 .../src/com/jetbrains/python/psi/PyKeyValueExpression.java    | 0
 .../src/com/jetbrains/python/psi/PyKeywordArgument.java       | 0
 .../com/jetbrains/python/psi/PyKnownDecoratorProvider.java    | 0
 .../src/com/jetbrains/python/psi/PyLambdaExpression.java      | 0
 .../src/com/jetbrains/python/psi/PyListCompExpression.java    | 0
 .../src/com/jetbrains/python/psi/PyListLiteralExpression.java | 0
 .../src/com/jetbrains/python/psi/PyLiteralExpression.java     | 0
 .../src/com/jetbrains/python/psi/PyLoopStatement.java         | 0
 .../src/com/jetbrains/python/psi/PyNamedElementContainer.java | 0
 .../src/com/jetbrains/python/psi/PyNamedParameter.java        | 0
 .../src/com/jetbrains/python/psi/PyNoneLiteralExpression.java | 0
 .../src/com/jetbrains/python/psi/PyNonlocalStatement.java     | 0
 .../com/jetbrains/python/psi/PyNumericLiteralExpression.java  | 0
 .../src/com/jetbrains/python/psi/PyParameter.java             | 0
 .../src/com/jetbrains/python/psi/PyParameterList.java         | 0
 .../com/jetbrains/python/psi/PyParenthesizedExpression.java   | 0
 .../src/com/jetbrains/python/psi/PyPassStatement.java         | 0
 .../src/com/jetbrains/python/psi/PyPlainStringElement.java    | 0
 .../src/com/jetbrains/python/psi/PyPossibleClassMember.java   | 0
 .../src/com/jetbrains/python/psi/PyPrefixExpression.java      | 0
 .../src/com/jetbrains/python/psi/PyPrintStatement.java        | 0
 .../src/com/jetbrains/python/psi/PyPrintTarget.java           | 0
 .../src/com/jetbrains/python/psi/PyPsiFacade.java             | 0
 .../src/com/jetbrains/python/psi/PyQualifiedExpression.java   | 0
 .../src/com/jetbrains/python/psi/PyQualifiedNameOwner.java    | 0
 .../src/com/jetbrains/python/psi/PyRaiseStatement.java        | 0
 .../com/jetbrains/python/psi/PyRecursiveElementVisitor.java   | 0
 .../src/com/jetbrains/python/psi/PyReferenceExpression.java   | 0
 .../src/com/jetbrains/python/psi/PyReferenceOwner.java        | 0
 .../src/com/jetbrains/python/psi/PyReprExpression.java        | 0
 .../src/com/jetbrains/python/psi/PyReturnStatement.java       | 0
 .../src/com/jetbrains/python/psi/PySequenceExpression.java    | 0
 .../src/com/jetbrains/python/psi/PySetCompExpression.java     | 0
 .../src/com/jetbrains/python/psi/PySetLiteralExpression.java  | 0
 .../src/com/jetbrains/python/psi/PySingleStarParameter.java   | 0
 .../src/com/jetbrains/python/psi/PySlashParameter.java        | 0
 .../src/com/jetbrains/python/psi/PySliceExpression.java       | 0
 .../src/com/jetbrains/python/psi/PySliceItem.java             | 0
 .../src/com/jetbrains/python/psi/PyStarArgument.java          | 0
 .../src/com/jetbrains/python/psi/PyStarExpression.java        | 0
 .../src/com/jetbrains/python/psi/PyStarImportElement.java     | 0
 .../src/com/jetbrains/python/psi/PyStatement.java             | 0
 .../src/com/jetbrains/python/psi/PyStatementList.java         | 0
 .../com/jetbrains/python/psi/PyStatementListContainer.java    | 0
 .../src/com/jetbrains/python/psi/PyStatementPart.java         | 0
 .../src/com/jetbrains/python/psi/PyStatementWithElse.java     | 0
 .../src/com/jetbrains/python/psi/PyStringElement.java         | 0
 .../com/jetbrains/python/psi/PyStringLiteralExpression.java   | 0
 .../src/com/jetbrains/python/psi/PyStubElementType.java       | 0
 .../com/jetbrains/python/psi/PySubscriptionExpression.java    | 0
 .../src/com/jetbrains/python/psi/PyTargetExpression.java      | 0
 .../src/com/jetbrains/python/psi/PyTryExceptStatement.java    | 0
 .../src/com/jetbrains/python/psi/PyTryPart.java               | 0
 .../src/com/jetbrains/python/psi/PyTupleExpression.java       | 0
 .../src/com/jetbrains/python/psi/PyTupleParameter.java        | 0
 .../src/com/jetbrains/python/psi/PyTypeCommentOwner.java      | 0
 .../com/jetbrains/python/psi/PyTypeDeclarationStatement.java  | 0
 .../src/com/jetbrains/python/psi/PyTypedElement.java          | 0
 .../src/com/jetbrains/python/psi/PyWhilePart.java             | 0
 .../src/com/jetbrains/python/psi/PyWhileStatement.java        | 0
 .../src/com/jetbrains/python/psi/PyWithAncestors.java         | 0
 .../src/com/jetbrains/python/psi/PyWithItem.java              | 0
 .../src/com/jetbrains/python/psi/PyWithStatement.java         | 0
 .../src/com/jetbrains/python/psi/PyYieldExpression.java       | 0
 .../src/com/jetbrains/python/psi/StringLiteralExpression.java | 0
 .../src/com/jetbrains/python/psi/StructuredDocString.java     | 0
 .../src/com/jetbrains/python/psi/impl/PyImportResolver.java   | 0
 .../jetbrains/python/psi/impl/PyKeywordArgumentProvider.java  | 0
 .../jetbrains/python/psi/impl/PyOverridingTypeProvider.java   | 0
 .../src/com/jetbrains/python/psi/impl/PyPsiUtils.java         | 0
 .../com/jetbrains/python/psi/impl/PyResolveResultRater.java   | 0
 .../jetbrains/python/psi/impl/PyResolveResultRaterBase.java   | 0
 .../src/com/jetbrains/python/psi/impl/PyTypeProvider.java     | 0
 .../src/com/jetbrains/python/psi/resolve/PointInImport.java   | 0
 .../jetbrains/python/psi/resolve/PyCanonicalPathProvider.java | 0
 .../psi/resolve/PyOverridingReferenceResolveProvider.java     | 0
 .../python/psi/resolve/PyQualifiedNameResolveContext.java     | 0
 .../python/psi/resolve/PyReferenceResolveProvider.java        | 0
 .../com/jetbrains/python/psi/resolve/PyResolveContext.java    | 0
 .../python/psi/resolve/QualifiedRatedResolveResult.java       | 0
 .../jetbrains/python/psi/resolve/QualifiedResolveResult.java  | 0
 .../com/jetbrains/python/psi/resolve/RatedResolveResult.java  | 0
 .../com/jetbrains/python/psi/stubs/PyAnnotationOwnerStub.java | 0
 .../src/com/jetbrains/python/psi/stubs/PyAnnotationStub.java  | 0
 .../src/com/jetbrains/python/psi/stubs/PyClassStub.java       | 0
 .../com/jetbrains/python/psi/stubs/PyDecoratorListStub.java   | 0
 .../src/com/jetbrains/python/psi/stubs/PyDecoratorStub.java   | 0
 .../src/com/jetbrains/python/psi/stubs/PyExceptPartStub.java  | 0
 .../src/com/jetbrains/python/psi/stubs/PyFileStub.java        | 0
 .../jetbrains/python/psi/stubs/PyFromImportStatementStub.java | 0
 .../src/com/jetbrains/python/psi/stubs/PyFunctionStub.java    | 0
 .../com/jetbrains/python/psi/stubs/PyImportElementStub.java   | 0
 .../com/jetbrains/python/psi/stubs/PyImportStatementStub.java | 0
 .../com/jetbrains/python/psi/stubs/PyNamedParameterStub.java  | 0
 .../com/jetbrains/python/psi/stubs/PyParameterListStub.java   | 0
 .../jetbrains/python/psi/stubs/PySingleStarParameterStub.java | 0
 .../com/jetbrains/python/psi/stubs/PySlashParameterStub.java  | 0
 .../jetbrains/python/psi/stubs/PyStarImportElementStub.java   | 0
 .../jetbrains/python/psi/stubs/PyTargetExpressionStub.java    | 0
 .../com/jetbrains/python/psi/stubs/PyTupleParameterStub.java  | 0
 .../jetbrains/python/psi/stubs/PyTypeCommentOwnerStub.java    | 0
 .../com/jetbrains/python/psi/types/PyCallableParameter.java   | 0
 .../src/com/jetbrains/python/psi/types/PyCallableType.java    | 0
 .../src/com/jetbrains/python/psi/types/PyClassLikeType.java   | 0
 .../jetbrains/python/psi/types/PyClassMembersProvider.java    | 0
 .../python/psi/types/PyClassMembersProviderBase.java          | 0
 .../src/com/jetbrains/python/psi/types/PyClassType.java       | 0
 .../src/com/jetbrains/python/psi/types/PyFunctionType.java    | 0
 .../com/jetbrains/python/psi/types/PyInstantiableType.java    | 0
 .../jetbrains/python/psi/types/PyModuleMembersProvider.java   | 0
 .../psi/types/PyOverridingAncestorsClassMembersProvider.java  | 0
 .../python/psi/types/PyOverridingClassMembersProvider.java    | 0
 .../python/psi/types/PyOverridingModuleMembersProvider.java   | 0
 .../src/com/jetbrains/python/psi/types/PyType.java            | 0
 .../com/jetbrains/python/psi/types/PyTypeProviderBase.java    | 0
 .../com/jetbrains/python/psi/types/TypeEvalConstraints.java   | 0
 .../src/com/jetbrains/python/psi/types/TypeEvalContext.java   | 0
 .../jetbrains/python/psi/types/TypeEvalContextBasedCache.java | 0
 .../com/jetbrains/python/psi/types/TypeEvalContextCache.java  | 0
 .../jetbrains/python/psi/types/TypeEvalContextCacheImpl.java  | 0
 .../src/com/jetbrains/python/toolbox/Maybe.java               | 0
 .../src/com/jetbrains/python/toolbox/Substring.java           | 0
 .../src/icons/PythonPsiApiIcons.java                          | 0
 206 files changed, 2 insertions(+), 2 deletions(-)
 rename python/{psi-api => python-psi-api}/intellij.python.psi.iml (100%)
 rename python/{psi-api => python-psi-api}/resources/icons/com/jetbrains/python/pythonFile.svg (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/FunctionParameter.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/PyNames.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/PyTokenTypes.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/PythonDialectsTokenSetContributor.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/PythonDialectsTokenSetContributorBase.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/PythonFQDNNames.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/PythonFileType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/PythonFunctionParameters.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/PythonLanguage.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/codeInsight/PyCustomMember.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/codeInsight/PyCustomMemberTypeInfo.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/codeInsight/PyPsiPath.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/codeInsight/controlflow/ScopeOwner.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/inspections/PyInspectionExtension.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/nameResolver/FQNamesProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/nameResolver/NameResolverTools.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/nameResolver/package-info.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/AccessDirection.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/FutureFeature.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/LanguageLevel.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/Property.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyAnnotation.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyAnnotationOwner.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyArgumentList.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyAssertStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyAssignmentExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyAssignmentStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyAugAssignmentStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyBinaryExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyBoolLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyBreakStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyCallExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyCallSiteExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyCallable.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyClass.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyComprehensionComponent.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyComprehensionElement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyComprehensionForComponent.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyComprehensionIfComponent.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyConditionalExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyConditionalStatementPart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyContinueStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyCustomPackageIdentifier.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyDecoratable.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyDecorator.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyDecoratorList.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyDelStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyDictCompExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyDictLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyDocStringOwner.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyDoubleStarExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyElement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyElementGenerator.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyElementType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyElementVisitor.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyElsePart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyEmptyExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyExceptPart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyExecStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyExpressionCodeFragment.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyExpressionStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyFStringFragment.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyFStringFragmentFormatPart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyFile.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyFinallyPart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyForPart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyForStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyFormattedStringElement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyFromImportStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyFunction.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyGeneratorExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyGlobalStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyIfPart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyIfStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyImplicitImportNameDefiner.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyImportElement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyImportStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyImportStatementBase.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyImportedNameDefiner.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyKeyValueExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyKeywordArgument.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyKnownDecoratorProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyLambdaExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyListCompExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyListLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyLoopStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyNamedElementContainer.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyNamedParameter.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyNoneLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyNonlocalStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyNumericLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyParameter.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyParameterList.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyParenthesizedExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyPassStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyPlainStringElement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyPossibleClassMember.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyPrefixExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyPrintStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyPrintTarget.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyPsiFacade.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyQualifiedExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyQualifiedNameOwner.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyRaiseStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyReferenceExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyReferenceOwner.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyReprExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyReturnStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PySequenceExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PySetCompExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PySetLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PySingleStarParameter.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PySlashParameter.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PySliceExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PySliceItem.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStarArgument.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStarExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStarImportElement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStatementList.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStatementListContainer.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStatementPart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStatementWithElse.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStringElement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStringLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyStubElementType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PySubscriptionExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyTargetExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyTryExceptStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyTryPart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyTupleExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyTupleParameter.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyTypeCommentOwner.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyTypeDeclarationStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyTypedElement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyWhilePart.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyWhileStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyWithAncestors.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyWithItem.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyWithStatement.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/PyYieldExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/StringLiteralExpression.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/StructuredDocString.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/impl/PyImportResolver.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/impl/PyOverridingTypeProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/impl/PyPsiUtils.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/impl/PyResolveResultRater.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/impl/PyResolveResultRaterBase.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/impl/PyTypeProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/PointInImport.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/PyCanonicalPathProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/PyOverridingReferenceResolveProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/PyQualifiedNameResolveContext.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/PyReferenceResolveProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/PyResolveContext.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/QualifiedRatedResolveResult.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/QualifiedResolveResult.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/resolve/RatedResolveResult.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyAnnotationOwnerStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyAnnotationStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyClassStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyDecoratorListStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyDecoratorStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyExceptPartStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyFileStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyFromImportStatementStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyFunctionStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyImportElementStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyImportStatementStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyParameterListStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PySingleStarParameterStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PySlashParameterStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyStarImportElementStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyTargetExpressionStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/stubs/PyTypeCommentOwnerStub.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyCallableParameter.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyCallableType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyClassLikeType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyClassMembersProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyClassType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyFunctionType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyInstantiableType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyModuleMembersProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyOverridingAncestorsClassMembersProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyOverridingClassMembersProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyOverridingModuleMembersProvider.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyType.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/TypeEvalContext.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/TypeEvalContextBasedCache.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/TypeEvalContextCache.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/psi/types/TypeEvalContextCacheImpl.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/toolbox/Maybe.java (100%)
 rename python/{psi-api => python-psi-api}/src/com/jetbrains/python/toolbox/Substring.java (100%)
 rename python/{psi-api => python-psi-api}/src/icons/PythonPsiApiIcons.java (100%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 774916a81f79..16574f2a8f43 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -663,7 +663,7 @@
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.helpers.iml" filepath="$PROJECT_DIR$/python/intellij.python.helpers.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/helpers/tests/intellij.python.helpers.tests.iml" filepath="$PROJECT_DIR$/python/helpers/tests/intellij.python.helpers.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/IntelliLang-python/intellij.python.langInjection.iml" filepath="$PROJECT_DIR$/python/IntelliLang-python/intellij.python.langInjection.iml" />
-      <module fileurl="file://$PROJECT_DIR$/python/psi-api/intellij.python.psi.iml" filepath="$PROJECT_DIR$/python/psi-api/intellij.python.psi.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-psi-api/intellij.python.psi.iml" filepath="$PROJECT_DIR$/python/python-psi-api/intellij.python.psi.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.pydev.iml" filepath="$PROJECT_DIR$/python/intellij.python.pydev.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-rest/intellij.python.reStructuredText.iml" filepath="$PROJECT_DIR$/python/python-rest/intellij.python.reStructuredText.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-terminal/intellij.python.terminal.iml" filepath="$PROJECT_DIR$/python/python-terminal/intellij.python.terminal.iml" />
@@ -731,4 +731,4 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/yaml/intellij.yaml.iml" filepath="$PROJECT_DIR$/plugins/yaml/intellij.yaml.iml" />
     </modules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/python/psi-api/intellij.python.psi.iml b/python/python-psi-api/intellij.python.psi.iml
similarity index 100%
rename from python/psi-api/intellij.python.psi.iml
rename to python/python-psi-api/intellij.python.psi.iml
diff --git a/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/pythonFile.svg
similarity index 100%
rename from python/psi-api/resources/icons/com/jetbrains/python/pythonFile.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/pythonFile.svg
diff --git a/python/psi-api/src/com/jetbrains/python/FunctionParameter.java b/python/python-psi-api/src/com/jetbrains/python/FunctionParameter.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/FunctionParameter.java
rename to python/python-psi-api/src/com/jetbrains/python/FunctionParameter.java
diff --git a/python/psi-api/src/com/jetbrains/python/PyNames.java b/python/python-psi-api/src/com/jetbrains/python/PyNames.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/PyNames.java
rename to python/python-psi-api/src/com/jetbrains/python/PyNames.java
diff --git a/python/psi-api/src/com/jetbrains/python/PyTokenTypes.java b/python/python-psi-api/src/com/jetbrains/python/PyTokenTypes.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/PyTokenTypes.java
rename to python/python-psi-api/src/com/jetbrains/python/PyTokenTypes.java
diff --git a/python/psi-api/src/com/jetbrains/python/PythonDialectsTokenSetContributor.java b/python/python-psi-api/src/com/jetbrains/python/PythonDialectsTokenSetContributor.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/PythonDialectsTokenSetContributor.java
rename to python/python-psi-api/src/com/jetbrains/python/PythonDialectsTokenSetContributor.java
diff --git a/python/psi-api/src/com/jetbrains/python/PythonDialectsTokenSetContributorBase.java b/python/python-psi-api/src/com/jetbrains/python/PythonDialectsTokenSetContributorBase.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/PythonDialectsTokenSetContributorBase.java
rename to python/python-psi-api/src/com/jetbrains/python/PythonDialectsTokenSetContributorBase.java
diff --git a/python/psi-api/src/com/jetbrains/python/PythonFQDNNames.java b/python/python-psi-api/src/com/jetbrains/python/PythonFQDNNames.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/PythonFQDNNames.java
rename to python/python-psi-api/src/com/jetbrains/python/PythonFQDNNames.java
diff --git a/python/psi-api/src/com/jetbrains/python/PythonFileType.java b/python/python-psi-api/src/com/jetbrains/python/PythonFileType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/PythonFileType.java
rename to python/python-psi-api/src/com/jetbrains/python/PythonFileType.java
diff --git a/python/psi-api/src/com/jetbrains/python/PythonFunctionParameters.java b/python/python-psi-api/src/com/jetbrains/python/PythonFunctionParameters.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/PythonFunctionParameters.java
rename to python/python-psi-api/src/com/jetbrains/python/PythonFunctionParameters.java
diff --git a/python/psi-api/src/com/jetbrains/python/PythonLanguage.java b/python/python-psi-api/src/com/jetbrains/python/PythonLanguage.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/PythonLanguage.java
rename to python/python-psi-api/src/com/jetbrains/python/PythonLanguage.java
diff --git a/python/psi-api/src/com/jetbrains/python/codeInsight/PyCustomMember.java b/python/python-psi-api/src/com/jetbrains/python/codeInsight/PyCustomMember.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/codeInsight/PyCustomMember.java
rename to python/python-psi-api/src/com/jetbrains/python/codeInsight/PyCustomMember.java
diff --git a/python/psi-api/src/com/jetbrains/python/codeInsight/PyCustomMemberTypeInfo.java b/python/python-psi-api/src/com/jetbrains/python/codeInsight/PyCustomMemberTypeInfo.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/codeInsight/PyCustomMemberTypeInfo.java
rename to python/python-psi-api/src/com/jetbrains/python/codeInsight/PyCustomMemberTypeInfo.java
diff --git a/python/psi-api/src/com/jetbrains/python/codeInsight/PyPsiPath.java b/python/python-psi-api/src/com/jetbrains/python/codeInsight/PyPsiPath.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/codeInsight/PyPsiPath.java
rename to python/python-psi-api/src/com/jetbrains/python/codeInsight/PyPsiPath.java
diff --git a/python/psi-api/src/com/jetbrains/python/codeInsight/controlflow/ScopeOwner.java b/python/python-psi-api/src/com/jetbrains/python/codeInsight/controlflow/ScopeOwner.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/codeInsight/controlflow/ScopeOwner.java
rename to python/python-psi-api/src/com/jetbrains/python/codeInsight/controlflow/ScopeOwner.java
diff --git a/python/psi-api/src/com/jetbrains/python/inspections/PyInspectionExtension.java b/python/python-psi-api/src/com/jetbrains/python/inspections/PyInspectionExtension.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/inspections/PyInspectionExtension.java
rename to python/python-psi-api/src/com/jetbrains/python/inspections/PyInspectionExtension.java
diff --git a/python/psi-api/src/com/jetbrains/python/nameResolver/FQNamesProvider.java b/python/python-psi-api/src/com/jetbrains/python/nameResolver/FQNamesProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/nameResolver/FQNamesProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/nameResolver/FQNamesProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java b/python/python-psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java
rename to python/python-psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java
diff --git a/python/psi-api/src/com/jetbrains/python/nameResolver/package-info.java b/python/python-psi-api/src/com/jetbrains/python/nameResolver/package-info.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/nameResolver/package-info.java
rename to python/python-psi-api/src/com/jetbrains/python/nameResolver/package-info.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/AccessDirection.java b/python/python-psi-api/src/com/jetbrains/python/psi/AccessDirection.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/AccessDirection.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/AccessDirection.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/FutureFeature.java b/python/python-psi-api/src/com/jetbrains/python/psi/FutureFeature.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/FutureFeature.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/FutureFeature.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/LanguageLevel.java b/python/python-psi-api/src/com/jetbrains/python/psi/LanguageLevel.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/LanguageLevel.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/LanguageLevel.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/Property.java b/python/python-psi-api/src/com/jetbrains/python/psi/Property.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/Property.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/Property.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyAnnotation.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyAnnotation.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyAnnotation.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyAnnotation.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyAnnotationOwner.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyAnnotationOwner.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyAnnotationOwner.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyAnnotationOwner.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyArgumentList.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyArgumentList.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyArgumentList.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyArgumentList.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyAssertStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyAssertStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyAssertStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyAssertStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyAssignmentExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyAssignmentExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyAssignmentExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyAssignmentExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyAssignmentStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyAssignmentStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyAssignmentStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyAssignmentStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyAugAssignmentStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyAugAssignmentStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyAugAssignmentStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyAugAssignmentStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyBinaryExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyBinaryExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyBinaryExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyBinaryExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyBoolLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyBoolLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyBoolLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyBoolLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyBreakStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyBreakStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyBreakStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyBreakStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyCallExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyCallExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyCallExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyCallExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyCallSiteExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyCallSiteExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyCallSiteExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyCallSiteExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyCallable.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyCallable.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyCallable.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyCallable.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyClass.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyClass.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyClass.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyClass.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionComponent.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyComprehensionComponent.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyComprehensionComponent.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyComprehensionComponent.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionElement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyComprehensionElement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyComprehensionElement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyComprehensionElement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionForComponent.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyComprehensionForComponent.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyComprehensionForComponent.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyComprehensionForComponent.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyComprehensionIfComponent.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyComprehensionIfComponent.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyComprehensionIfComponent.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyComprehensionIfComponent.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyConditionalExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyConditionalExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyConditionalExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyConditionalExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyConditionalStatementPart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyConditionalStatementPart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyConditionalStatementPart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyConditionalStatementPart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyContinueStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyContinueStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyContinueStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyContinueStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyCustomPackageIdentifier.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyCustomPackageIdentifier.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyCustomPackageIdentifier.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyCustomPackageIdentifier.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyDecoratable.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyDecoratable.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyDecoratable.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyDecoratable.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyDecorator.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyDecorator.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyDecorator.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyDecorator.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyDecoratorList.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyDecoratorList.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyDecoratorList.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyDecoratorList.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyDelStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyDelStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyDelStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyDelStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyDictCompExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyDictCompExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyDictCompExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyDictCompExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyDictLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyDictLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyDictLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyDictLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyDocStringOwner.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyDocStringOwner.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyDocStringOwner.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyDocStringOwner.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyDoubleStarExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyDoubleStarExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyDoubleStarExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyDoubleStarExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyElement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyElement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyElement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyElement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyElementType.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyElementType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyElementType.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyElementType.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyElementVisitor.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyElementVisitor.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyElementVisitor.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyElementVisitor.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyElsePart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyElsePart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyElsePart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyElsePart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyEmptyExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyEmptyExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyEmptyExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyEmptyExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyExceptPart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyExceptPart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyExceptPart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyExceptPart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyExecStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyExecStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyExecStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyExecStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyExpressionCodeFragment.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyExpressionCodeFragment.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyExpressionCodeFragment.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyExpressionCodeFragment.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyExpressionStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyExpressionStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyExpressionStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyExpressionStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyFStringFragment.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyFStringFragment.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyFStringFragment.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyFStringFragment.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyFStringFragmentFormatPart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyFStringFragmentFormatPart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyFStringFragmentFormatPart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyFStringFragmentFormatPart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyFile.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyFile.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyFile.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyFile.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyFinallyPart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyFinallyPart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyFinallyPart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyFinallyPart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyForPart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyForPart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyForPart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyForPart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyForStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyForStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyForStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyForStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyFormattedStringElement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyFormattedStringElement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyFormattedStringElement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyFormattedStringElement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyFromImportStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyFromImportStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyFromImportStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyFromImportStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyFunction.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyFunction.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyFunction.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyFunction.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyGeneratorExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyGeneratorExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyGeneratorExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyGeneratorExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyGlobalStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyGlobalStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyGlobalStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyGlobalStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyIfPart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyIfPart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyIfPart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyIfPart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyIfStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyIfStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyIfStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyIfStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyImplicitImportNameDefiner.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyImplicitImportNameDefiner.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyImplicitImportNameDefiner.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyImplicitImportNameDefiner.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyImportElement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyImportElement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyImportElement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyImportElement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyImportStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyImportStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyImportStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyImportStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyImportStatementBase.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyImportStatementBase.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyImportStatementBase.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyImportStatementBase.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyImportedNameDefiner.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyImportedNameDefiner.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyImportedNameDefiner.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyImportedNameDefiner.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyKeyValueExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyKeyValueExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyKeyValueExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyKeyValueExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyKeywordArgument.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyKeywordArgument.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyKeywordArgument.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyKeywordArgument.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyKnownDecoratorProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyKnownDecoratorProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyKnownDecoratorProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyKnownDecoratorProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyLambdaExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyLambdaExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyLambdaExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyLambdaExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyListCompExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyListCompExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyListCompExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyListCompExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyListLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyListLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyListLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyListLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyLoopStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyLoopStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyLoopStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyLoopStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyNamedElementContainer.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyNamedElementContainer.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyNamedElementContainer.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyNamedElementContainer.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyNamedParameter.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyNamedParameter.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyNamedParameter.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyNamedParameter.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyNoneLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyNoneLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyNoneLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyNoneLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyNonlocalStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyNonlocalStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyNonlocalStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyNonlocalStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyNumericLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyNumericLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyNumericLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyNumericLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyParameter.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyParameter.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyParameter.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyParameter.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyParameterList.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyParameterList.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyParameterList.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyParameterList.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyParenthesizedExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyParenthesizedExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyParenthesizedExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyParenthesizedExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyPassStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyPassStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyPassStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyPassStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyPlainStringElement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyPlainStringElement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyPlainStringElement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyPlainStringElement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyPossibleClassMember.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyPossibleClassMember.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyPossibleClassMember.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyPossibleClassMember.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyPrefixExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyPrefixExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyPrefixExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyPrefixExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyPrintStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyPrintStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyPrintStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyPrintStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyPrintTarget.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyPrintTarget.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyPrintTarget.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyPrintTarget.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyPsiFacade.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyPsiFacade.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyPsiFacade.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyPsiFacade.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyQualifiedNameOwner.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyQualifiedNameOwner.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyQualifiedNameOwner.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyQualifiedNameOwner.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyRaiseStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyRaiseStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyRaiseStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyRaiseStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyReferenceOwner.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyReferenceOwner.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyReferenceOwner.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyReferenceOwner.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyReprExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyReprExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyReprExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyReprExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyReturnStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyReturnStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyReturnStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyReturnStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PySequenceExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PySequenceExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PySequenceExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PySequenceExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PySetCompExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PySetCompExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PySetCompExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PySetCompExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PySetLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PySetLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PySetLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PySetLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PySingleStarParameter.java b/python/python-psi-api/src/com/jetbrains/python/psi/PySingleStarParameter.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PySingleStarParameter.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PySingleStarParameter.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PySlashParameter.java b/python/python-psi-api/src/com/jetbrains/python/psi/PySlashParameter.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PySlashParameter.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PySlashParameter.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PySliceExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PySliceExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PySliceExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PySliceExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PySliceItem.java b/python/python-psi-api/src/com/jetbrains/python/psi/PySliceItem.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PySliceItem.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PySliceItem.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStarArgument.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStarArgument.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStarArgument.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStarArgument.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStarExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStarExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStarExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStarExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStarImportElement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStarImportElement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStarImportElement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStarImportElement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStatementList.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStatementList.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStatementList.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStatementList.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStatementListContainer.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStatementListContainer.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStatementListContainer.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStatementListContainer.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStatementPart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStatementPart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStatementPart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStatementPart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStatementWithElse.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStatementWithElse.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStatementWithElse.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStatementWithElse.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStringElement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStringElement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStringElement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStringElement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStringLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStringLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStringLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStringLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStubElementType.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyStubElementType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyStubElementType.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyStubElementType.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PySubscriptionExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PySubscriptionExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PySubscriptionExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PySubscriptionExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyTargetExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyTargetExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyTargetExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyTargetExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyTryExceptStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyTryExceptStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyTryExceptStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyTryExceptStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyTryPart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyTryPart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyTryPart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyTryPart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyTupleExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyTupleExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyTupleExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyTupleExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyTupleParameter.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyTupleParameter.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyTupleParameter.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyTupleParameter.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyTypeCommentOwner.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyTypeCommentOwner.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyTypeCommentOwner.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyTypeCommentOwner.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyTypeDeclarationStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyTypeDeclarationStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyTypeDeclarationStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyTypeDeclarationStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyTypedElement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyTypedElement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyTypedElement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyTypedElement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyWhilePart.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyWhilePart.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyWhilePart.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyWhilePart.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyWhileStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyWhileStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyWhileStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyWhileStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyWithAncestors.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyWithAncestors.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyWithAncestors.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyWithAncestors.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyWithItem.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyWithItem.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyWithItem.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyWithItem.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyWithStatement.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyWithStatement.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyWithStatement.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyWithStatement.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyYieldExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyYieldExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/PyYieldExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/PyYieldExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/StringLiteralExpression.java b/python/python-psi-api/src/com/jetbrains/python/psi/StringLiteralExpression.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/StringLiteralExpression.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/StringLiteralExpression.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/StructuredDocString.java b/python/python-psi-api/src/com/jetbrains/python/psi/StructuredDocString.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/StructuredDocString.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/StructuredDocString.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/impl/PyImportResolver.java b/python/python-psi-api/src/com/jetbrains/python/psi/impl/PyImportResolver.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/impl/PyImportResolver.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/impl/PyImportResolver.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/impl/PyKeywordArgumentProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/impl/PyOverridingTypeProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/impl/PyOverridingTypeProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/impl/PyOverridingTypeProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/impl/PyOverridingTypeProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/impl/PyPsiUtils.java b/python/python-psi-api/src/com/jetbrains/python/psi/impl/PyPsiUtils.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/impl/PyPsiUtils.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/impl/PyPsiUtils.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/impl/PyResolveResultRater.java b/python/python-psi-api/src/com/jetbrains/python/psi/impl/PyResolveResultRater.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/impl/PyResolveResultRater.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/impl/PyResolveResultRater.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/impl/PyResolveResultRaterBase.java b/python/python-psi-api/src/com/jetbrains/python/psi/impl/PyResolveResultRaterBase.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/impl/PyResolveResultRaterBase.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/impl/PyResolveResultRaterBase.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/impl/PyTypeProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/impl/PyTypeProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/impl/PyTypeProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/impl/PyTypeProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/PointInImport.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/PointInImport.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/PointInImport.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/PointInImport.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/PyCanonicalPathProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyCanonicalPathProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/PyCanonicalPathProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyCanonicalPathProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/PyOverridingReferenceResolveProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyOverridingReferenceResolveProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/PyOverridingReferenceResolveProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyOverridingReferenceResolveProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/PyQualifiedNameResolveContext.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyQualifiedNameResolveContext.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/PyQualifiedNameResolveContext.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyQualifiedNameResolveContext.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/PyReferenceResolveProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyReferenceResolveProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/PyReferenceResolveProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyReferenceResolveProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/PyResolveContext.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyResolveContext.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/PyResolveContext.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/PyResolveContext.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/QualifiedRatedResolveResult.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/QualifiedRatedResolveResult.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/QualifiedRatedResolveResult.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/QualifiedRatedResolveResult.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/QualifiedResolveResult.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/QualifiedResolveResult.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/QualifiedResolveResult.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/QualifiedResolveResult.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/RatedResolveResult.java b/python/python-psi-api/src/com/jetbrains/python/psi/resolve/RatedResolveResult.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/resolve/RatedResolveResult.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/resolve/RatedResolveResult.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyAnnotationOwnerStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyAnnotationOwnerStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyAnnotationOwnerStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyAnnotationOwnerStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyAnnotationStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyAnnotationStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyAnnotationStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyAnnotationStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyClassStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyClassStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyClassStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyClassStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyDecoratorListStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyDecoratorListStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyDecoratorListStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyDecoratorListStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyDecoratorStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyDecoratorStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyDecoratorStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyDecoratorStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyExceptPartStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyExceptPartStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyExceptPartStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyExceptPartStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyFileStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyFileStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyFileStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyFileStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyFromImportStatementStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyFromImportStatementStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyFromImportStatementStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyFromImportStatementStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyFunctionStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyFunctionStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyFunctionStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyFunctionStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyImportElementStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyImportElementStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyImportElementStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyImportElementStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyImportStatementStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyImportStatementStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyImportStatementStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyImportStatementStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyNamedParameterStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyParameterListStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyParameterListStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyParameterListStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyParameterListStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PySingleStarParameterStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PySingleStarParameterStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PySingleStarParameterStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PySingleStarParameterStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PySlashParameterStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PySlashParameterStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PySlashParameterStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PySlashParameterStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyStarImportElementStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyStarImportElementStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyStarImportElementStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyStarImportElementStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyTargetExpressionStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyTargetExpressionStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyTargetExpressionStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyTargetExpressionStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyTupleParameterStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/stubs/PyTypeCommentOwnerStub.java b/python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyTypeCommentOwnerStub.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/stubs/PyTypeCommentOwnerStub.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/stubs/PyTypeCommentOwnerStub.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyCallableParameter.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyCallableParameter.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyCallableParameter.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyCallableParameter.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyCallableType.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyCallableType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyCallableType.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyCallableType.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyClassLikeType.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyClassMembersProviderBase.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyClassType.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyClassType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyClassType.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyClassType.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyFunctionType.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyFunctionType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyFunctionType.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyFunctionType.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyInstantiableType.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyInstantiableType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyInstantiableType.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyInstantiableType.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyModuleMembersProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyModuleMembersProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyModuleMembersProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyModuleMembersProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyOverridingAncestorsClassMembersProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyOverridingAncestorsClassMembersProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyOverridingAncestorsClassMembersProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyOverridingAncestorsClassMembersProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyOverridingClassMembersProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyOverridingClassMembersProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyOverridingClassMembersProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyOverridingClassMembersProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyOverridingModuleMembersProvider.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyOverridingModuleMembersProvider.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyOverridingModuleMembersProvider.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyOverridingModuleMembersProvider.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyType.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyType.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyType.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyType.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalConstraints.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextBasedCache.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextBasedCache.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextBasedCache.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextBasedCache.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextCache.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextCache.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextCache.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextCache.java
diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextCacheImpl.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextCacheImpl.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextCacheImpl.java
rename to python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContextCacheImpl.java
diff --git a/python/psi-api/src/com/jetbrains/python/toolbox/Maybe.java b/python/python-psi-api/src/com/jetbrains/python/toolbox/Maybe.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/toolbox/Maybe.java
rename to python/python-psi-api/src/com/jetbrains/python/toolbox/Maybe.java
diff --git a/python/psi-api/src/com/jetbrains/python/toolbox/Substring.java b/python/python-psi-api/src/com/jetbrains/python/toolbox/Substring.java
similarity index 100%
rename from python/psi-api/src/com/jetbrains/python/toolbox/Substring.java
rename to python/python-psi-api/src/com/jetbrains/python/toolbox/Substring.java
diff --git a/python/psi-api/src/icons/PythonPsiApiIcons.java b/python/python-psi-api/src/icons/PythonPsiApiIcons.java
similarity index 100%
rename from python/psi-api/src/icons/PythonPsiApiIcons.java
rename to python/python-psi-api/src/icons/PythonPsiApiIcons.java