diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index 99e43ed23b..78ed218c13 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -17,8 +17,8 @@ if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) {
 }
 
 if ($dir != '' || $file != 'Shared') {
-	$targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
-	$sourceFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file);
+	$targetFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file);
+	$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
 	if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
 		OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
 	} else {
diff --git a/apps/files/js/upload.js b/apps/files/js/upload.js
new file mode 100644
index 0000000000..9d9f61f600
--- /dev/null
+++ b/apps/files/js/upload.js
@@ -0,0 +1,8 @@
+function Upload(fileSelector) {
+	if ($.support.xhrFileUpload) {
+		return new XHRUpload(fileSelector.target.files);
+	} else {
+		return new FormUpload(fileSelector);
+	}
+}
+Upload.target = OC.filePath('files', 'ajax', 'upload.php');