diff --git a/06company-yasnippet.el b/05company-yasnippet.el
similarity index 96%
rename from 06company-yasnippet.el
rename to 05company-yasnippet.el
index 2c11200..c824a22 100644
--- a/06company-yasnippet.el
+++ b/05company-yasnippet.el
@@ -1,4 +1,4 @@
-;;; 06company-yasnippet -- summary
+;;; 05company-yasnippet -- summary
 ;;; Commentary:
 ;;; Company completion framework configuration
 ;;; Code:
@@ -71,5 +71,5 @@
 (define-key text-mode-map (kbd "<f13>") 'insert-space-and-complete)
 (define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common)
 
-(provide '06company-yasnippet)
-;;; 06company-yasnippet.el ends here
+(provide '05company-yasnippet)
+;;; 05company-yasnippet.el ends here
diff --git a/08ctags.el b/05ctags.el
similarity index 96%
rename from 08ctags.el
rename to 05ctags.el
index 3904920..d59be20 100644
--- a/08ctags.el
+++ b/05ctags.el
@@ -1,4 +1,4 @@
-;;; 08ctags -- summary
+;;; 05ctags -- summary
 ;;; Commentary:
 ;;; Old and rudimental completion framework.
 ;;; Code:
@@ -54,5 +54,5 @@
   (add-to-list (make-local-variable 'ctags/major-modes-to-update-on-save) mode))
 
 (add-hook 'after-save-hook 'ctags/update-tags-on-save)
-(provide '08ctags)
-;;; 08ctags.el ends here
+(provide '05ctags)
+;;; 05ctags.el ends here
diff --git a/10deft.el b/05deft.el
similarity index 82%
rename from 10deft.el
rename to 05deft.el
index 0316e02..36ba2af 100644
--- a/10deft.el
+++ b/05deft.el
@@ -1,4 +1,4 @@
-;;; 10deft.el -- summary
+;;; 05deft.el -- summary
 ;;; Commentary:
 ;;; Notational velocity, backed by OneDrive.
 ;;; Code:
@@ -13,5 +13,5 @@
 
 (global-set-key (kbd "C-c d d") 'deft)
 
-(provide '10deft)
-;;; 10deft.el ends here
+(provide '05deft)
+;;; 05deft.el ends here
diff --git a/06flycheck.el b/05flycheck.el
similarity index 73%
rename from 06flycheck.el
rename to 05flycheck.el
index 103e933..322e11a 100644
--- a/06flycheck.el
+++ b/05flycheck.el
@@ -1,4 +1,4 @@
-;;; 06flycheck -- summary
+;;; 05flycheck -- summary
 ;;; Commentary:
 ;;; Code:
 
@@ -9,5 +9,5 @@
   :defer t
   :config (global-flycheck-mode t))
 
-(provide '06flycheck)
-;;; 06flycheck.el ends here
+(provide '05flycheck)
+;;; 05flycheck.el ends here
diff --git a/03hydra.el b/05hydra.el
similarity index 97%
rename from 03hydra.el
rename to 05hydra.el
index 0b22fd0..fa3895c 100644
--- a/03hydra.el
+++ b/05hydra.el
@@ -1,4 +1,4 @@
-;;; 03hydra -- summary
+;;; 05hydra -- summary
 ;;; Commentary:
 ;;; Global hydra definitions.
 ;;; Code:
@@ -103,5 +103,5 @@ _r_: reload buffer
         ("C-c w" . hydra-window-menu/body)
         ("C-c l" . hydra-language-context-menu/body))
 
-(provide '03hydra)
-;;; 03hydra.el ends here
+(provide '05hydra)
+;;; 05hydra.el ends here
diff --git a/09ispell.el b/05ispell.el
similarity index 81%
rename from 09ispell.el
rename to 05ispell.el
index 50dd9c9..ffd78cf 100644
--- a/09ispell.el
+++ b/05ispell.el
@@ -1,4 +1,4 @@
-;;; 09ispell -- summary
+;;; 05ispell -- summary
 ;;; Commentary:
 ;;; Highlight misspelled words
 ;;; Code:
@@ -10,5 +10,5 @@
                 '("--run-together" "--run-together-limit=5" "--run-together-min=2"))
           :hook ((prog-mode text-mode) . flyspell-mode))
 
-(provide '09ispell)
-;;; 09ispell.el ends here
+(provide '05ispell)
+;;; 05ispell.el ends here
diff --git a/02ivy.el b/05ivy.el
similarity index 93%
rename from 02ivy.el
rename to 05ivy.el
index 1f5c71c..69b2d56 100644
--- a/02ivy.el
+++ b/05ivy.el
@@ -1,4 +1,4 @@
-;;; 02ivy -- summary
+;;; 05ivy -- summary
 ;;; Commentary:
 ;;; Counsel, Swiper and Ivy.
 ;;; Code:
@@ -25,5 +25,5 @@
 (global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
 (global-set-key (kbd "<f2> u") 'counsel-unicode-char)
 
-(provide '02ivy)
-;;; 02ivy.el ends here
+(provide '05ivy)
+;;; 05ivy.el ends here
diff --git a/11lsp.el b/05lsp.el
similarity index 90%
rename from 11lsp.el
rename to 05lsp.el
index 40e8dc8..f088c06 100644
--- a/11lsp.el
+++ b/05lsp.el
@@ -1,4 +1,4 @@
-;;; 11lsp -- summary
+;;; 05lsp -- summary
 ;;; Commentary:
 ;;; Global Language Server Protocol Config
 ;;; Code:
@@ -24,5 +24,5 @@
       lsp-ui-doc-include-signature t
       lsp-log-io nil)
 
-(provide '11lsp)
-;;; 11lsp.el ends here
+(provide '05lsp)
+;;; 05lsp.el ends here
diff --git a/02macros.el b/05macros.el
similarity index 69%
rename from 02macros.el
rename to 05macros.el
index d5cd478..0eb64ab 100644
--- a/02macros.el
+++ b/05macros.el
@@ -1,6 +1,13 @@
+;;; 05macros -- summary
+;;; Commentary:
+;;; Code:
+
 (defmacro -> (&rest body)
   "Clojure ->  macro for BODY."
   (let ((result (pop body)))
     (dolist (form body result)
       (setq result (append (list (car form) result)
                            (cdr form))))))
+
+(provide '05macros)
+;;; 05macros ends here
diff --git a/04magit.el b/05magit.el
similarity index 79%
rename from 04magit.el
rename to 05magit.el
index bfdac07..bd5684e 100644
--- a/04magit.el
+++ b/05magit.el
@@ -1,4 +1,4 @@
-;;; 04magit -- summary
+;;; 05magit -- summary
 ;;; Commentary:
 ;;; Code:
 
@@ -11,5 +11,5 @@
         (:map magit-blame-mode-map
               ("<f5> b" . 'magit-blame-quit)))
 
-(provide '04magit)
-;;; 04magit.el ends here
+(provide '05magit)
+;;; 05magit.el ends here
diff --git a/07projectile.el b/05projectile.el
similarity index 94%
rename from 07projectile.el
rename to 05projectile.el
index 3b207c7..46b8bbc 100644
--- a/07projectile.el
+++ b/05projectile.el
@@ -20,5 +20,5 @@
 
 (projectile-mode t)
 
-(provide '07projectile)
-;;; 07projectile.el ends here
+(provide '05projectile)
+;;; 05projectile.el ends here
diff --git a/init.el b/init.el
index f345866..f3c5ded 100644
--- a/init.el
+++ b/init.el
@@ -50,18 +50,18 @@
 
 ;; Additional files
 (load "$HOME/.emacs.d/01mac.el" 'f 't)
-(load "$HOME/.emacs.d/02macros.el" 'f 't)
-(load "$HOME/.emacs.d/02ivy.el" 'f 't)
-(load "$HOME/.emacs.d/03hydra.el" 'f 't)
-(load "$HOME/.emacs.d/04magit.el" 'f 't)
+(load "$HOME/.emacs.d/05macros.el" 'f 't)
+(load "$HOME/.emacs.d/05ivy.el" 'f 't)
+(load "$HOME/.emacs.d/05hydra.el" 'f 't)
+(load "$HOME/.emacs.d/05magit.el" 'f 't)
 (load "$HOME/.emacs.d/05prog-mode.el" 'f 't)
-(load "$HOME/.emacs.d/06company-yasnippet.el" 'f 't)
-(load "$HOME/.emacs.d/06flycheck.el" 'f 't)
-(load "$HOME/.emacs.d/07projectile.el" 'f 't)
-(load "$HOME/.emacs.d/08ctags.el" 'f 't)
-(load "$HOME/.emacs.d/09ispell.el" 'f 't)
-(load "$HOME/.emacs.d/10deft.el" 'f 't)
-(load "$HOME/.emacs.d/11lsp.el" 'f 't)
+(load "$HOME/.emacs.d/05company-yasnippet.el" 'f 't)
+(load "$HOME/.emacs.d/05flycheck.el" 'f 't)
+(load "$HOME/.emacs.d/05projectile.el" 'f 't)
+(load "$HOME/.emacs.d/05ctags.el" 'f 't)
+(load "$HOME/.emacs.d/05ispell.el" 'f 't)
+(load "$HOME/.emacs.d/05deft.el" 'f 't)
+(load "$HOME/.emacs.d/05lsp.el" 'f 't)
 
 ;; Themes
 (load "$HOME/.emacs.d/themes/themes.el" 'f 't)
@@ -90,11 +90,7 @@
     ("1f38fb71e55e5ec5f14a39d03ca7d7a416123d3f0847745c7bade053ca58f043" "fec45178b55ad0258c5f68f61c9c8fd1a47d73b08fb7a51c15558d42c376083d" "60e09d2e58343186a59d9ed52a9b13d822a174b33f20bdc1d4abb86e6b17f45b" "85e6bb2425cbfeed2f2b367246ad11a62fb0f6d525c157038a0d0eaaabc1bfee" "3380a2766cf0590d50d6366c5a91e976bdc3c413df963a0ab9952314b4577299" "cea3ec09c821b7eaf235882e6555c3ffa2fd23de92459751e18f26ad035d2142" "8ffdc8c66ceeaf7921f4510a70d808f01b303e6b4d177c947b442e80d4228678" "b0c5c6cc59d530d3f6fbcfa67801993669ce062dda1435014f74cafac7d86246" "ad16a1bf1fd86bfbedae4b32c269b19f8d20d416bd52a87cd50e355bf13c2f23" "d9dab332207600e49400d798ed05f38372ec32132b3f7d2ba697e59088021555" "bc4c89a7b91cfbd3e28b2a8e9e6750079a985237b960384f158515d32c7f0490" "99c86852decaeb0c6f51ce8bd46e4906a4f28ab4c5b201bdc3fdf85b24f88518" "a85e40c7d2df4a5e993742929dfd903899b66a667547f740872797198778d7b5" default)))
  '(package-selected-packages
    (quote
-    (lsp-ui lsp tuareg merlin reason-mode deft buffer-move clj-refactor planet-theme cider clojure-mode erlang rspec-mode dap-mode lsp-mode nginx-mode gitignore-mode js2-mode keyfreq visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck hydra solarized-theme company-ansible column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end dash-at-point base16-theme exec-path-from-shell)))
- '(safe-local-variable-values
-   (quote
-    ((haskell-process-use-ghci . t)
-     (haskell-indent-spaces . 4)))))
+    (lsp-ui lsp tuareg merlin reason-mode deft buffer-move clj-refactor planet-theme cider clojure-mode erlang rspec-mode dap-mode lsp-mode nginx-mode gitignore-mode js2-mode keyfreq visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck hydra solarized-theme company-ansible column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end dash-at-point base16-theme exec-path-from-shell))))
 
 ;; Improve font settings in Markdown code
 (custom-set-faces