Rename educational plugins and update plugin's description

edu --> educational-python
educational --> educational-core
interactive-learning --> student

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 611ecc17daccd8dbf7a8e932a248455eccc5d577..1c9aa2e4f46bbb0926b34fa57e8538032516ee46 100644 (file)
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -51,8 +51,8 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/copyright/copyright.iml" filepath="$PROJECT_DIR$/plugins/copyright/copyright.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/platform/core-api/core-api.iml" filepath="$PROJECT_DIR$/platform/core-api/core-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/core-impl/core-impl.iml" filepath="$PROJECT_DIR$/platform/core-impl/core-impl.iml" group="platform" />
-      <module fileurl="file://$PROJECT_DIR$/python/educational/course-creator/course-creator.iml" filepath="$PROJECT_DIR$/python/educational/course-creator/course-creator.iml" group="plugins/python/educational/educational-core" />
-      <module fileurl="file://$PROJECT_DIR$/python/edu/course-creator-python/course-creator-python.iml" filepath="$PROJECT_DIR$/python/edu/course-creator-python/course-creator-python.iml" group="plugins/python/educational/python-educational" />
+      <module fileurl="file://$PROJECT_DIR$/python/educational-core/course-creator/course-creator.iml" filepath="$PROJECT_DIR$/python/educational-core/course-creator/course-creator.iml" group="plugins/python/educational/educational-core" />
+      <module fileurl="file://$PROJECT_DIR$/python/educational-python/course-creator-python/course-creator-python.iml" filepath="$PROJECT_DIR$/python/educational-python/course-creator-python/course-creator-python.iml" group="plugins/python/educational/educational-python" />
       <module fileurl="file://$PROJECT_DIR$/plugins/coverage/coverage.iml" filepath="$PROJECT_DIR$/plugins/coverage/coverage.iml" group="plugins/coverage" />
       <module fileurl="file://$PROJECT_DIR$/plugins/coverage-common/coverage-common.iml" filepath="$PROJECT_DIR$/plugins/coverage-common/coverage-common.iml" group="plugins/coverage" />
       <module fileurl="file://$PROJECT_DIR$/plugins/coverage/coverage_rt/coverage_rt.iml" filepath="$PROJECT_DIR$/plugins/coverage/coverage_rt/coverage_rt.iml" group="plugins/coverage" />
@@ -82,7 +82,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" filepath="$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-ex/editor-ui-ex.iml" filepath="$PROJECT_DIR$/platform/editor-ui-ex/editor-ui-ex.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/editorconfig/editorconfig.iml" filepath="$PROJECT_DIR$/plugins/editorconfig/editorconfig.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/python/educational/educational.iml" filepath="$PROJECT_DIR$/python/educational/educational.iml" group="plugins/python/educational/educational-core" />
+      <module fileurl="file://$PROJECT_DIR$/python/educational-core/educational-core.iml" filepath="$PROJECT_DIR$/python/educational-core/educational-core.iml" group="plugins/python/educational/educational-core" />
       <module fileurl="file://$PROJECT_DIR$/java/execution/impl/execution-impl.iml" filepath="$PROJECT_DIR$/java/execution/impl/execution-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/execution/openapi/execution-openapi.iml" filepath="$PROJECT_DIR$/java/execution/openapi/execution-openapi.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/platform/extensions/extensions.iml" filepath="$PROJECT_DIR$/platform/extensions/extensions.iml" group="platform" />
@@ -114,8 +114,8 @@
       <module fileurl="file://$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" filepath="$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" filepath="$PROJECT_DIR$/java/compiler/instrumentation-util/instrumentation-util.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml" group="jps" />
