diff --git a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
index a8ef37514da6..99de5725970f 100644
--- a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
@@ -25,7 +25,7 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.intellij.openapi.fileEditor.impl.EditorEmptyTextPainter"
-                        serviceImplementation="com.jetbrains.edu.learning.PyStudyInstructionPainter" overrides="true"/>
+                        serviceImplementation="com.jetbrains.python.edu.PyStudyInstructionPainter" overrides="true"/>
     <programRunner implementation="com.jetbrains.python.edu.debugger.PyEduDebugRunner"/>
       <executor implementation="com.jetbrains.python.edu.debugger.PyEduDebugExecutor" order="first,after run"/>
       <consoleInputFilterProvider implementation="com.jetbrains.python.edu.debugger.PyEduConsoleInputFilterProvider"/>
diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyInstructionPainter.java b/python/educational-python/src/com/jetbrains/python/edu/PyStudyInstructionPainter.java
similarity index 97%
rename from python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyInstructionPainter.java
rename to python/educational-python/src/com/jetbrains/python/edu/PyStudyInstructionPainter.java
index 5fb22db0fd8a..ad79b53d8747 100644
--- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyInstructionPainter.java
+++ b/python/educational-python/src/com/jetbrains/python/edu/PyStudyInstructionPainter.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.learning;
+package com.jetbrains.python.edu;
 
 import com.intellij.openapi.actionSystem.KeyboardShortcut;
 import com.intellij.openapi.fileEditor.impl.EditorEmptyTextPainter;