diff --git a/python/educational-python/course-creator-python/course-creator-python.iml b/python/educational-python/course-creator-python/course-creator-python.iml
deleted file mode 100644
index ba637201f6dc..000000000000
--- a/python/educational-python/course-creator-python/course-creator-python.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="course-creator" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <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-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/icons/CourseCreatorPythonIcons.java b/python/educational-python/course-creator-python/src/icons/CourseCreatorPythonIcons.java
deleted file mode 100644
index b4bcd501ad76..000000000000
--- a/python/educational-python/course-creator-python/src/icons/CourseCreatorPythonIcons.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package icons;
-
-import com.intellij.openapi.util.IconLoader;
-
-import javax.swing.*;
-
-/**
- * NOTE THIS FILE IS AUTO-GENERATED
- * DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead
- */
-public class CourseCreatorPythonIcons {
-  private static Icon load(String path) {
-    return IconLoader.getIcon(path, CourseCreatorPythonIcons.class);
-  }
-
-  public static final Icon CourseCreationProjectType = load("/icons/CourseCreationProjectType.png"); // 16x16
-}
diff --git a/python/educational-python/main_pycharm_edu.iml b/python/educational-python/main_pycharm_edu.iml
index c2e9e1eff290..465313c7319f 100644
--- a/python/educational-python/main_pycharm_edu.iml
+++ b/python/educational-python/main_pycharm_edu.iml
@@ -16,7 +16,6 @@
     <orderEntry type="module" module-name="ShortcutPromoter" />
     <orderEntry type="module" module-name="educational-python" />
     <orderEntry type="module" module-name="course-creator" />
-    <orderEntry type="module" module-name="course-creator-python" />
     <orderEntry type="module" module-name="student" />
     <orderEntry type="module" module-name="student-python" />
     <orderEntry type="module" module-name="hg4idea" />
diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/task.html.ft b/python/educational-python/resources/fileTemplates/internal/task.html.ft
similarity index 100%
rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/task.html.ft
rename to python/educational-python/resources/fileTemplates/internal/task.html.ft
diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/task.md.ft b/python/educational-python/resources/fileTemplates/internal/task.md.ft
similarity index 100%
rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/task.md.ft
rename to python/educational-python/resources/fileTemplates/internal/task.md.ft
diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/task.py.ft b/python/educational-python/resources/fileTemplates/internal/task.py.ft
similarity index 100%
rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/task.py.ft
rename to python/educational-python/resources/fileTemplates/internal/task.py.ft
diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/tests.py.ft b/python/educational-python/resources/fileTemplates/internal/tests.py.ft
similarity index 100%
rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/tests.py.ft
rename to python/educational-python/resources/fileTemplates/internal/tests.py.ft
diff --git a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml b/python/educational-python/student-python/resources/META-INF/course-creator.xml
similarity index 60%
rename from python/educational-python/course-creator-python/resources/META-INF/plugin.xml
rename to python/educational-python/student-python/resources/META-INF/course-creator.xml
index 85ec939dd37e..29d74733ee4e 100644
--- a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/student-python/resources/META-INF/course-creator.xml
@@ -1,23 +1,4 @@
 <idea-plugin>
-  <id>com.jetbrains.edu.coursecreator.python</id>
-  <name>Course Creator for PyCharm Edu</name>
-  <version>2.0.3</version>
-  <idea-version since-build="162.75"/>
-  <description><![CDATA[
-      Plugin allows you to create new course for PyCharm <Edu></Edu>.
-    ]]></description>
-  <vendor>JetBrains</vendor>
-
-  <change-notes><![CDATA[
-    ]]>
-  </change-notes>
-
-  <depends>com.intellij.modules.platform</depends>
-  <depends>com.intellij.modules.python</depends>
-  <depends>com.jetbrains.edu.coursecreator</depends>
-  <depends>com.jetbrains.edu.interactivelearning</depends>
-  <depends>com.jetbrains.python.edu.interactivelearning.python</depends>
-
   <extensions defaultExtensionNs="com.intellij">
     <directoryProjectGenerator implementation="com.jetbrains.edu.coursecreator.PyCCProjectGenerator"/>
     <configurationType implementation="com.jetbrains.edu.coursecreator.run.PyCCRunTestsConfigurationType"/>
