diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant
index d7af0aae5932..d5d6f2a84f61 100644
--- a/python/build/pycharm_community_build.gant
+++ b/python/build/pycharm_community_build.gant
@@ -29,7 +29,7 @@ private List<String> pycharmPlatformApiModules() {
 
 private List pycharmImplementationModules() {   //modules to put into pycharm.jar
   return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources",
-    "python-ide-community", "python-configure", "python-openapi", "python-psi-api", "platform-main"].flatten()
+    "python-ide-community", "python-community-configure", "python-openapi", "python-psi-api", "platform-main"].flatten()
 }
 
 private List modules() {
diff --git a/python/edu/build/pycharm_edu_build.gant b/python/edu/build/pycharm_edu_build.gant
index ec4dd5eeefd3..4b1158acb423 100644
--- a/python/edu/build/pycharm_edu_build.gant
+++ b/python/edu/build/pycharm_edu_build.gant
@@ -49,7 +49,7 @@ private List<String> pycharmPlatformApiModules() {
 
 private List pycharmImplementationModules() {   //modules to put into pycharm.jar
   return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources", 
-    "python-ide-community", "python-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
+    "python-ide-community", "python-community-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
 }
 
 private List modules() {
diff --git a/python/edu/interactive-learning-python/interactive-learning-python.iml b/python/edu/interactive-learning-python/interactive-learning-python.iml
index ab3167ef0388..7af754a59191 100644
--- a/python/edu/interactive-learning-python/interactive-learning-python.iml
+++ b/python/edu/interactive-learning-python/interactive-learning-python.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="python-community-ide-resources" />
     <orderEntry type="module" module-name="python-community" />
+    <orderEntry type="module" module-name="python-community-configure" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="python-ide-community" />
     <orderEntry type="library" name="gson" level="project" />
@@ -20,6 +21,5 @@
     <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="module" module-name="educational" />
     <orderEntry type="module" module-name="python-educational" />
-    <orderEntry type="module" module-name="python-configure" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/ide/python-ide-community.iml b/python/ide/python-ide-community.iml
index ef008ae11559..14e0fc138805 100644
--- a/python/ide/python-ide-community.iml
+++ b/python/ide/python-ide-community.iml
@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="python-community-ide-resources" />
     <orderEntry type="module" module-name="python-community" />
-    <orderEntry type="module" module-name="python-configure" />
+    <orderEntry type="module" module-name="python-community-configure" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="library" name="Guava" level="project" />
diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml
index 98471c75b9d2..612c27aaded9 100644
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -14,7 +14,7 @@
   <xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/python-configure.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-community-configure-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <application-components>
     <component>
diff --git a/python/python-configure/python-configure.iml b/python/python-community-configure/python-community-configure.iml
similarity index 100%
rename from python/python-configure/python-configure.iml
rename to python/python-community-configure/python-community-configure.iml
diff --git a/python/python-configure/resources/META-INF/python-configure-core.xml b/python/python-community-configure/resources/META-INF/python-community-configure-common.xml
similarity index 76%
rename from python/python-configure/resources/META-INF/python-configure-core.xml
rename to python/python-community-configure/resources/META-INF/python-community-configure-common.xml
index fcf209f60c7a..4c5ca9ea7ac0 100644
--- a/python/python-configure/resources/META-INF/python-configure-core.xml
+++ b/python/python-community-configure/resources/META-INF/python-community-configure-common.xml
@@ -1,9 +1,7 @@
 <idea-plugin version="2" url="https://confluence.jetbrains.com/display/PYH/">
-  <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
+  <!-- Components and extensions declared in this file work ONLY in PyCharm and CLion Python plugin, not in Standard Python plugin.
        Both Community and Professional editions. -->
 
-  <!-- Components and extensions declared in this file work in CLion Python Plugin to configure Python toolchain -->
-
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
                     serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>
diff --git a/python/python-configure/resources/META-INF/python-configure.xml b/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
similarity index 92%
rename from python/python-configure/resources/META-INF/python-configure.xml
rename to python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
index 9467c46e181e..ed54098266fd 100644
--- a/python/python-configure/resources/META-INF/python-configure.xml
+++ b/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
@@ -2,7 +2,7 @@
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
        Both Community and Professional editions. -->
 
-  <xi:include href="/META-INF/python-configure-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-community-configure-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <extensions defaultExtensionNs="com.intellij">
     <projectConfigurable groupId="project"
                          id="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form b/python/python-community-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form
rename to python/python-community-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java b/python/python-community-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.form b/python/python-community-configure/src/com/jetbrains/python/configuration/EditSdkDialog.form
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.form
rename to python/python-community-configure/src/com/jetbrains/python/configuration/EditSdkDialog.form
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.java b/python/python-community-configure/src/com/jetbrains/python/configuration/EditSdkDialog.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/EditSdkDialog.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
similarity index 96%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
index 383fb92c4b7c..6d025d44fb0d 100644
--- a/python/python-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
+++ b/python/python-community-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
@@ -19,7 +19,6 @@ import com.intellij.ide.DataManager;
 import com.intellij.openapi.options.ex.Settings;
 import com.intellij.ui.ClickListener;
 import com.intellij.ui.components.JBLabel;
-import com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
similarity index 95%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
index ed969cb00bff..1af2dec2dc31 100644
--- a/python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
+++ b/python/python-community-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
@@ -19,7 +19,6 @@ import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurableProvider;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.python.configuration.PyDependenciesConfigurable;
 
 /**
  * @author Sergey.Malenkov
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form b/python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PythonPathDialog.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonPathDialog.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PythonPathDialog.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PythonPathDialog.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PythonPathEditor.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonPathEditor.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PythonPathEditor.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PythonPathEditor.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
diff --git a/python/python-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java b/python/python-community-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java
similarity index 100%
rename from python/python-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java
rename to python/python-community-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java