diff --git a/code_samples/editor_basics/resources/META-INF/plugin.xml b/code_samples/editor_basics/resources/META-INF/plugin.xml
index 9aae58e91..b25400a7d 100644
--- a/code_samples/editor_basics/resources/META-INF/plugin.xml
+++ b/code_samples/editor_basics/resources/META-INF/plugin.xml
@@ -25,15 +25,15 @@
   </project-components>
 
   <actions>
-    <action id="EditorBasics.EditorIllustration" class="org.jetbrains.plugins.editor.basics.EditorIllustration" text="Editor Basics"
+    <action id="EditorBasics.EditorIllustration" class="org.jetbrains.tutorials.editor.basics.EditorIllustration" text="Editor Basics"
             description="Illustrates how to plug an action in">
     <add-to-group group-id="EditorPopupMenu" anchor="first"/>
     </action>
-    <action id="EditorBasics.EditorHandlerIllustration" class="org.jetbrains.plugins.editor.basics.EditorHandlerIllustration" text="Editor Handler"
+    <action id="EditorBasics.EditorHandlerIllustration" class="org.jetbrains.tutorials.editor.basics.EditorHandlerIllustration" text="Editor Handler"
             description="Illustrates how to plug an action in">
       <add-to-group group-id="EditorPopupMenu" anchor="first"/>
     </action>
-    <action id="EditorBasics.LogicalPositionIllustration" class="org.jetbrains.plugins.editor.basics.EditorAreaIllustration" text="Caret Position"
+    <action id="EditorBasics.LogicalPositionIllustration" class="org.jetbrains.tutorials.editor.basics.EditorAreaIllustration" text="Caret Position"
             description="Illustrates how editor area is organized">
       <add-to-group group-id="EditorPopupMenu" anchor="first"/>
     </action>
diff --git a/code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorAreaIllustration.java b/code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorAreaIllustration.java
similarity index 96%
rename from code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorAreaIllustration.java
rename to code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorAreaIllustration.java
index 2f5cffc0f..f8efe3eaf 100644
--- a/code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorAreaIllustration.java
+++ b/code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorAreaIllustration.java
@@ -1,4 +1,4 @@
-package org.jetbrains.plugins.editor.basics;
+package org.jetbrains.tutorials.editor.basics;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
diff --git a/code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorHandlerIllustration.java b/code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorHandlerIllustration.java
similarity index 96%
rename from code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorHandlerIllustration.java
rename to code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorHandlerIllustration.java
index ae2917bd7..06c3da995 100644
--- a/code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorHandlerIllustration.java
+++ b/code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorHandlerIllustration.java
@@ -1,4 +1,4 @@
-package org.jetbrains.plugins.editor.basics;
+package org.jetbrains.tutorials.editor.basics;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
diff --git a/code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorIllustration.java b/code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorIllustration.java
similarity index 98%
rename from code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorIllustration.java
rename to code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorIllustration.java
index a77dc4590..8185cd324 100644
--- a/code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/EditorIllustration.java
+++ b/code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/EditorIllustration.java
@@ -1,4 +1,4 @@
-package org.jetbrains.plugins.editor.basics;
+package org.jetbrains.tutorials.editor.basics;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
diff --git a/code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/MyTypedHandler.java b/code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/MyTypedHandler.java
similarity index 95%
rename from code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/MyTypedHandler.java
rename to code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/MyTypedHandler.java
index 0deb62dc8..56f8218cf 100644
--- a/code_samples/editor_basics/src/org/jetbrains/plugins/editor/basics/MyTypedHandler.java
+++ b/code_samples/editor_basics/src/org/jetbrains/tutorials/editor/basics/MyTypedHandler.java
@@ -1,4 +1,4 @@
-package org.jetbrains.plugins.editor.basics;
+package org.jetbrains.tutorials.editor.basics;
 
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.command.WriteCommandAction;
diff --git a/tutorials/editor_basics.md b/tutorials/editor_basics.md
index 56e9ddcfd..a86d7ed99 100644
--- a/tutorials/editor_basics.md
+++ b/tutorials/editor_basics.md
@@ -27,7 +27,7 @@ To register the action we should add a corresponding attribute to the *<actions>
 [plugin.xml] (https://github.com/JetBrains/intellij-sdk/blob/master/code_samples/editor_basics/resources/META-INF/plugin.xml)
 
     <actions>
-        <action id="EditorBasics.EditorIllustration" class="org.jetbrains.plugins.editor.basics.EditorIllustration" text="Editor Basics"
+        <action id="EditorBasics.EditorIllustration" class="EditorIllustration" text="Editor Basics"
             description="Illustrates how to plug an action in">
         <add-to-group group-id="EditorPopupMenu" anchor="last"/>
     </action>