diff --git a/lang/erlang.el b/lang/erlang.el
index f377808..96b1e8e 100644
--- a/lang/erlang.el
+++ b/lang/erlang.el
@@ -4,7 +4,7 @@
 
 (require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el")
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el")
+(require 'icejam-lsp)
 
 (use-package erlang
   :defer t
diff --git a/lang/javascript.el b/lang/javascript.el
index d86b0ec..c820cd8 100644
--- a/lang/javascript.el
+++ b/lang/javascript.el
@@ -4,7 +4,7 @@
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
 (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
-(require '+custom-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el")
+(require 'icejam-lsp)
 
 (use-package js2-mode
   :requires (web-mode company-web lsp-mode lsp-ui)
diff --git a/lang/web.el b/lang/web.el
index e63fc44..27dee81 100644
--- a/lang/web.el
+++ b/lang/web.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el")
+(require 'icejam-lsp)
 (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
 
 (use-package web-mode
diff --git a/pkg/dashboard.el b/lisp/icejam-dashboard.el
similarity index 91%
rename from pkg/dashboard.el
rename to lisp/icejam-dashboard.el
index 6e534f1..2cec7f0 100644
--- a/pkg/dashboard.el
+++ b/lisp/icejam-dashboard.el
@@ -27,5 +27,5 @@
                           ;; (registers . 5)
                           (projects . 5))))
 
-(provide '+custom-pkg-dashboard)
-;;; dashboard.el ends here
+(provide 'icejam-dashboard)
+;;; icejam-dashboard.el ends here
diff --git a/pkg/deft.el b/lisp/icejam-deft.el
similarity index 94%
rename from pkg/deft.el
rename to lisp/icejam-deft.el
index 9a78055..64ff7f2 100644
--- a/pkg/deft.el
+++ b/lisp/icejam-deft.el
@@ -25,12 +25,12 @@
            deft-auto-save-interval 30.0))
 
 (transient-define-prefix +custom-pkg-deft/menu ()
- "Start Deft"
+ "Start Deft."
  [""
  ("d" "Deft" deft)
  ("q" "quit" keyboard-quit)])
 
 (define-key +custom-keys-mode-map (kbd "C-c d") '+custom-pkg-deft/menu)
 
-(provide '+custom-pkg-deft)
-;;; deft.el ends here
+(provide 'icejam-deft)
+;;; icejam-deft.el ends here
diff --git a/lisp/icejam-init.el b/lisp/icejam-init.el
index 25f3127..69115ac 100644
--- a/lisp/icejam-init.el
+++ b/lisp/icejam-init.el
@@ -45,10 +45,10 @@
 (require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el")
 (require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el")
 (require '+custom-pkg-ispell "$HOME/.emacs.d/pkg/ispell.el")
-(require '+custom-pkg-deft "$HOME/.emacs.d/pkg/deft.el")
-(require '+custom-pkg-lsp "$HOME/.emacs.d/pkg/lsp.el")
-(require '+custom-pkg-dashboard "$HOME/.emacs.d/pkg/dashboard.el")
-(require '+custom-pkg-undo-tree "$HOME/.emacs.d/pkg/undo-tree.el")
+(require 'icejam-deft)
+(require 'icejam-lsp)
+(require 'icejam-dashboard)
+(require 'icejam-vundo)
 (require 'icejam-avy)
 (require 'icejam-speed-type)
 
diff --git a/pkg/lsp.el b/lisp/icejam-lsp.el
similarity index 96%
rename from pkg/lsp.el
rename to lisp/icejam-lsp.el
index ea3bc6d..4a05034 100644
--- a/pkg/lsp.el
+++ b/lisp/icejam-lsp.el
@@ -1,4 +1,4 @@
-;;; pkg/lsp -- summary -*- lexical-binding: t; -*-
+;;; icejam-lsp -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Global Language Server Protocol Config
 ;;; Code:
@@ -80,5 +80,5 @@
   :defer t
   :requires (lsp-mode lsp-ui))
 
-(provide '+custom-pkg-lsp)
-;;; lsp.el ends here
+(provide 'icejam-lsp)
+;;; icejam-lsp.el ends here
diff --git a/pkg/undo-tree.el b/lisp/icejam-vundo.el
similarity index 68%
rename from pkg/undo-tree.el
rename to lisp/icejam-vundo.el
index 0b24ced..f4a0d6b 100644
--- a/pkg/undo-tree.el
+++ b/lisp/icejam-vundo.el
@@ -1,4 +1,4 @@
-;;; undo-tree.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-vundo.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -15,5 +15,5 @@
   :straight t
   :defer t)
 
-(provide '+custom-pkg-undo-tree)
-;;; undo-tree.el ends here
+(provide 'icejam-vundo)
+;;; icejam-vundo.el ends here