diff --git a/python/educational-core/resources/META-INF/plugin.xml b/python/educational-core/resources/META-INF/plugin.xml
index aebea6fd6a7c..5f794738eaa2 100644
--- a/python/educational-core/resources/META-INF/plugin.xml
+++ b/python/educational-core/resources/META-INF/plugin.xml
@@ -45,7 +45,7 @@
       <with attribute="implementationClass" implements="com.jetbrains.edu.learning.EduPluginConfigurator"/>
     </extensionPoint>
     <extensionPoint qualifiedName="Edu.studyTwitterPluginConfigurator" interface="com.jetbrains.edu.learning.StudyTwitterPluginConfigurator"/>
-    <extensionPoint qualifiedName="Edu.checkListener" interface="com.jetbrains.edu.learning.StudyCheckListener"/>
+    <extensionPoint qualifiedName="Edu.checkListener" interface="com.jetbrains.edu.learning.checker.StudyCheckListener"/>
     <extensionPoint qualifiedName="Edu.optionsProvider" beanClass="com.jetbrains.edu.learning.settings.StudyOptionsProviderEP">
       <with attribute="instance" implements="com.jetbrains.edu.learning.settings.StudyOptionsProvider"/>
     </extensionPoint>
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
index 984d1a5dd699..abf32c6c97e5 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
@@ -13,7 +13,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.learning.StudyCheckListener;
+import com.jetbrains.edu.learning.checker.StudyCheckListener;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.checker.StudyCheckUtils;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/StudyCheckListener.java b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyCheckListener.java
similarity index 91%
rename from python/educational-core/src/com/jetbrains/edu/learning/StudyCheckListener.java
rename to python/educational-core/src/com/jetbrains/edu/learning/checker/StudyCheckListener.java
index d4896f864d27..e4f2fa636028 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/StudyCheckListener.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/checker/StudyCheckListener.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.learning;
+package com.jetbrains.edu.learning.checker;
 
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/twitter/StudyTwitterAction.java b/python/educational-core/src/com/jetbrains/edu/learning/twitter/StudyTwitterAction.java
index a1c57b92583d..360c0eba54bd 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/twitter/StudyTwitterAction.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/twitter/StudyTwitterAction.java
@@ -2,7 +2,7 @@ package com.jetbrains.edu.learning.twitter;
 
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.edu.learning.StudyCheckListener;
+import com.jetbrains.edu.learning.checker.StudyCheckListener;
 import com.jetbrains.edu.learning.StudyTwitterPluginConfigurator;
 import com.jetbrains.edu.learning.courseFormat.StudyStatus;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;