diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 185b8c61b1c..4237ad49b71 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -170,8 +170,8 @@
     <lang.unwrapDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.unwrap.KotlinUnwrapDescriptor"/>
     <quoteHandler fileType="Kotlin" className="org.jetbrains.jet.plugin.editor.KotlinQuoteHandler"/>
     <refactoring.helper implementation="org.jetbrains.jet.plugin.codeInsight.KotlinShortenReferencesRefactoringHelper"/>
-    <refactoring.moveHandler implementation="org.jetbrains.jet.plugin.refactoring.move.KotlinMoveFilesOrDirectoriesHandler"/>
-    <moveFileHandler implementation="org.jetbrains.jet.plugin.refactoring.move.MoveKotlinFileHandler" />
+    <refactoring.moveHandler implementation="org.jetbrains.jet.plugin.refactoring.move.moveFilesOrDirectories.KotlinMoveFilesOrDirectoriesHandler"/>
+    <moveFileHandler implementation="org.jetbrains.jet.plugin.refactoring.move.moveFilesOrDirectories.MoveKotlinFileHandler" />
     <refactoring.copyHandler implementation="org.jetbrains.jet.plugin.refactoring.copy.JetCopyClassHandler"/>
     <refactoring.changeSignatureUsageProcessor implementation="org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureUsageProcessor"/>
     <inlineActionHandler implementation="org.jetbrains.jet.plugin.refactoring.inline.KotlinInlineValHandler"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java
index 5482f45085e..07eb2df077b 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.copy.CopyFilesOrDirectoriesHandler;
 import com.intellij.refactoring.copy.CopyHandlerDelegateBase;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
-import org.jetbrains.jet.plugin.refactoring.move.KotlinMoveFilesOrDirectoriesHandler;
+import org.jetbrains.jet.plugin.refactoring.move.moveFilesOrDirectories.KotlinMoveFilesOrDirectoriesHandler;
 
 import java.util.ArrayList;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/KotlinMoveFilesOrDirectoriesHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.java
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/refactoring/move/KotlinMoveFilesOrDirectoriesHandler.java
rename to idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.java
index adb2b8a212d..072eda57161 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/KotlinMoveFilesOrDirectoriesHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.refactoring.move;
+package org.jetbrains.jet.plugin.refactoring.move.moveFilesOrDirectories;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/MoveKotlinFileHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
similarity index 97%
rename from idea/src/org/jetbrains/jet/plugin/refactoring/move/MoveKotlinFileHandler.kt
rename to idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
index 6ea5ded05d6..063f3f5bf0c 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/MoveKotlinFileHandler.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.refactoring.move
+package org.jetbrains.jet.plugin.refactoring.move.moveFilesOrDirectories
 
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler
 import com.intellij.psi.PsiFile
@@ -28,15 +28,10 @@ import java.util.ArrayList
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.searches.ReferencesSearch
 import com.intellij.refactoring.util.MoveRenameUsageInfo
-import org.jetbrains.jet.lang.psi.JetClassOrObject
-import com.intellij.refactoring.util.TextOccurrencesUtil
-import org.jetbrains.jet.plugin.search.usagesSearch.descriptor
-import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import org.jetbrains.jet.lang.psi.JetNamedDeclaration
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiReference
 import org.jetbrains.jet.lang.resolve.name.FqName
-import java.util.Collections
 import org.jetbrains.jet.plugin.references.JetSimpleNameReference
 import com.intellij.openapi.util.Key
 import org.jetbrains.jet.plugin.refactoring.getAndRemoveCopyableUserData
@@ -47,6 +42,13 @@ import org.jetbrains.jet.lang.psi.JetDeclaration
 import org.jetbrains.jet.lang.psi.JetPsiUtil
 import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.diagnostic.Logger
+import org.jetbrains.jet.lang.psi.JetClassOrObject
+import org.jetbrains.jet.plugin.search.usagesSearch.descriptor
+import org.jetbrains.jet.lang.resolve.DescriptorUtils
+import com.intellij.refactoring.util.TextOccurrencesUtil
+import java.util.Collections
+import org.jetbrains.jet.plugin.refactoring.move.PackageNameInfo
+import org.jetbrains.jet.plugin.refactoring.move.updateInternalReferencesOnPackageNameChange
 
 public class MoveKotlinFileHandler : MoveFileHandler() {
     class object {