diff --git a/core/core-company.el b/core/core-completion.el
similarity index 93%
rename from core/core-company.el
rename to core/core-completion.el
index d32c8a3cd..17b4492b1 100644
--- a/core/core-company.el
+++ b/core/core-completion.el
@@ -1,4 +1,4 @@
-;;; core-company.el --- auto completion backend (Company-mode)
+;;; core-completion.el --- auto completion backend (Company-mode)
 ;; see lib/company-macros.el
 
 (use-package company
@@ -45,5 +45,5 @@
   (global-company-mode +1)
   (company-statistics-mode +1))
 
-(provide 'core-company)
-;;; core-company.el ends here
+(provide 'core-completion)
+;;; core-completion.el ends here
diff --git a/core/core-auto-insert.el b/core/core-file-templates.el
similarity index 97%
rename from core/core-auto-insert.el
rename to core/core-file-templates.el
index 3dd9fd3ef..6cd74c6a1 100644
--- a/core/core-auto-insert.el
+++ b/core/core-file-templates.el
@@ -1,4 +1,4 @@
-;;; core-auto-insert.el --- file templates
+;;; core-file-templates.el --- file templates
 
 (use-package autoinsert
   :defer t
@@ -95,5 +95,5 @@
           ("\\.z?sh$"                        "__"               sh-mode)
           )))
 
-(provide 'core-auto-insert)
-;;; core-auto-insert.el ends here
+(provide 'core-file-templates)
+;;; core-file-templates.el ends here
diff --git a/core/core-workgroups.el b/core/core-sessions.el
similarity index 97%
rename from core/core-workgroups.el
rename to core/core-sessions.el
index c12d718af..f4ca18fd5 100644
--- a/core/core-workgroups.el
+++ b/core/core-sessions.el
@@ -1,4 +1,4 @@
-;;; core-workgroups.el
+;;; core-sessions.el
 ;; see lib/workgroup-defuns.el
 
 ;; I use workgroups to accomplish two things:
@@ -87,5 +87,5 @@ lib/defuns-workgroups.el.")
   (defalias 'narf:switch-to-tab-right 'wg-switch-to-workgroup-right)
   (defalias 'narf:switch-to-tab-last 'wg-switch-to-previous-workgroup))
 
-(provide 'core-workgroups)
-;;; core-workgroups.el ends here
+(provide 'core-sessions)
+;;; core-sessions.el ends here
diff --git a/modules/lib-demo.el b/modules/lib-demo.el
deleted file mode 100644
index 9af794acc..000000000
--- a/modules/lib-demo.el
+++ /dev/null
@@ -1,14 +0,0 @@
-;;; lib-demo.el
-
-;; This library offers:
-;;   + impatient-mode: for broadcasting my emacs session
-;;   + TODO integration with reveal.js for presentations
-;;   + TODO "big-mode", for making emacs presentable for screencasts/share
-;;   + TODO quick note/time keeping for live/youtube recordings
-
-(use-package impatient-mode
-  :defer t
-  :commands httpd-start)
-
-(provide 'lib-demo)
-;;; lib-demo.el ends here
diff --git a/modules/lib-plugin.el b/modules/lib-plugin.el
deleted file mode 100644
index 42996cbed..000000000
--- a/modules/lib-plugin.el
+++ /dev/null
@@ -1,35 +0,0 @@
-;;; lib-plugin.el
-
-(defun narf-lb6-reload ()
-  (interactive)
-  (let ((dir (f-traverse-upwards (lambda (f) (string-suffix-p ".lbaction" f)))))
-    (shell-command (format "open %s" dir))))
-
-(define-minor-mode lb6-mode
-  "Launchbar development mode."
-  :init-value nil
-  :lighter    " lb6"
-  :keymap (let ((map (make-sparse-keymap)))
-            (map! :map map
-                  (:localleader
-                    :n "b" 'narf-lb6-reload))
-            map)
-  (add-yas-minor-mode! 'lb6-mode))
-(associate! lb6-mode :match "\\.lb\\(action\\|ext\\)/.+$")
-
-;;
-
-(define-minor-mode hammerspoon-mode
-  :init-value nil
-  :lighter " hammer"
-  :keymap (let ((map ))
-            (map! :map map
-                  (:localleader
-                    :n "b" (λ! (shell-command (format "open hammerspoon://reload")))))
-            map)
-  (add-yas-minor-mode! 'hammerspoon-mode))
-(associate! hammerspoon-mode :match "/\\.?hammerspoon/.+\\.lua$")
-
-(provide 'lib-plugin)
-;;; lib-plugin.el ends here
-
diff --git a/modules/lib-tmux.el b/modules/lib-tmux.el
deleted file mode 100644
index 9ab9f7398..000000000
--- a/modules/lib-tmux.el
+++ /dev/null
@@ -1,70 +0,0 @@
-;;; lib-tmux.el
-
-;; This library offers:
-;;   + TODO An integration/abstraction layer to make it seem like tmux and emacs are one
-;;     program.
-;;   + TODO A way to manage tmux sessions and layouts from emacs; possibly trigger them
-;;     depending on current project.
-
-;;;###autoload
-(defun tmux (command &optional modes)
-  (let ((format
-         (concat "tmux send-keys "
-                 (if (or (eq modes t)
-                         (eq modes 'clear)
-                         (memq 'clear modes))
-                     "C-u " "")
-                 "%s"
-                 (if (or (eq modes t)
-                         (eq modes 'run)
-                         (memq 'run modes))
-                     " Enter" ""))))
-    (shell-command (format format (shell-quote-argument command)))))
-
-(evil-define-interactive-code "<term>"
-  "Ex tmux argument (a mix between <sh> <f> and <fsh>)"
-  :ex-arg shell
-  (list (when (evil-ex-p) (evil-ex-file-arg))))
-
-;;;###autoload (autoload 'narf:tmux-cd "lib-tmux" nil t)
-(evil-define-command narf:tmux-cd (&optional bang)
-  (interactive "<!>")
-  (if bang
-      (narf/tmux-cd-to-project)
-    (narf/tmux-cd-to-here)))
-
-;;;###autoload (autoload 'narf:tmux "lib-tmux" nil t)
-(evil-define-operator narf:tmux (&optional command bang)
-  "Sends input to tmux. Use `bang' to append to tmux"
-  :type inclusive
-  :repeat t
-  (interactive "<term><!>")
-  (if (not command)
-      (os-switch-to-term)
-    (tmux command bang)
-    (when (evil-ex-p)
-      (message "[Tmux] %s" command))))
-
-;;;###autoload
-(defun narf/tmux-new-window ()
-  (interactive)
-  (tmux "tmux new-window" t))
-
-;;;###autoload
-(defun narf/tmux-cd-to-here (&optional dir)
-  (interactive)
-  (tmux (format "cd '%s'" (or dir default-directory))))
-
-;;;###autoload
-(defun narf/tmux-cd-to-project ()
-  (interactive)
-  (narf/tmux-cd-to-here (narf/project-root)))
-
-;;;;;;;;;;
-
-;; TODO
-;; (defun narf/window (direction)
-;;   )
-
-(provide 'lib-tmux)
-;;; lib-tmux.el ends here