diff --git a/python/edu/build/plugin-list.txt b/python/edu/build/plugin-list.txt
index bc4b94c9e7f4..60ecf3ff6f2d 100644
--- a/python/edu/build/plugin-list.txt
+++ b/python/edu/build/plugin-list.txt
@@ -4,4 +4,5 @@ remote-servers-git
 github
 IntelliLang
 IntelliLang-python
-learn-python
\ No newline at end of file
+learn-python
+course-creator
\ No newline at end of file
diff --git a/python/edu/build/pycharm_edu_build.gant b/python/edu/build/pycharm_edu_build.gant
index 81a7faca8606..28d829e68b34 100644
--- a/python/edu/build/pycharm_edu_build.gant
+++ b/python/edu/build/pycharm_edu_build.gant
@@ -216,6 +216,7 @@ private layoutPlugins(layouts) {
         fileset(dir: "$pythonEduHome/learn-python/resources/courses")
       }
     }
+    layouts.layoutPlugin("course-creator")
   }
 
   layouts.layoutCommunityPlugins(ch)
diff --git a/python/edu/course-creator/course-creator.iml b/python/edu/course-creator/course-creator.iml
index 353f005c1d79..fc8c6a1462b1 100644
--- a/python/edu/course-creator/course-creator.iml
+++ b/python/edu/course-creator/course-creator.iml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="PLUGIN_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
+<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$/pluginResources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="python-community" />
+    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="library" name="gson" level="project" />
   </component>
 </module>
 
diff --git a/python/edu/course-creator/resources/META-INF/plugin.xml b/python/edu/course-creator/resources/META-INF/plugin.xml
index ecb596c85598..6a9a9ea90276 100644
--- a/python/edu/course-creator/resources/META-INF/plugin.xml
+++ b/python/edu/course-creator/resources/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <idea-plugin version="2">
   <id>org.jetbrains.plugins.coursecreator</id>
-  <name>Cource Creator for PyCharm Education</name>
+  <name>Course Creator for PyCharm Educational</name>
   <version>1.0</version>
 
   <description><![CDATA[
@@ -10,9 +10,7 @@
   <change-notes><![CDATA[
     ]]>
   </change-notes>
-
   <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-  <idea-version since-build="138"/>
 
   <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
        on how to target different products -->
diff --git a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/highlighting/CCTaskLineMarkerProvider.java b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/highlighting/CCTaskLineMarkerProvider.java
index 9ba74ad88bb0..1818b658ddfc 100644
--- a/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/highlighting/CCTaskLineMarkerProvider.java
+++ b/python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/highlighting/CCTaskLineMarkerProvider.java
@@ -36,6 +36,7 @@ public class CCTaskLineMarkerProvider implements LineMarkerProvider {
       if (element instanceof PsiFile) {
         final Project project = element.getProject();
         final Course course = CCProjectService.getInstance(project).getCourse();
+        if (course == null) return;
         final String taskFileName = ((PsiFile) element).getName();
         final PsiDirectory taskDir = ((PsiFile) element).getParent();
         if (taskDir == null) continue;
diff --git a/python/edu/main_pycharm_edu.iml b/python/edu/main_pycharm_edu.iml
index 12efe9b350d1..17f1d67a39da 100644
--- a/python/edu/main_pycharm_edu.iml
+++ b/python/edu/main_pycharm_edu.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="ShortcutPromoter" />
     <orderEntry type="module" module-name="python-educational" />
     <orderEntry type="module" module-name="learn-python" />
+    <orderEntry type="module" module-name="course-creator" />
   </component>
 </module>
 
diff --git a/python/edu/src/com/intellij/openapi/application/PyCharmEduConfigImportSettings.java b/python/edu/src/com/intellij/openapi/application/PyCharmEduConfigImportSettings.java
index 53aa8ffde9be..989c750681f3 100644
--- a/python/edu/src/com/intellij/openapi/application/PyCharmEduConfigImportSettings.java
+++ b/python/edu/src/com/intellij/openapi/application/PyCharmEduConfigImportSettings.java
@@ -1,28 +1,12 @@
 package com.intellij.openapi.application;
 
-import com.intellij.util.ThreeState;
+import com.intellij.ide.plugins.PluginManagerCore;
 
 // see com.intellij.openapi.application.ConfigImportHelper.getConfigImportSettings
 @SuppressWarnings("UnusedDeclaration")
 public class PyCharmEduConfigImportSettings extends ConfigImportSettings {
-
-  @Override
-  protected String getProductName(ThreeState full) {
-    return "WebStorm";
+  public PyCharmEduConfigImportSettings() {
+    PluginManagerCore.disablePlugin("org.jetbrains.plugins.coursecreator");
   }
 
-  @Override
-  public String getCustomPathsSelector() {
-    return "WebIDE10";
-  }
-
-  @Override
-  public String getExecutableName() {
-    return "webstorm";
-  }
-
-  @Override
-  public String[] getMainJarNames() {
-    return new String[] { "webide", "webstorm"};
-  }
 }