-      <module fileurl="file://$PROJECT_DIR$/python/educational/interactive-learning/interactive-learning.iml" filepath="$PROJECT_DIR$/python/educational/interactive-learning/interactive-learning.iml" group="plugins/python/educational/educational-core" />
-      <module fileurl="file://$PROJECT_DIR$/python/edu/interactive-learning-python/interactive-learning-python.iml" filepath="$PROJECT_DIR$/python/edu/interactive-learning-python/interactive-learning-python.iml" group="plugins/python/educational/python-educational" />
+      <module fileurl="file://$PROJECT_DIR$/python/educational-core/student/student.iml" filepath="$PROJECT_DIR$/python/educational-core/student/student.iml" group="plugins/python/educational/educational-core" />
+      <module fileurl="file://$PROJECT_DIR$/python/educational-python/student-python/student-python.iml" filepath="$PROJECT_DIR$/python/educational-python/student-python/student-python.iml" group="plugins/python/educational/educational-python" />
       <module fileurl="file://$PROJECT_DIR$/python/ipnb/ipnb.iml" filepath="$PROJECT_DIR$/python/ipnb/ipnb.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/java/java-analysis-api/java-analysis-api.iml" filepath="$PROJECT_DIR$/java/java-analysis-api/java-analysis-api.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-analysis-impl/java-analysis-impl.iml" filepath="$PROJECT_DIR$/java/java-analysis-impl/java-analysis-impl.iml" group="java" />
@@ -164,7 +164,7 @@
       <module fileurl="file://$PROJECT_DIR$/android/android/main_AndroidStudio.iml" filepath="$PROJECT_DIR$/android/android/main_AndroidStudio.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/python/main_idea_python_plugin.iml" filepath="$PROJECT_DIR$/python/main_idea_python_plugin.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/main_pycharm_ce.iml" filepath="$PROJECT_DIR$/python/main_pycharm_ce.iml" group="python" />
-      <module fileurl="file://$PROJECT_DIR$/python/edu/main_pycharm_edu.iml" filepath="$PROJECT_DIR$/python/edu/main_pycharm_edu.iml" group="python/educational" />
+      <module fileurl="file://$PROJECT_DIR$/python/educational-python/main_pycharm_edu.iml" filepath="$PROJECT_DIR$/python/educational-python/main_pycharm_edu.iml" group="python/educational" />
       <module fileurl="file://$PROJECT_DIR$/java/manifest/manifest.iml" filepath="$PROJECT_DIR$/java/manifest/manifest.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven.iml" filepath="$PROJECT_DIR$/plugins/maven/maven.iml" group="plugins/maven" />
@@ -201,8 +201,8 @@
       <module fileurl="file://$PROJECT_DIR$/python/pluginJava/python-community-plugin-java.iml" filepath="$PROJECT_DIR$/python/pluginJava/python-community-plugin-java.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/python-community-plugin-resources.iml" filepath="$PROJECT_DIR$/python/python-community-plugin-resources.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/testSrc/python-community-tests.iml" filepath="$PROJECT_DIR$/python/testSrc/python-community-tests.iml" group="python" />
-      <module fileurl="file://$PROJECT_DIR$/python/edu/build/python-edu-build.iml" filepath="$PROJECT_DIR$/python/edu/build/python-edu-build.iml" group="python/educational" />
-      <module fileurl="file://$PROJECT_DIR$/python/edu/python-educational.iml" filepath="$PROJECT_DIR$/python/edu/python-educational.iml" group="python/educational" />
+      <module fileurl="file://$PROJECT_DIR$/python/educational-python/build/python-edu-build.iml" filepath="$PROJECT_DIR$/python/educational-python/build/python-edu-build.iml" group="python/educational" />
+      <module fileurl="file://$PROJECT_DIR$/python/educational-python/educational-python.iml" filepath="$PROJECT_DIR$/python/educational-python/educational-python.iml" group="python/educational" />
       <module fileurl="file://$PROJECT_DIR$/python/python-helpers.iml" filepath="$PROJECT_DIR$/python/python-helpers.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/ide/python-ide-community.iml" filepath="$PROJECT_DIR$/python/ide/python-ide-community.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/openapi/python-openapi.iml" filepath="$PROJECT_DIR$/python/openapi/python-openapi.iml" group="python" />

diff --git a/python/educational/course-creator/course-creator.iml b/python/educational-core/course-creator/course-creator.iml
similarity index 77%
rename from python/educational/course-creator/course-creator.iml
rename to python/educational-core/course-creator/course-creator.iml
index 46da5de456289b761d79801a9a20148f1357da8e..2a8dc4ab4f193d01492e85361b06bbf472b744f1 100644 (file)
--- a/python/educational/course-creator/course-creator.iml
+++ b/python/educational-core/course-creator/course-creator.iml
@@ -5,13 +5,13 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/src/com/jetbrains/edu/coursecreator/format" />
+      <excludeFolder url="file://$MODULE_DIR$/../../educational/course-creator/src/com/jetbrains/edu/coursecreator/format" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="educational" />
+    <orderEntry type="module" module-name="educational-core" />
     <orderEntry type="library" name="guava-tools" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/python/educational/course-creator/resources/META-INF/plugin.xml b/python/educational-core/course-creator/resources/META-INF/plugin.xml
