diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 2abe60e579b..7f3404bb41f 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -133,8 +133,8 @@
       <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetPsiChecker"/>
       <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.DebugInfoAnnotator"/>
 
-      <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.JetStatementGroupSelectioner"/>
-      <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.JetCodeBlockSelectioner"/>
+      <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetStatementGroupSelectioner"/>
+      <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetCodeBlockSelectioner"/>
 
       <documentationProvider implementation="org.jetbrains.jet.plugin.JetQuickDocumentationProvider"/>
       <configurationType implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationType"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/JetCodeBlockSelectioner.java b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetCodeBlockSelectioner.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/JetCodeBlockSelectioner.java
rename to idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetCodeBlockSelectioner.java
index 4165c9a182b..e961a52e7f5 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetCodeBlockSelectioner.java
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetCodeBlockSelectioner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.jet.plugin;
+package org.jetbrains.jet.plugin.editor.wordSelection;
 
 import com.intellij.codeInsight.editorActions.wordSelection.BasicSelectioner;
 import com.intellij.lang.ASTNode;
diff --git a/idea/src/org/jetbrains/jet/plugin/JetStatementGroupSelectioner.java b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetStatementGroupSelectioner.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/JetStatementGroupSelectioner.java
rename to idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetStatementGroupSelectioner.java
index 4d10cf5538e..f98999f0410 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetStatementGroupSelectioner.java
+++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/JetStatementGroupSelectioner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin;
+package org.jetbrains.jet.plugin.editor.wordSelection;
 
 import com.intellij.codeInsight.editorActions.wordSelection.BasicSelectioner;
 import com.intellij.openapi.editor.Editor;