diff --git a/python/educational-python/course-creator-python/course-creator-python.iml b/python/educational-python/course-creator-python/course-creator-python.iml
index 4f15c27875c3..ba637201f6dc 100644
--- a/python/educational-python/course-creator-python/course-creator-python.iml
+++ b/python/educational-python/course-creator-python/course-creator-python.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="educational-python" />
     <orderEntry type="module" module-name="python-community" />
     <orderEntry type="module" module-name="student" />
-    <orderEntry type="module" module-name="python-community-ide" />
+    <orderEntry type="module" module-name="python-community-configure" />
     <orderEntry type="module" module-name="student-python" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java
index e57f3e4dad4f..3f50473a61e3 100644
--- a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java
+++ b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java
@@ -12,7 +12,7 @@ import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
 import com.jetbrains.edu.learning.stepic.CourseInfo;
-import com.jetbrains.python.newProject.actions.PyCharmNewProjectStep;
+import com.jetbrains.python.newProject.steps.PyCharmNewProjectStep;
 import org.jetbrains.annotations.NotNull;
 
 class CreateFromArchiveProjectStep extends PyCharmNewProjectStep {
diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
index 1d3e264e9cb9..6f0cd637040e 100644
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
@@ -21,8 +21,8 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.jetbrains.edu.learning.PyStudyDirectoryProjectGenerator;
 import com.jetbrains.edu.learning.stepic.CourseInfo;
-import com.jetbrains.python.newProject.actions.PythonGenerateProjectCallback;
-import com.jetbrains.python.newProject.actions.ProjectSpecificSettingsStep;
+import com.jetbrains.python.newProject.steps.ProjectSpecificSettingsStep;
+import com.jetbrains.python.newProject.steps.PythonGenerateProjectCallback;
 import icons.InteractiveLearningPythonIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/python/educational-python/student-python/student-python.iml b/python/educational-python/student-python/student-python.iml
index 28253139cef4..3b78c726019e 100644
--- a/python/educational-python/student-python/student-python.iml
+++ b/python/educational-python/student-python/student-python.iml
@@ -15,6 +15,5 @@
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="educational-python" />
     <orderEntry type="module" module-name="python-community-configure" />
-    <orderEntry type="module" module-name="python-community-ide" />
   </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 6c026f880445..475dfe4b919e 100644
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -112,7 +112,7 @@
             icon="AllIcons.RunConfigurations.RerunFailedTests"/>
 
     <group id="WelcomeScreen.Platform.NewProject">
-      <action id="WelcomeScreen.CreateDirectoryProject" class="com.jetbrains.python.newProject.actions.PyCharmNewProjectStep"
+      <action id="WelcomeScreen.CreateDirectoryProject" class="com.jetbrains.python.newProject.steps.PyCharmNewProjectStep"
               icon="AllIcons.Welcome.CreateNewProject"/>
       <action id="WelcomeScreen.OpenDirectoryProject" class="com.intellij.ide.actions.OpenFileAction" icon="AllIcons.General.OpenProject"/>
 
diff --git a/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java b/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java
index 791d7129f0d3..3af6ef78c774 100644
--- a/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java
+++ b/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java
@@ -16,7 +16,7 @@
 package com.jetbrains.python.newProject;
 
 import com.intellij.ide.util.projectWizard.AbstractNewProjectDialog;
-import com.jetbrains.python.newProject.actions.PyCharmNewProjectStep;
+import com.jetbrains.python.newProject.steps.PyCharmNewProjectStep;
 
 public class PyCharmNewProjectDialog extends AbstractNewProjectDialog {
   @Override
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PluginSpecificProjectsStep.java b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PluginSpecificProjectsStep.java
similarity index 95%
rename from python/ide/src/com/jetbrains/python/newProject/actions/PluginSpecificProjectsStep.java
rename to python/python-community-configure/src/com/jetbrains/python/newProject/steps/PluginSpecificProjectsStep.java
index 9e20c7ec0dc0..063d201ae7f1 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/PluginSpecificProjectsStep.java
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PluginSpecificProjectsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.newProject.actions;
+package com.jetbrains.python.newProject.steps;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.projectWizard.ProjectSettingsStepBase;
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificSettingsStep.java b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java
similarity index 99%
rename from python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificSettingsStep.java
rename to python/python-community-configure/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java
index c4344917fbe8..594ba2c8295c 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificSettingsStep.java
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.newProject.actions;
+package com.jetbrains.python.newProject.steps;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.facet.ui.ValidationResult;
@@ -39,7 +39,6 @@ import com.intellij.util.NullableConsumer;
 import com.intellij.util.PathUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.update.UiNotifyConnector;
-import com.jetbrains.python.PythonSdkChooserCombo;
 import com.jetbrains.python.configuration.PyConfigurableInterpreterList;
 import com.jetbrains.python.configuration.VirtualEnvProjectFilter;
 import com.jetbrains.python.newProject.PyFrameworkProjectGenerator;
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java
similarity index 96%
rename from python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java
rename to python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java
index 27a8608f3cab..6345431819bc 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyCharmNewProjectStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.newProject.actions;
+package com.jetbrains.python.newProject.steps;
 
 import com.google.common.collect.Lists;
 import com.intellij.ide.util.projectWizard.AbstractNewProjectStep;
@@ -23,7 +23,6 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.platform.DirectoryProjectGenerator;
 import com.intellij.util.NullableConsumer;
 import com.jetbrains.python.newProject.PyFrameworkProjectGenerator;
-import com.jetbrains.python.newProject.PythonBaseProjectGenerator;
 import com.jetbrains.python.newProject.PythonProjectGenerator;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PyRemotePathField.form b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyRemotePathField.form
similarity index 95%
rename from python/ide/src/com/jetbrains/python/newProject/actions/PyRemotePathField.form
rename to python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyRemotePathField.form
index fe3013e0781e..c2fab93145b6 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/PyRemotePathField.form
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyRemotePathField.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.jetbrains.python.newProject.actions.PyRemotePathField">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.jetbrains.python.newProject.steps.PyRemotePathField">
   <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PyRemotePathField.java b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyRemotePathField.java
similarity index 97%
rename from python/ide/src/com/jetbrains/python/newProject/actions/PyRemotePathField.java
rename to python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyRemotePathField.java
index d47abbc8d490..2049a668e471 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/PyRemotePathField.java
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PyRemotePathField.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.newProject.actions;
+package com.jetbrains.python.newProject.steps;
 
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.ui.TextAccessor;
diff --git a/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java
similarity index 94%
rename from python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java
rename to python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java
index c6328abf9672..d2c9d565e367 100644
--- a/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.newProject;
+package com.jetbrains.python.newProject.steps;
 
 import com.intellij.facet.ui.ValidationResult;
 import com.intellij.openapi.application.ApplicationManager;
@@ -22,6 +22,8 @@ import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootModificationUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.jetbrains.python.newProject.PyNewProjectSettings;
+import com.jetbrains.python.newProject.PythonProjectGenerator;
 import com.jetbrains.python.remote.PyProjectSynchronizer;
 import icons.PythonIcons;
 import org.jetbrains.annotations.Nls;
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java
similarity index 99%
rename from python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java
rename to python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java
index 352f95f6a7de..c615e7a1e30a 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonGenerateProjectCallback.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.newProject.actions;
+package com.jetbrains.python.newProject.steps;
 
 import com.intellij.ide.util.projectWizard.AbstractNewProjectStep;
 import com.intellij.ide.util.projectWizard.ProjectSettingsStepBase;
diff --git a/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonSdkChooserCombo.java
similarity index 97%
rename from python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java
rename to python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonSdkChooserCombo.java
index 1affe3370eeb..6581e3a263cd 100644
--- a/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java
+++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/PythonSdkChooserCombo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python;
+package com.jetbrains.python.newProject.steps;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.ConfigurationException;