diff --git a/.idea/modules.xml b/.idea/modules.xml
index 11a95cfece80..c5676c5be1d9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -253,7 +253,6 @@
       <module fileurl="file://$PROJECT_DIR$/java/structuralsearch-java/structuralsearch-java.iml" filepath="$PROJECT_DIR$/java/structuralsearch-java/structuralsearch-java.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/structuralsearch-tests.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/structuralsearch-tests.iml" group="plugins/structuralsearch" />
       <module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/structure-view-impl.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/structure-view-impl.iml" group="platform" />
-      <module fileurl="file://$PROJECT_DIR$/python/educational-core/student/student.iml" filepath="$PROJECT_DIR$/python/educational-core/student/student.iml" group="python/educational/educational-core" />
       <module fileurl="file://$PROJECT_DIR$/python/educational-python/Edu-Python/Edu-Python.iml" filepath="$PROJECT_DIR$/python/educational-python/Edu-Python/Edu-Python.iml" group="python/educational/educational-python" />
       <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/svn4idea.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/svn4idea.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/svn4idea-tests.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/svn4idea-tests.iml" group="plugins/VCS" />
diff --git a/python/educational-core/course-creator/course-creator.iml b/python/educational-core/course-creator/course-creator.iml
index c78d87ba9ad1..ccb25956abe1 100644
--- a/python/educational-core/course-creator/course-creator.iml
+++ b/python/educational-core/course-creator/course-creator.iml
@@ -12,10 +12,10 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="student" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="library" name="http-client" level="project" />
+    <orderEntry type="module" module-name="educational-core" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java
index bdc0b3ba8738..a27f895dd305 100644
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java
@@ -11,7 +11,7 @@ import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -21,7 +21,7 @@ public class CCCreateLesson extends CCCreateStudyItemActionBase {
   public static final String TITLE = "Create New " + EduNames.LESSON_TITLED;
 
   public CCCreateLesson() {
-    super(EduNames.LESSON_TITLED, TITLE, InteractiveLearningIcons.Lesson);
+    super(EduNames.LESSON_TITLED, TITLE, EducationalCoreIcons.Lesson);
   }
 
   @Nullable
diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
index f1809f470202..78e74feda957 100644
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
@@ -12,7 +12,7 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -23,7 +23,7 @@ public class CCCreateTask extends CCCreateStudyItemActionBase {
   public static final String TITLE = "Create New " + EduNames.TASK_TITLED;
 
   public CCCreateTask() {
-    super(EduNames.TASK_TITLED, TITLE, InteractiveLearningIcons.Task);
+    super(EduNames.TASK_TITLED, TITLE, EducationalCoreIcons.Task);
   }
 
 
diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCCourseDirectoryNode.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCCourseDirectoryNode.java
index 33733267bdde..d058b63f199f 100644
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCCourseDirectoryNode.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCCourseDirectoryNode.java
@@ -14,7 +14,7 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import com.jetbrains.edu.learning.projectView.CourseDirectoryNode;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -54,6 +54,6 @@ public class CCCourseDirectoryNode extends CourseDirectoryNode {
 
   @Override
   protected void updateImpl(PresentationData data) {
-    updatePresentation(data, myCourse.getName(), JBColor.black, InteractiveLearningIcons.Course, "Course Creation");
+    updatePresentation(data, myCourse.getName(), JBColor.black, EducationalCoreIcons.Course, "Course Creation");
   }
 }
diff --git a/python/educational-core/educational-core.iml b/python/educational-core/educational-core.iml
index a07a124508cc..7da0cf68f0b4 100644
--- a/python/educational-core/educational-core.iml
+++ b/python/educational-core/educational-core.iml
@@ -3,11 +3,34 @@
   <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$/testSrc" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/testData" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/gradleBuild" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="http-client" level="project" />
+    <orderEntry type="module" module-name="lang-impl" />
+        <orderEntry type="library" name="gson" level="project" />
+        <orderEntry type="library" name="http-client" level="project" />
+        <orderEntry type="module-library">
+          <library>
+            <CLASSES>
+              <root url="jar://$MODULE_DIR$/lib/twitter4j-core-4.0.4.jar!/" />
+            </CLASSES>
+            <JAVADOC />
+            <SOURCES />
+          </library>
+        </orderEntry>
+        <orderEntry type="module" module-name="platform-api" />
+        <orderEntry type="module" module-name="xml" />
+        <orderEntry type="library" name="markdownj" level="project" />
+        <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+        <orderEntry type="module" module-name="testFramework" scope="TEST" />
+        <orderEntry type="module" module-name="testExtensions" scope="TEST" />
+        <orderEntry type="module" module-name="idea-ui" />
+        <orderEntry type="module" module-name="openapi" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/educational-core/student/lib/twitter4j-core-4.0.4.jar b/python/educational-core/lib/twitter4j-core-4.0.4.jar
similarity index 100%
rename from python/educational-core/student/lib/twitter4j-core-4.0.4.jar
rename to python/educational-core/lib/twitter4j-core-4.0.4.jar
diff --git a/python/educational-core/student/resources/META-INF/android-dependencies.xml b/python/educational-core/resources/META-INF/android-dependencies.xml
similarity index 100%
rename from python/educational-core/student/resources/META-INF/android-dependencies.xml
rename to python/educational-core/resources/META-INF/android-dependencies.xml
diff --git a/python/educational-core/student/resources/META-INF/edu-intellij.xml b/python/educational-core/resources/META-INF/edu-intellij.xml
similarity index 100%
rename from python/educational-core/student/resources/META-INF/edu-intellij.xml
rename to python/educational-core/resources/META-INF/edu-intellij.xml
diff --git a/python/educational-core/student/resources/META-INF/plugin.xml b/python/educational-core/resources/META-INF/plugin.xml
similarity index 100%
rename from python/educational-core/student/resources/META-INF/plugin.xml
rename to python/educational-core/resources/META-INF/plugin.xml
diff --git a/python/educational-core/student/resources/code-mirror/codemirror-darcula.css b/python/educational-core/resources/code-mirror/codemirror-darcula.css
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/codemirror-darcula.css
rename to python/educational-core/resources/code-mirror/codemirror-darcula.css
diff --git a/python/educational-core/student/resources/code-mirror/codemirror-old-darcula.css b/python/educational-core/resources/code-mirror/codemirror-old-darcula.css
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/codemirror-old-darcula.css
rename to python/educational-core/resources/code-mirror/codemirror-old-darcula.css
diff --git a/python/educational-core/student/resources/code-mirror/codemirror-old.css b/python/educational-core/resources/code-mirror/codemirror-old.css
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/codemirror-old.css
rename to python/educational-core/resources/code-mirror/codemirror-old.css
diff --git a/python/educational-core/student/resources/code-mirror/codemirror.css b/python/educational-core/resources/code-mirror/codemirror.css
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/codemirror.css
rename to python/educational-core/resources/code-mirror/codemirror.css
diff --git a/python/educational-core/student/resources/code-mirror/codemirror.js b/python/educational-core/resources/code-mirror/codemirror.js
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/codemirror.js
rename to python/educational-core/resources/code-mirror/codemirror.js
diff --git a/python/educational-core/student/resources/code-mirror/colorize.js b/python/educational-core/resources/code-mirror/colorize.js
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/colorize.js
rename to python/educational-core/resources/code-mirror/colorize.js
diff --git a/python/educational-core/student/resources/code-mirror/javascript.js b/python/educational-core/resources/code-mirror/javascript.js
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/javascript.js
rename to python/educational-core/resources/code-mirror/javascript.js
diff --git a/python/educational-core/student/resources/code-mirror/runmode.js b/python/educational-core/resources/code-mirror/runmode.js
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/runmode.js
rename to python/educational-core/resources/code-mirror/runmode.js
diff --git a/python/educational-core/student/resources/code-mirror/template.html b/python/educational-core/resources/code-mirror/template.html
similarity index 100%
rename from python/educational-core/student/resources/code-mirror/template.html
rename to python/educational-core/resources/code-mirror/template.html
diff --git a/python/educational-core/student/resources/fileTemplates/internal/EduTestRunner.java.ft b/python/educational-core/resources/fileTemplates/internal/EduTestRunner.java.ft
similarity index 100%
rename from python/educational-core/student/resources/fileTemplates/internal/EduTestRunner.java.ft
rename to python/educational-core/resources/fileTemplates/internal/EduTestRunner.java.ft
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/CheckTask.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/CheckTask.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Course.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Course.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Course@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Course@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course@2x_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Course@2x_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course@2x_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Course@2x_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CourseProgress.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/CourseProgress.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CourseProgress.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/CourseProgress.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CourseProgress@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/CourseProgress@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CourseProgress@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/CourseProgress@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CourseProgress@2x_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/CourseProgress@2x_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CourseProgress@2x_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/CourseProgress@2x_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CourseProgress_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/CourseProgress_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CourseProgress_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/CourseProgress_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Course_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Course_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Lesson.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Lesson.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Lesson.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Lesson.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Lesson@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Lesson@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Lesson@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Lesson@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/LessonCompl.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/LessonCompl.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/LessonCompl.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/LessonCompl.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/LessonCompl@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/LessonCompl@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/LessonCompl@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/LessonCompl@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Sandbox.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Sandbox.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Sandbox.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Sandbox.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Sandbox@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Sandbox@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Sandbox@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Sandbox@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Task.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Task.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Task@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Task@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task@2x_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Task@2x_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task@2x_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Task@2x_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskCompl.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskCompl.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskCompl.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskCompl.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskCompl@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskCompl@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskCompl@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskCompl@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskCompl@2x_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskCompl@2x_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskCompl@2x_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskCompl@2x_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskCompl_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskCompl_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskCompl_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskCompl_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskDescription.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskDescription.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskDescription.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskDescription.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskDescription@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskDescription@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskDescription@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskDescription@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskDescription@2x_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskDescription@2x_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskDescription@2x_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskDescription@2x_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskDescription_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskDescription_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskDescription_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskDescription_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskProbl.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskProbl.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskProbl.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskProbl.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskProbl@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskProbl@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskProbl@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskProbl@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskProbl@2x_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskProbl@2x_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskProbl@2x_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskProbl@2x_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskProbl_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskProbl_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/TaskProbl_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/TaskProbl_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/Task_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/Task_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/WatchInput.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/WatchInput.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/WatchInput.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/WatchInput.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/interpreterGear.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/interpreterGear.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/interpreterGear.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/interpreterGear.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/interpreterGear@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/interpreterGear@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/interpreterGear@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/interpreterGear@2x.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/interpreterGear@2x_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/interpreterGear@2x_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/interpreterGear@2x_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/interpreterGear@2x_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/interpreterGear_dark.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/interpreterGear_dark.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/interpreterGear_dark.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/interpreterGear_dark.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/showHint.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/showHint.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/showHint.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/showHint.png
diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/showHint@2x.png b/python/educational-core/resources/icons/com/jetbrains/edu/learning/showHint@2x.png
similarity index 100%
rename from python/educational-core/student/resources/icons/com/jetbrains/edu/learning/showHint@2x.png
rename to python/educational-core/resources/icons/com/jetbrains/edu/learning/showHint@2x.png
diff --git a/python/educational-core/student/resources/style/buttons.css b/python/educational-core/resources/style/buttons.css
similarity index 100%
rename from python/educational-core/student/resources/style/buttons.css
rename to python/educational-core/resources/style/buttons.css
diff --git a/python/educational-core/student/resources/style/buttonsDarcula.css b/python/educational-core/resources/style/buttonsDarcula.css
similarity index 100%
rename from python/educational-core/student/resources/style/buttonsDarcula.css
rename to python/educational-core/resources/style/buttonsDarcula.css
diff --git a/python/educational-core/student/resources/style/javaFXBrowser.css b/python/educational-core/resources/style/javaFXBrowser.css
similarity index 100%
rename from python/educational-core/student/resources/style/javaFXBrowser.css
rename to python/educational-core/resources/style/javaFXBrowser.css
diff --git a/python/educational-core/student/resources/style/javaFXBrowserDarcula.css b/python/educational-core/resources/style/javaFXBrowserDarcula.css
similarity index 100%
rename from python/educational-core/student/resources/style/javaFXBrowserDarcula.css
rename to python/educational-core/resources/style/javaFXBrowserDarcula.css
diff --git a/python/educational-core/student/resources/style/javaFXBrowserDarculaScrollBar.css b/python/educational-core/resources/style/javaFXBrowserDarculaScrollBar.css
similarity index 100%
rename from python/educational-core/student/resources/style/javaFXBrowserDarculaScrollBar.css
rename to python/educational-core/resources/style/javaFXBrowserDarculaScrollBar.css
diff --git a/python/educational-core/student/resources/style/javaFXBrowserScrollBar.css b/python/educational-core/resources/style/javaFXBrowserScrollBar.css
similarity index 100%
rename from python/educational-core/student/resources/style/javaFXBrowserScrollBar.css
rename to python/educational-core/resources/style/javaFXBrowserScrollBar.css
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/EduPluginConfigurator.java b/python/educational-core/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
rename to python/educational-core/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyAnswerPlaceholderExtendWordHandler.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyAnswerPlaceholderExtendWordHandler.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyAnswerPlaceholderExtendWordHandler.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyAnswerPlaceholderExtendWordHandler.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyCheckListener.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyCheckListener.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyCheckListener.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyCheckListener.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyDocumentationManager.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyDocumentationManager.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyDocumentationManager.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyDocumentationManager.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyFileEditorManagerListener.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyFileEditorManagerListener.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyFileEditorManagerListener.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyFileEditorManagerListener.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyMoveDelegate.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyMoveDelegate.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyMoveDelegate.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyMoveDelegate.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyProjectComponent.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyRenameHandler.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyRenameHandler.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyRenameHandler.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyRenameHandler.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/StudySerializationUtils.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudySerializationUtils.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyState.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyState.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyState.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyState.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySubtaskChangeListener.java b/python/educational-core/src/com/jetbrains/edu/learning/StudySubtaskChangeListener.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudySubtaskChangeListener.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudySubtaskChangeListener.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySubtaskUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/StudySubtaskUtils.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudySubtaskUtils.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudySubtaskUtils.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTabTitleProvider.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyTabTitleProvider.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyTabTitleProvider.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyTabTitleProvider.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskDescriptionAdditionalActionsProvider.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyTaskDescriptionAdditionalActionsProvider.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskDescriptionAdditionalActionsProvider.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyTaskDescriptionAdditionalActionsProvider.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyTaskManager.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyTaskManager.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTwitterPluginConfigurator.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyTwitterPluginConfigurator.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyTwitterPluginConfigurator.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyTwitterPluginConfigurator.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTypeHandlerDelegate.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyTypeHandlerDelegate.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyTypeHandlerDelegate.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyTypeHandlerDelegate.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/StudyUtils.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
rename to python/educational-core/src/com/jetbrains/edu/learning/StudyUtils.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyActionWithShortcut.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyActionWithShortcut.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyActionWithShortcut.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyActionWithShortcut.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyAfterCheckAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyAfterCheckAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyAfterCheckAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyAfterCheckAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
similarity index 96%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
index eddc5ec96ba5..f41fc30a1b50 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
@@ -18,7 +18,7 @@ import com.jetbrains.edu.learning.checker.StudyCheckUtils;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.tasks.TheoryTask;
 import com.jetbrains.edu.learning.editor.StudyEditor;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -31,7 +31,7 @@ public abstract class StudyCheckAction extends StudyActionWithShortcut {
 
   public StudyCheckAction() {
     super(getTextWithShortcuts(TEXT),
-          "Check current task", InteractiveLearningIcons.CheckTask);
+          "Check current task", EducationalCoreIcons.CheckTask);
   }
 
   @NotNull
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java
similarity index 98%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java
index f3de980fa017..82de1c263193 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java
@@ -24,12 +24,12 @@ import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.core.EduUtils;
-import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.courseFormat.UserTest;
+import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.editor.StudyEditor;
 import com.jetbrains.edu.learning.ui.StudyTestContentPanel;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -48,7 +48,7 @@ public class StudyEditInputAction extends DumbAwareAction {
   private Map<TabInfo, UserTest> myEditableTabs = new HashMap<>();
 
   public StudyEditInputAction() {
-    super("Watch Test Input", "Watch test input", InteractiveLearningIcons.WatchInput);
+    super("Watch Test Input", "Watch test input", EducationalCoreIcons.WatchInput);
   }
 
   public void showInput(final Project project) {
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextTaskAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyNextTaskAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextTaskAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyNextTaskAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousTaskAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyPreviousTaskAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousTaskAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyPreviousTaskAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
similarity index 96%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
index 24815a63d46b..08fb50fcfb43 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
@@ -25,7 +25,10 @@ import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
 import com.jetbrains.edu.learning.core.EduNames;
-import com.jetbrains.edu.learning.courseFormat.*;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.courseFormat.tasks.ChoiceTask;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.tasks.TaskWithSubtasks;
@@ -33,7 +36,7 @@ import com.jetbrains.edu.learning.editor.StudyChoiceVariantsPanel;
 import com.jetbrains.edu.learning.editor.StudyEditor;
 import com.jetbrains.edu.learning.navigation.StudyNavigator;
 import com.jetbrains.edu.learning.ui.StudyToolWindow;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -48,7 +51,7 @@ public class StudyRefreshTaskFileAction extends StudyActionWithShortcut {
   public StudyRefreshTaskFileAction() {
     super("Reset Task File (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")",
           "Refresh current task",
-          InteractiveLearningIcons.ResetTaskFile);
+          EducationalCoreIcons.ResetTaskFile);
   }
 
   public static void refresh(@NotNull final Project project) {
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRunAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
similarity index 98%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
index dfdf3ea773ce..babf29361eaa 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
@@ -22,7 +22,7 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.statistics.EduUsagesCollector;
 import com.jetbrains.edu.learning.ui.StudyHint;
 import com.jetbrains.edu.learning.ui.StudyToolWindow;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -35,7 +35,7 @@ public class StudyShowHintAction extends StudyActionWithShortcut {
 
   public StudyShowHintAction() {
     super("Show hint (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")", "Show hint",
-          InteractiveLearningIcons.ShowHint);
+          EducationalCoreIcons.ShowHint);
   }
 
   public void actionPerformed(@NotNull AnActionEvent e) {
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudySwitchTaskPanelAction.kt b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudySwitchTaskPanelAction.kt
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudySwitchTaskPanelAction.kt
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudySwitchTaskPanelAction.kt
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java
rename to python/educational-core/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java
rename to python/educational-core/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyExecutor.java b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyExecutor.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyExecutor.java
rename to python/educational-core/src/com/jetbrains/edu/learning/checker/StudyExecutor.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudySmartChecker.java b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudySmartChecker.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudySmartChecker.java
rename to python/educational-core/src/com/jetbrains/edu/learning/checker/StudySmartChecker.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java
rename to python/educational-core/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyTestsOutputParser.java b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyTestsOutputParser.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyTestsOutputParser.java
rename to python/educational-core/src/com/jetbrains/edu/learning/checker/StudyTestsOutputParser.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderDeleteHandler.java b/python/educational-core/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderDeleteHandler.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderDeleteHandler.java
rename to python/educational-core/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderDeleteHandler.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderPainter.java b/python/educational-core/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderPainter.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderPainter.java
rename to python/educational-core/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderPainter.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduDocumentListener.java b/python/educational-core/src/com/jetbrains/edu/learning/core/EduDocumentListener.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/core/EduDocumentListener.java
rename to python/educational-core/src/com/jetbrains/edu/learning/core/EduDocumentListener.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduNames.java b/python/educational-core/src/com/jetbrains/edu/learning/core/EduNames.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/core/EduNames.java
rename to python/educational-core/src/com/jetbrains/edu/learning/core/EduNames.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/core/EduUtils.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/core/EduUtils.java
rename to python/educational-core/src/com/jetbrains/edu/learning/core/EduUtils.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderComparator.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderComparator.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderComparator.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderComparator.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderSubtaskInfo.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderSubtaskInfo.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderSubtaskInfo.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderSubtaskInfo.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Course.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Course.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/CourseInfo.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/CourseInfo.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/CourseInfo.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/CourseInfo.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Lesson.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Lesson.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyItem.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/StudyItem.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyItem.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/StudyItem.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyStatus.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/StudyStatus.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyStatus.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/StudyStatus.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/TaskFile.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/TaskFile.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/TaskFile.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/TaskFile.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/UserTest.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/UserTest.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/UserTest.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/UserTest.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/ChoiceTask.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/ChoiceTask.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/ChoiceTask.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/ChoiceTask.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/CodeTask.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/CodeTask.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/CodeTask.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/CodeTask.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/Task.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/Task.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/Task.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/Task.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/TaskWithSubtasks.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/TaskWithSubtasks.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/TaskWithSubtasks.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/TaskWithSubtasks.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/TheoryTask.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/TheoryTask.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/tasks/TheoryTask.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseFormat/tasks/TheoryTask.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java b/python/educational-core/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java b/python/educational-core/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
rename to python/educational-core/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyChoiceVariantsPanel.kt b/python/educational-core/src/com/jetbrains/edu/learning/editor/StudyChoiceVariantsPanel.kt
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyChoiceVariantsPanel.kt
rename to python/educational-core/src/com/jetbrains/edu/learning/editor/StudyChoiceVariantsPanel.kt
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditor.java b/python/educational-core/src/com/jetbrains/edu/learning/editor/StudyEditor.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditor.java
rename to python/educational-core/src/com/jetbrains/edu/learning/editor/StudyEditor.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java b/python/educational-core/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
rename to python/educational-core/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyFileEditorProvider.java b/python/educational-core/src/com/jetbrains/edu/learning/editor/StudyFileEditorProvider.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyFileEditorProvider.java
rename to python/educational-core/src/com/jetbrains/edu/learning/editor/StudyFileEditorProvider.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyHighlightErrorFilter.java b/python/educational-core/src/com/jetbrains/edu/learning/editor/StudyHighlightErrorFilter.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyHighlightErrorFilter.java
rename to python/educational-core/src/com/jetbrains/edu/learning/editor/StudyHighlightErrorFilter.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/EduIntelliJProjectTemplate.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/EduIntelliJProjectTemplate.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/EduIntelliJProjectTemplate.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/EduIntelliJProjectTemplate.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/EduIntelliJTemplateFactory.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/EduIntelliJTemplateFactory.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/EduIntelliJTemplateFactory.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/EduIntelliJTemplateFactory.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/android/EduSelectCourseProjectWizard.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/android/EduSelectCourseProjectWizard.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/android/EduSelectCourseProjectWizard.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/android/EduSelectCourseProjectWizard.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/android/EduStartLearningAction.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/android/EduStartLearningAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/android/EduStartLearningAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/android/EduStartLearningAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/generation/EduCourseModuleBuilder.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/generation/EduCourseModuleBuilder.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/generation/EduCourseModuleBuilder.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/generation/EduCourseModuleBuilder.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/generation/EduProjectGenerator.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/generation/EduProjectGenerator.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/generation/EduProjectGenerator.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/generation/EduProjectGenerator.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/localCourses/EduCustomCourseModuleBuilder.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/localCourses/EduCustomCourseModuleBuilder.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/localCourses/EduCustomCourseModuleBuilder.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/localCourses/EduCustomCourseModuleBuilder.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/localCourses/EduCustomCourseProjectTemplate.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/localCourses/EduCustomCourseProjectTemplate.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/localCourses/EduCustomCourseProjectTemplate.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/localCourses/EduCustomCourseProjectTemplate.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/localCourses/EduLocalCoursePanel.form b/python/educational-core/src/com/jetbrains/edu/learning/intellij/localCourses/EduLocalCoursePanel.form
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/localCourses/EduLocalCoursePanel.form
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/localCourses/EduLocalCoursePanel.form
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/intellij/localCourses/EduLocalCoursePanel.java b/python/educational-core/src/com/jetbrains/edu/learning/intellij/localCourses/EduLocalCoursePanel.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/intellij/localCourses/EduLocalCoursePanel.java
rename to python/educational-core/src/com/jetbrains/edu/learning/intellij/localCourses/EduLocalCoursePanel.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java b/python/educational-core/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java
rename to python/educational-core/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/CourseDirectoryNode.java b/python/educational-core/src/com/jetbrains/edu/learning/projectView/CourseDirectoryNode.java
similarity index 95%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/projectView/CourseDirectoryNode.java
rename to python/educational-core/src/com/jetbrains/edu/learning/projectView/CourseDirectoryNode.java
index 90d97d803dfe..896c8192bbc2 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/CourseDirectoryNode.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/projectView/CourseDirectoryNode.java
@@ -11,7 +11,7 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -35,7 +35,7 @@ public class CourseDirectoryNode extends StudyDirectoryNode {
 
   @Override
   protected void updateImpl(PresentationData data) {
-    setPresentation(data, myCourse.getName(), InteractiveLearningIcons.Course);
+    setPresentation(data, myCourse.getName(), EducationalCoreIcons.Course);
   }
 
   @Nullable
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/DirectoryNode.java b/python/educational-core/src/com/jetbrains/edu/learning/projectView/DirectoryNode.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/projectView/DirectoryNode.java
rename to python/educational-core/src/com/jetbrains/edu/learning/projectView/DirectoryNode.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/LessonDirectoryNode.java b/python/educational-core/src/com/jetbrains/edu/learning/projectView/LessonDirectoryNode.java
similarity index 95%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/projectView/LessonDirectoryNode.java
rename to python/educational-core/src/com/jetbrains/edu/learning/projectView/LessonDirectoryNode.java
index 279efcbfbaff..a7f29c772bd2 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/LessonDirectoryNode.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/projectView/LessonDirectoryNode.java
@@ -14,7 +14,7 @@ import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import com.jetbrains.edu.learning.courseFormat.StudyStatus;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -40,7 +40,7 @@ public class LessonDirectoryNode extends StudyDirectoryNode {
     StudyStatus status = myLesson.getStatus();
     boolean isSolved = status != StudyStatus.Solved;
     JBColor color = isSolved ? JBColor.BLACK : LIGHT_GREEN;
-    Icon icon = isSolved ? InteractiveLearningIcons.Lesson : InteractiveLearningIcons.LessonCompl;
+    Icon icon = isSolved ? EducationalCoreIcons.Lesson : EducationalCoreIcons.LessonCompl;
     updatePresentation(data, myLesson.getName(), color, icon, null);
   }
 
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyDirectoryNode.java b/python/educational-core/src/com/jetbrains/edu/learning/projectView/StudyDirectoryNode.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyDirectoryNode.java
rename to python/educational-core/src/com/jetbrains/edu/learning/projectView/StudyDirectoryNode.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java b/python/educational-core/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
rename to python/educational-core/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/TaskDirectoryNode.java b/python/educational-core/src/com/jetbrains/edu/learning/projectView/TaskDirectoryNode.java
similarity index 95%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/projectView/TaskDirectoryNode.java
rename to python/educational-core/src/com/jetbrains/edu/learning/projectView/TaskDirectoryNode.java
index 70d88b361213..da41836b0c51 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/TaskDirectoryNode.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/projectView/TaskDirectoryNode.java
@@ -17,7 +17,7 @@ import com.jetbrains.edu.learning.courseFormat.StudyStatus;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.tasks.TaskWithSubtasks;
 import com.jetbrains.edu.learning.navigation.StudyNavigator;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -48,12 +48,12 @@ public class TaskDirectoryNode extends StudyDirectoryNode {
     StudyStatus status = myTask.getStatus();
     String subtaskInfo = myTask instanceof TaskWithSubtasks ? getSubtaskInfo((TaskWithSubtasks)myTask) : null;
     if (status == StudyStatus.Unchecked) {
-      updatePresentation(data, myTask.getName(), JBColor.BLACK, InteractiveLearningIcons.Task, subtaskInfo);
+      updatePresentation(data, myTask.getName(), JBColor.BLACK, EducationalCoreIcons.Task, subtaskInfo);
       return;
     }
     boolean isSolved = status == StudyStatus.Solved;
     JBColor color = isSolved ? LIGHT_GREEN : JBColor.RED;
-    Icon icon = isSolved ? InteractiveLearningIcons.TaskCompl : InteractiveLearningIcons.TaskProbl;
+    Icon icon = isSolved ? EducationalCoreIcons.TaskCompl : EducationalCoreIcons.TaskProbl;
     updatePresentation(data, myTask.getName(), color, icon, subtaskInfo);
   }
 
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/settings/StudyConfigurable.java b/python/educational-core/src/com/jetbrains/edu/learning/settings/StudyConfigurable.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/settings/StudyConfigurable.java
rename to python/educational-core/src/com/jetbrains/edu/learning/settings/StudyConfigurable.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/settings/StudyOptionsProvider.java b/python/educational-core/src/com/jetbrains/edu/learning/settings/StudyOptionsProvider.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/settings/StudyOptionsProvider.java
rename to python/educational-core/src/com/jetbrains/edu/learning/settings/StudyOptionsProvider.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/settings/StudyOptionsProviderEP.java b/python/educational-core/src/com/jetbrains/edu/learning/settings/StudyOptionsProviderEP.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/settings/StudyOptionsProviderEP.java
rename to python/educational-core/src/com/jetbrains/edu/learning/settings/StudyOptionsProviderEP.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/statistics/EduUsagesCollector.java b/python/educational-core/src/com/jetbrains/edu/learning/statistics/EduUsagesCollector.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/statistics/EduUsagesCollector.java
rename to python/educational-core/src/com/jetbrains/edu/learning/statistics/EduUsagesCollector.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/EduAdaptiveStepicConnector.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicAuthorizedClient.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicAuthorizedClient.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicAuthorizedClient.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicAuthorizedClient.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicClient.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicClient.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicClient.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicClient.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicUpdater.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicUpdater.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicUpdater.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicUpdater.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.form b/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.form
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.form
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.form
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicStudyOptions.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUpdateSettings.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicUpdateSettings.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUpdateSettings.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicUpdateSettings.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicUser.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicUser.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicWrappers.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicWrappers.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicWrappers.java
rename to python/educational-core/src/com/jetbrains/edu/learning/stepic/StepicWrappers.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/twitter/StudyTwitterAction.java b/python/educational-core/src/com/jetbrains/edu/learning/twitter/StudyTwitterAction.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/twitter/StudyTwitterAction.java
rename to python/educational-core/src/com/jetbrains/edu/learning/twitter/StudyTwitterAction.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/twitter/StudyTwitterUtils.java b/python/educational-core/src/com/jetbrains/edu/learning/twitter/StudyTwitterUtils.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/twitter/StudyTwitterUtils.java
rename to python/educational-core/src/com/jetbrains/edu/learning/twitter/StudyTwitterUtils.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.form b/python/educational-core/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.form
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.form
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.form
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/LoginPanel.form b/python/educational-core/src/com/jetbrains/edu/learning/ui/LoginPanel.form
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/LoginPanel.form
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/LoginPanel.form
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/LoginPanel.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/LoginPanel.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/LoginPanel.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/LoginPanel.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyBrowserWindow.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyBrowserWindow.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyBrowserWindow.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyBrowserWindow.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyCondition.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyCondition.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyCondition.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyCondition.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyHint.kt b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyHint.kt
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyHint.kt
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyHint.kt
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyHintActionsProvider.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyHintActionsProvider.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyHintActionsProvider.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyHintActionsProvider.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyJavaFxToolWindow.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyJavaFxToolWindow.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyJavaFxToolWindow.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyJavaFxToolWindow.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
similarity index 99%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
index 58dd4e7bb3a5..46216fcb45c7 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
@@ -31,7 +31,7 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.CourseInfo;
 import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
 import com.jetbrains.edu.learning.stepic.*;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -144,7 +144,7 @@ public class StudyNewProjectPanel extends JPanel implements PanelWithAnchor {
   private void setupBrowseButton() {
     if (SystemInfo.isMac && !UIUtil.isUnderDarcula())
       myBrowseButton.putClientProperty("JButton.buttonType", null);
-    myBrowseButton.setIcon(InteractiveLearningIcons.InterpreterGear);
+    myBrowseButton.setIcon(EducationalCoreIcons.InterpreterGear);
     final FileChooserDescriptor fileChooser = new FileChooserDescriptor(true, false, false, true, false, false) {
       @Override
       public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyProgressBar.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyProgressBar.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyProgressBar.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyProgressBar.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudySwingToolWindow.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudySwingToolWindow.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudySwingToolWindow.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudySwingToolWindow.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyTestContentPanel.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyTestContentPanel.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyTestContentPanel.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyTestContentPanel.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyTestResultsToolWindowFactory.kt b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyTestResultsToolWindowFactory.kt
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyTestResultsToolWindowFactory.kt
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyTestResultsToolWindowFactory.kt
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
similarity index 100%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
similarity index 93%
rename from python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
rename to python/educational-core/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
index 3e96dfe834f8..00fb4d35891f 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
@@ -10,7 +10,7 @@ import com.intellij.ui.content.ContentManager;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.courseFormat.Course;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 public class StudyToolWindowFactory implements ToolWindowFactory, DumbAware {
@@ -19,7 +19,7 @@ public class StudyToolWindowFactory implements ToolWindowFactory, DumbAware {
 
   @Override
   public void createToolWindowContent(@NotNull final Project project, @NotNull final ToolWindow toolWindow) {
-    toolWindow.setIcon(InteractiveLearningIcons.TaskDescription);
+    toolWindow.setIcon(EducationalCoreIcons.TaskDescription);
     StudyTaskManager taskManager = StudyTaskManager.getInstance(project);
     final Course course = taskManager.getCourse();
     if (course != null) {
diff --git a/python/educational-core/student/src/icons/InteractiveLearningIcons.java b/python/educational-core/src/icons/EducationalCoreIcons.java
similarity index 94%
rename from python/educational-core/student/src/icons/InteractiveLearningIcons.java
rename to python/educational-core/src/icons/EducationalCoreIcons.java
index 7e2e777ffe95..c089db48d76c 100644
--- a/python/educational-core/student/src/icons/InteractiveLearningIcons.java
+++ b/python/educational-core/src/icons/EducationalCoreIcons.java
@@ -8,9 +8,9 @@ import javax.swing.*;
  * NOTE THIS FILE IS AUTO-GENERATED
  * DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead
  */
-public class InteractiveLearningIcons {
+public class EducationalCoreIcons {
   private static Icon load(String path) {
-    return IconLoader.getIcon(path, InteractiveLearningIcons.class);
+    return IconLoader.getIcon(path, EducationalCoreIcons.class);
   }
 
   public static final Icon CheckTask = load("/icons/com/jetbrains/edu/learning/CheckTask.png"); // 16x16
diff --git a/python/educational-core/student/student.iml b/python/educational-core/student/student.iml
deleted file mode 100644
index e9520697b646..000000000000
--- a/python/educational-core/student/student.iml
+++ /dev/null
@@ -1,34 +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$/testSrc" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../educational/interactive-learning/src/com/jetbrains/edu/learning/course" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="library" name="http-client" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/twitter4j-core-4.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="xml" />
-    <orderEntry type="library" name="markdownj" level="project" />
-    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="openapi" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/python/educational-core/student/testData/migration/3.xml b/python/educational-core/testData/migration/3.xml
similarity index 100%
rename from python/educational-core/student/testData/migration/3.xml
rename to python/educational-core/testData/migration/3.xml
diff --git a/python/educational-core/student/testData/migration/4.xml b/python/educational-core/testData/migration/4.xml
similarity index 100%
rename from python/educational-core/student/testData/migration/4.xml
rename to python/educational-core/testData/migration/4.xml
diff --git a/python/educational-core/student/testData/migration/adaptive4.xml b/python/educational-core/testData/migration/adaptive4.xml
similarity index 100%
rename from python/educational-core/student/testData/migration/adaptive4.xml
rename to python/educational-core/testData/migration/adaptive4.xml
diff --git a/python/educational-core/student/testData/migration/adaptive5.xml b/python/educational-core/testData/migration/adaptive5.xml
similarity index 100%
rename from python/educational-core/student/testData/migration/adaptive5.xml
rename to python/educational-core/testData/migration/adaptive5.xml
diff --git a/python/educational-core/student/testData/migration/subtasks4.xml b/python/educational-core/testData/migration/subtasks4.xml
similarity index 100%
rename from python/educational-core/student/testData/migration/subtasks4.xml
rename to python/educational-core/testData/migration/subtasks4.xml
diff --git a/python/educational-core/student/testData/migration/subtasks5.xml b/python/educational-core/testData/migration/subtasks5.xml
similarity index 100%
rename from python/educational-core/student/testData/migration/subtasks5.xml
rename to python/educational-core/testData/migration/subtasks5.xml
diff --git a/python/educational-core/student/testData/stepic/1.json b/python/educational-core/testData/stepic/1.json
similarity index 100%
rename from python/educational-core/student/testData/stepic/1.json
rename to python/educational-core/testData/stepic/1.json
diff --git a/python/educational-core/student/testData/stepic/2.json b/python/educational-core/testData/stepic/2.json
similarity index 100%
rename from python/educational-core/student/testData/stepic/2.json
rename to python/educational-core/testData/stepic/2.json
diff --git a/python/educational-core/student/testData/stepic/3.json b/python/educational-core/testData/stepic/3.json
similarity index 100%
rename from python/educational-core/student/testData/stepic/3.json
rename to python/educational-core/testData/stepic/3.json
diff --git a/python/educational-core/student/testData/stepic/courses.json b/python/educational-core/testData/stepic/courses.json
similarity index 100%
rename from python/educational-core/student/testData/stepic/courses.json
rename to python/educational-core/testData/stepic/courses.json
diff --git a/python/educational-core/student/testData/stepic/placeholder.json b/python/educational-core/testData/stepic/placeholder.json
similarity index 100%
rename from python/educational-core/student/testData/stepic/placeholder.json
rename to python/educational-core/testData/stepic/placeholder.json
diff --git a/python/educational-core/student/testSrc/com/jetbrains/edu/learning/StudyMigrationTest.java b/python/educational-core/testSrc/com/jetbrains/edu/learning/StudyMigrationTest.java
similarity index 100%
rename from python/educational-core/student/testSrc/com/jetbrains/edu/learning/StudyMigrationTest.java
rename to python/educational-core/testSrc/com/jetbrains/edu/learning/StudyMigrationTest.java
diff --git a/python/educational-core/student/testSrc/com/jetbrains/edu/learning/stepic/StudyStepicFormatTest.java b/python/educational-core/testSrc/com/jetbrains/edu/learning/stepic/StudyStepicFormatTest.java
similarity index 100%
rename from python/educational-core/student/testSrc/com/jetbrains/edu/learning/stepic/StudyStepicFormatTest.java
rename to python/educational-core/testSrc/com/jetbrains/edu/learning/stepic/StudyStepicFormatTest.java
diff --git a/python/educational-python/Edu-Python/Edu-Python.iml b/python/educational-python/Edu-Python/Edu-Python.iml
index 8559b88969e6..815befd49b4b 100644
--- a/python/educational-python/Edu-Python/Edu-Python.iml
+++ b/python/educational-python/Edu-Python/Edu-Python.iml
@@ -8,12 +8,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="student" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="python-community" />
     <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" />
+    <orderEntry type="module" module-name="educational-core" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/educational-python/build/plugin-list.txt b/python/educational-python/build/plugin-list.txt
index f0773d38377b..281c3c2fa402 100644
--- a/python/educational-python/build/plugin-list.txt
+++ b/python/educational-python/build/plugin-list.txt
@@ -2,7 +2,7 @@ svn4idea
 git4idea
 remote-servers-git
 github
-student
+educational-core
 Edu-Python
 course-creator
 hg4idea
diff --git a/python/educational-python/main_pycharm_edu.iml b/python/educational-python/main_pycharm_edu.iml
index 4431dc1fa240..8a0ded56714a 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="student" />
     <orderEntry type="module" module-name="Edu-Python" />
     <orderEntry type="module" module-name="hg4idea" />
     <orderEntry type="module" module-name="ipnb" />