diff --git a/python/educational-python/student-python/resources/META-INF/plugin.xml b/python/educational-python/student-python/resources/META-INF/plugin.xml
index ad55873def45..2a5a9bd21263 100644
--- a/python/educational-python/student-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/student-python/resources/META-INF/plugin.xml
@@ -18,6 +18,7 @@
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.python</depends>
   <depends>com.jetbrains.edu.interactivelearning</depends>
+  <depends optional="true" config-file="course-creator.xml">com.jetbrains.edu.coursecreator</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <directoryProjectGenerator implementation="com.jetbrains.edu.learning.PyStudyDirectoryProjectGenerator"/>
diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType.png b/python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType.png
similarity index 100%
rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType.png
rename to python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType.png
diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x.png b/python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType@2x.png
similarity index 100%
rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x.png
rename to python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType@2x.png
diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png b/python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType@2x_dark.png
similarity index 100%
rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png
rename to python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType@2x_dark.png
diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType_dark.png b/python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType_dark.png
similarity index 100%
rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType_dark.png
rename to python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType_dark.png
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java
similarity index 97%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java
index 351a8807898c..08b023c7d613 100644
--- a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java
@@ -27,7 +27,7 @@ import com.jetbrains.python.PythonLanguage;
 import com.jetbrains.python.newProject.PyNewProjectSettings;
 import com.jetbrains.python.newProject.PythonProjectGenerator;
 import com.jetbrains.python.remote.PyProjectSynchronizer;
-import icons.CourseCreatorPythonIcons;
+import icons.InteractiveLearningPythonIcons;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -52,7 +52,7 @@ public class PyCCProjectGenerator extends PythonProjectGenerator<PyNewProjectSet
   @Nullable
   @Override
   public Icon getLogo() {
-    return CourseCreatorPythonIcons.CourseCreationProjectType;
+    return InteractiveLearningPythonIcons.CourseCreationProjectType;
   }
 
   @Override
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCCommandLineState.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCCommandLineState.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCCommandLineState.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCCommandLineState.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestConfiguration.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestConfiguration.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestConfiguration.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestConfiguration.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationFactory.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationFactory.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationFactory.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationFactory.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationProducer.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationProducer.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationProducer.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationProducer.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationType.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationType.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationType.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationType.java
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingEditor.form b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingEditor.form
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingEditor.form
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingEditor.form
diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java
similarity index 100%
rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java
rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java
diff --git a/python/educational-python/student-python/src/icons/InteractiveLearningPythonIcons.java b/python/educational-python/student-python/src/icons/InteractiveLearningPythonIcons.java
index 08b0bdd2acd8..62511bd72896 100644
--- a/python/educational-python/student-python/src/icons/InteractiveLearningPythonIcons.java
+++ b/python/educational-python/student-python/src/icons/InteractiveLearningPythonIcons.java
@@ -13,5 +13,6 @@ public class InteractiveLearningPythonIcons {
     return IconLoader.getIcon(path, InteractiveLearningPythonIcons.class);
   }
 
+  public static final Icon CourseCreationProjectType = load("/icons/com/jetbrains/edu/learning/CourseCreationProjectType.png"); // 16x16
   public static final Icon EducationalProjectType = load("/icons/com/jetbrains/edu/learning/EducationalProjectType.png"); // 16x16
 }
diff --git a/python/educational-python/student-python/student-python.iml b/python/educational-python/student-python/student-python.iml
index 3b78c726019e..cc40fe8ba06b 100644
--- a/python/educational-python/student-python/student-python.iml
+++ b/python/educational-python/student-python/student-python.iml
@@ -15,5 +15,6 @@
     <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="course-creator" />
   </component>
 </module>
\ No newline at end of file