diff --git a/python/python-community.iml b/python/python-community.iml
index 8973a57e5d73..c068a3c62842 100644
--- a/python/python-community.iml
+++ b/python/python-community.iml
@@ -18,6 +18,7 @@
+
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 1cf100163b46..528183691f29 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -1,489 +1,29 @@
-
+
+
+
com.jetbrains.python.PyBundle
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyConvertMethodToPropertyIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.ImportToImportFromIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyConvertStaticMethodToFunctionIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.SpecifyTypeInDocstringIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.SpecifyTypeInPy3AnnotationsIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.TypeAssertionIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.ImportFromToImportIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.ImportToggleAliasIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PySplitIfIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyNegateComparisonIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyStringConcatenationToFormatIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.ConvertFormatOperatorToMethodIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyFlipComparisonIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyDemorganIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.ReplaceListComprehensionWithForIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyJoinIfIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyDictConstructorToLiteralFormIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyDictLiteralFormToConstructorIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyQuotedStringIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyConvertLambdaToFunctionIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.ConvertVariadicParamIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyConvertTripleQuotedStringIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyTransformConditionalExpressionIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyGenerateDocstringIntention
- Python
-
-
-
- com.jetbrains.python.codeInsight.intentions.PyYieldFromIntention
- Python
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -499,14 +39,12 @@
-
-
-
-
-
-
-
+
+
+
@@ -724,32 +262,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -815,10 +327,6 @@
-
-
-
@@ -883,66 +391,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -980,16 +437,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1009,9 +456,6 @@
-
- com.jetbrains.python.PythonPsiManager
-
com.jetbrains.django.lang.template.DjangoTemplatePsiManager
@@ -1036,33 +480,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- com.jetbrains.python.testing.VFSTestFrameworkListener
-
-
-
diff --git a/python/src/META-INF/python-plugin-core.xml b/python/src/META-INF/python-plugin-core.xml
new file mode 100644
index 000000000000..681304de2d11
--- /dev/null
+++ b/python/src/META-INF/python-plugin-core.xml
@@ -0,0 +1,674 @@
+
+
+
+ com.jetbrains.python.PyBundle
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyConvertMethodToPropertyIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.ImportToImportFromIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyConvertStaticMethodToFunctionIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.SpecifyTypeInDocstringIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.SpecifyTypeInPy3AnnotationsIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.TypeAssertionIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.ImportFromToImportIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.ImportToggleAliasIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PySplitIfIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyNegateComparisonIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyStringConcatenationToFormatIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.ConvertFormatOperatorToMethodIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyFlipComparisonIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyDemorganIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.ReplaceListComprehensionWithForIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyJoinIfIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyDictConstructorToLiteralFormIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyDictLiteralFormToConstructorIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyQuotedStringIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyConvertLambdaToFunctionIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.ConvertVariadicParamIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyConvertTripleQuotedStringIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyTransformConditionalExpressionIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyGenerateDocstringIntention
+ Python
+
+
+
+ com.jetbrains.python.codeInsight.intentions.PyYieldFromIntention
+ Python
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.jetbrains.python.PythonPsiManager
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.jetbrains.python.testing.VFSTestFrameworkListener
+
+
+
+
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgElementTypes.java b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgElementTypes.java
index e68e76dd0174..ba2df2400b66 100644
--- a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgElementTypes.java
+++ b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgElementTypes.java
@@ -1,8 +1,6 @@
package com.jetbrains.python.buildout.config;
import com.intellij.psi.tree.IFileElementType;
-import org.jetbrains.yaml.YAMLElementType;
-import org.jetbrains.yaml.YAMLLanguage;
/**
* @author traff
diff --git a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgTokenTypes.java b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgTokenTypes.java
index 34d9e223ee5f..d43c47f3ac95 100644
--- a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgTokenTypes.java
+++ b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgTokenTypes.java
@@ -1,8 +1,5 @@
package com.jetbrains.python.buildout.config;
-import com.intellij.psi.tree.TokenSet;
-import org.jetbrains.yaml.YAMLElementType;
-
/**
* @author traff
*/