diff --git a/host/QUE-WKS-AA427-Linux/init-emacs-eclim.el b/host/QUE-WKS-AA427-Linux/init-emacs-eclim.el
deleted file mode 100644
index 9b85ded5e..000000000
--- a/host/QUE-WKS-AA427-Linux/init-emacs-eclim.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(setq eclim-executable "/home/sbenner/Apps/eclipse/eclim"
-      eclimd-executable "/home/sbenner/Apps/eclipse/eclimd"
-      eclimd-default-workspace "/home/sbenner/dev/eclipse-workspaces/eclimd")
diff --git a/host/Qiao-MacBook/editing.el b/host/Qiao-MacBook/override-config-editing.el
similarity index 100%
rename from host/Qiao-MacBook/editing.el
rename to host/Qiao-MacBook/override-config-editing.el
diff --git a/init-package/init-buffer-move.el b/init-package/init-buffer-move.el
new file mode 100644
index 000000000..176b07fb3
--- /dev/null
+++ b/init-package/init-buffer-move.el
@@ -0,0 +1,2 @@
+(require 'buffer-move)
+
diff --git a/my-keybindings.el b/my-keybindings.el
index 03fe48415..e1142a904 100644
--- a/my-keybindings.el
+++ b/my-keybindings.el
@@ -43,6 +43,10 @@
 (evil-leader/set-key "bd" 'delete-current-buffer-file)
 (evil-leader/set-key "bk" 'ido-kill-buffer)
 (evil-leader/set-key "bK" 'kill-other-buffers)
+(evil-leader/set-key "bmh" 'buf-move-left)
+(evil-leader/set-key "bmj" 'buf-move-down)
+(evil-leader/set-key "bmk" 'buf-move-up)
+(evil-leader/set-key "bml" 'buf-move-right)
 (evil-leader/set-key "bn" 'switch-to-next-buffer)
 (evil-leader/set-key "bp" 'switch-to-prev-buffer)
 (evil-leader/set-key "br" 'rename-current-buffer-file)
diff --git a/packages.el b/packages.el
index c82db6aba..beade1f80 100644
--- a/packages.el
+++ b/packages.el
@@ -12,6 +12,7 @@
     auto-complete
     auto-dictionary
     autopair
+    buffer-move
     color-moccur
     deft
     deferred