similarity index 98%
rename from python/educational/course-creator/resources/META-INF/plugin.xml
rename to python/educational-core/course-creator/resources/META-INF/plugin.xml
index 0f8051b07c20fc2b4865395ff646e7f9652789a9..f5fd514ed89bf2e0c880ea29840520264765fd80 100644 (file)
--- a/python/educational/course-creator/resources/META-INF/plugin.xml
+++ b/python/educational-core/course-creator/resources/META-INF/plugin.xml
@@ -20,7 +20,7 @@
   -->
   <depends>com.intellij.modules.platform</depends>
   <depends>com.jetbrains.edu.core</depends>
-  <depends>com.jetbrains.edu.interactivelearning</depends>
+  <depends>com.jetbrains.edu.student</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceImplementation="com.jetbrains.edu.coursecreator.CCProjectService"/>

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCEditorFactoryListener.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCEditorFactoryListener.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCEditorFactoryListener.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCEditorFactoryListener.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCLanguageManager.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLanguageManager.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCLanguageManager.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLanguageManager.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonMoveHandlerDelegate.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonMoveHandlerDelegate.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonMoveHandlerDelegate.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonMoveHandlerDelegate.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
similarity index 94%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
index 26703583931f95d6f11b3ed0c638e9cafedb6284..cc8866900169f8ad88a54b89ae10dd5f3b192ea8 100644 (file)
--- a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
@@ -13,7 +13,10 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.rename.RenameHandler;
 import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.*;
+import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.courseFormat.Lesson;
+import com.jetbrains.edu.courseFormat.StudyItem;
+import com.jetbrains.edu.courseFormat.Task;
 import org.jetbrains.annotations.NotNull;
 
 public class CCRenameHandler implements RenameHandler {

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameInputValidator.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameInputValidator.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameInputValidator.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameInputValidator.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskMoveHandlerDelegate.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskMoveHandlerDelegate.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskMoveHandlerDelegate.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskMoveHandlerDelegate.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAnswerPlaceholderAction.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAnswerPlaceholderAction.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAnswerPlaceholderAction.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAnswerPlaceholderAction.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateStudyItemActionBase.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateStudyItemActionBase.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateStudyItemActionBase.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateStudyItemActionBase.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAnswerPlaceholder.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAnswerPlaceholder.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAnswerPlaceholder.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAnswerPlaceholder.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCDirectoryNode.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCDirectoryNode.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCDirectoryNode.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCDirectoryNode.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderDialog.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderDialog.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderDialog.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderDialog.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.form b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.form
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.form
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.form

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemDialog.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemDialog.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemDialog.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemDialog.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemPanel.form b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemPanel.form
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemPanel.form
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemPanel.form

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemPanel.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemPanel.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemPanel.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateStudyItemPanel.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCItemPositionPanel.form b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCItemPositionPanel.form
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCItemPositionPanel.form
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCItemPositionPanel.form

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCItemPositionPanel.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCItemPositionPanel.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCItemPositionPanel.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCItemPositionPanel.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCMoveStudyItemDialog.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCMoveStudyItemDialog.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCMoveStudyItemDialog.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCMoveStudyItemDialog.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.form b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.form
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.form
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.form

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCNewProjectPanel.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchiveDialog.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchiveDialog.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchiveDialog.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchiveDialog.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.form b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.form
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.form
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.form

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFileDialog.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFileDialog.java
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFileDialog.java
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFileDialog.java

diff --git a/python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFilePanel.form b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFilePanel.form
similarity index 100%
rename from python/educational/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFilePanel.form
rename to python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFilePanel.form

diff --git a/python/educational/educational.iml b/python/educational-core/educational-core.iml
similarity index 100%
rename from python/educational/educational.iml
rename to python/educational-core/educational-core.iml

diff --git a/python/educational/resources/META-INF/plugin.xml b/python/educational-core/resources/META-INF/plugin.xml
similarity in