diff --git a/python/ide/python-ide-community.iml b/python/ide/python-ide-community.iml
index 73a073f5ca34..211d8761c871 100644
--- a/python/ide/python-ide-community.iml
+++ b/python/ide/python-ide-community.iml
@@ -9,10 +9,10 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="python-community" />
+    <orderEntry type="module" module-name="python-configure" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="xml-psi-impl" />
-    <orderEntry type="module" module-name="python-confugure" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml
index 6daf92c01e68..98471c75b9d2 100644
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -14,6 +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/*)"/>
 
   <application-components>
     <component>
@@ -40,22 +41,10 @@
 
     <projectAttachProcessor implementation="com.intellij.platform.ModuleAttachProcessor"/>
 
-    <projectConfigurable groupId="project"
-                         id="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"
-                         displayName="Project Structure"
-                         provider="com.jetbrains.python.configuration.PythonContentEntriesConfigurableProvider"/>
     <projectConfigurable groupId="build"
                          id="com.jetbrains.python.buildout.BuildoutModulesConfigurable"
                          displayName="Buildout Support"
                          instance="com.jetbrains.python.buildout.BuildoutModulesConfigurable"/>
-    <projectConfigurable groupId="project"
-                         id="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
-                         displayName="Project Interpreter"
-                         instance="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"/>
-    <projectConfigurable groupId="project"
-                         id="com.jetbrains.python.configuration.PyDependenciesConfigurable"
-                         displayName="Project Dependencies"
-                         provider="com.jetbrains.python.configuration.PyDependenciesConfigurableProvider"/>
 
     <directoryProjectConfigurator implementation="com.jetbrains.python.PythonSdkConfigurator" id="sdk"
                                   order="after PlatformProjectConfigurator"/>
@@ -83,9 +72,6 @@
     <applicationService serviceInterface="com.intellij.usages.impl.ImportFilteringUsageViewSetting"
                         serviceImplementation="com.intellij.usages.impl.ImportFilteringUsageViewSetting"/>
 
-    <projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
-                    serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>
-
     <bundledColorScheme path="/colorSchemes/monokai"/>
     <bundledColorScheme path="/colorSchemes/twilight"/>
     <bundledColorScheme path="/colorSchemes/WarmNeon"/>
diff --git a/python/python-confugure/python-confugure.iml b/python/python-configure/python-configure.iml
similarity index 93%
rename from python/python-confugure/python-confugure.iml
rename to python/python-configure/python-configure.iml
index 9ef408f165c6..752e44910b9a 100644
--- a/python/python-confugure/python-confugure.iml
+++ b/python/python-configure/python-configure.iml
@@ -9,6 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="python-community" />
     <orderEntry type="library" name="Guava" level="project" />
diff --git a/python/python-configure/resources/META-INF/python-configure-core.xml b/python/python-configure/resources/META-INF/python-configure-core.xml
new file mode 100644
index 000000000000..d69a00d041a9
--- /dev/null
+++ b/python/python-configure/resources/META-INF/python-configure-core.xml
@@ -0,0 +1,6 @@
+<idea-plugin version="2">
+  <extensions defaultExtensionNs="com.intellij">
+    <projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
+                    serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>
+  </extensions>
+</idea-plugin>
diff --git a/python/python-confugure/resources/META-INF/python-configure.xml b/python/python-configure/resources/META-INF/python-configure.xml
similarity index 82%
rename from python/python-confugure/resources/META-INF/python-configure.xml
rename to python/python-configure/resources/META-INF/python-configure.xml
index 4096c019da55..7dc46dce3770 100644
--- a/python/python-confugure/resources/META-INF/python-configure.xml
+++ b/python/python-configure/resources/META-INF/python-configure.xml
@@ -1,4 +1,5 @@
 <idea-plugin version="2">
+  <xi:include href="/META-INF/python-configure-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <extensions defaultExtensionNs="com.intellij">
     <projectConfigurable groupId="project"
                          id="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"
@@ -12,7 +13,5 @@
                          id="com.jetbrains.python.configuration.PyDependenciesConfigurable"
                          displayName="Project Dependencies"
                          provider="com.jetbrains.python.configuration.PyDependenciesConfigurableProvider"/>
-    <projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
-                    serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>
   </extensions>
 </idea-plugin>
diff --git a/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form b/python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form
rename to python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java b/python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java
rename to python/python-configure/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/EditSdkDialog.form b/python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.form
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/EditSdkDialog.form
rename to python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.form
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/EditSdkDialog.java b/python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/EditSdkDialog.java
rename to python/python-configure/src/com/jetbrains/python/configuration/EditSdkDialog.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java b/python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java b/python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java b/python/python-configure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java b/python/python-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
similarity index 94%
rename from python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
index 04ac8223becf..383fb92c4b7c 100644
--- a/python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
+++ b/python/python-configure/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ 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-confugure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java b/python/python-configure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyContentEntriesModuleConfigurable.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java b/python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurable.java
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java b/python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
similarity index 92%
rename from python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
index 434b0425f04a..ed969cb00bff 100644
--- a/python/ide/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
+++ b/python/python-configure/src/com/jetbrains/python/configuration/PyDependenciesConfigurableProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ 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/ide/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java b/python/python-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
similarity index 99%
rename from python/ide/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
index 9251ce3f6a97..b40ea6f27cfb 100644
--- a/python/ide/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
+++ b/python/python-configure/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/python/ide/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form b/python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
similarity index 100%
rename from python/ide/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
rename to python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.form
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java b/python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PyModuleDependenciesConfigurable.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java b/python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurable.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java b/python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
similarity index 95%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
index 3b85bee1e139..5340a7bba57f 100644
--- a/python/python-confugure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
+++ b/python/python-configure/src/com/jetbrains/python/configuration/PythonContentEntriesConfigurableProvider.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurableProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.ArrayUtil;
+import org.jetbrains.annotations.Contract;
 
 /**
  * @author Sergey.Malenkov
@@ -36,6 +37,7 @@ public final class PythonContentEntriesConfigurableProvider extends Configurable
     return ArrayUtil.getFirstElement(ModuleManager.getInstance(myProject).getModules()) != null;
   }
 
+  @Contract(" -> !null")
   @Override
   public Configurable createConfigurable() {
     return new PythonContentEntriesConfigurable(myProject);
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PythonPathDialog.java b/python/python-configure/src/com/jetbrains/python/configuration/PythonPathDialog.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PythonPathDialog.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PythonPathDialog.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PythonPathEditor.java b/python/python-configure/src/com/jetbrains/python/configuration/PythonPathEditor.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PythonPathEditor.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PythonPathEditor.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java b/python/python-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
similarity index 100%
rename from python/python-confugure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
rename to python/python-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
diff --git a/python/python-confugure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java b/python/python-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java
similarity index 96%
rename from python/python-confugure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java
rename to python/python-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java
index b28f7cb708e3..f009eb2092b0 100644
--- a/python/python-confugure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java
+++ b/python/python-configure/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.io.FileUtil;
 import com.jetbrains.python.sdk.PythonSdkAdditionalData;
 import com.jetbrains.python.sdk.PythonSdkType;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -50,6 +51,7 @@ public class VirtualEnvProjectFilter implements Predicate<Sdk> {
     return false;
   }
 
+  @Contract("null, _ -> false")
   public static boolean removeNotMatching(Project project, List<Sdk> sdks) {
     if (project != null) {
       final String basePath = project.getBasePath();