diff --git a/pkg/base.el b/lisp/icejam-base.el
similarity index 98%
rename from pkg/base.el
rename to lisp/icejam-base.el
index f99aada..ce95e62 100644
--- a/pkg/base.el
+++ b/lisp/icejam-base.el
@@ -146,5 +146,5 @@
 (setq-default bidi-paragraph-direction 'left-to-right
               bidi-inhibit-bpa t)
 
-(provide '+custom-pkg-base)
-;;; base.el ends here
+(provide 'icejam-base)
+;;; icejam-base.el ends here
diff --git a/lisp/icejam-init.el b/lisp/icejam-init.el
index 6d808e3..f17d96f 100644
--- a/lisp/icejam-init.el
+++ b/lisp/icejam-init.el
@@ -34,12 +34,11 @@
 
 ;; General configuration files.
 (require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
-(require '+custom-pkg-base "$HOME/.emacs.d/pkg/base.el")
-(require '+custom-pkg-sys-specific "$HOME/.emacs.d/pkg/sys-specific.el")
-(require '+custom-pkg-ivy "$HOME/.emacs.d/pkg/ivy.el")
+(require 'icejam-base)
+(require 'icejam-sys-specific)
+(require 'icejam-ivy)
 (require 'icejam-avy)
 (require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
-(require '+custom-pkg-magit "$HOME/.emacs.d/pkg/magit.el")
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
 (require 'icejam-company-yasnippet)
 (require 'icejam-flycheck)
@@ -48,6 +47,7 @@
 (require 'icejam-deft)
 (require 'icejam-lsp)
 (require 'icejam-dashboard)
+(require 'icejam-magit)
 (require 'icejam-vundo)
 (require 'icejam-speed-type)
 
diff --git a/pkg/ivy.el b/lisp/icejam-ivy.el
similarity index 96%
rename from pkg/ivy.el
rename to lisp/icejam-ivy.el
index cd03ddb..6d47911 100644
--- a/pkg/ivy.el
+++ b/lisp/icejam-ivy.el
@@ -37,5 +37,5 @@
 (define-key +custom-keys-mode-map (kbd "<f2> i") 'counsel-info-lookup-symbol)
 (define-key +custom-keys-mode-map (kbd "<f2> u") 'counsel-unicode-char)
 
-(provide '+custom-pkg-ivy)
-;;; ivy.el ends here
+(provide 'icejam-ivy)
+;;; icejam-ivy.el ends here
diff --git a/pkg/magit.el b/lisp/icejam-magit.el
similarity index 70%
rename from pkg/magit.el
rename to lisp/icejam-magit.el
index 78f5f67..47abd91 100644
--- a/pkg/magit.el
+++ b/lisp/icejam-magit.el
@@ -1,4 +1,4 @@
-;;; pkg/magit -- summary -*- lexical-binding: t; -*-
+;;; icejam-magit.el -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
 
@@ -11,5 +11,5 @@
         (:map magit-blame-mode-map
               ("<f5> b" . 'magit-blame-quit)))
 
-(provide '+custom-pkg-magit)
-;;; magit.el ends here
+(provide 'icejam-magit)
+;;; icejam-magit.el ends here
diff --git a/pkg/sys-specific.el b/lisp/icejam-sys-specific.el
similarity index 98%
rename from pkg/sys-specific.el
rename to lisp/icejam-sys-specific.el
index a378e5d..b0cfb1b 100644
--- a/pkg/sys-specific.el
+++ b/lisp/icejam-sys-specific.el
@@ -99,5 +99,5 @@
       (define-key +custom-keys-mode-map (kbd "A-z") 'undo)
       (define-key +custom-keys-mode-map (kbd "A-q") 'kill-emacs))))
 
-(provide '+custom-pkg-sys-specific)
-;;; sys-specific.el ends here
+(provide 'icejam-sys-specific)
+;;; icejam-sys-specific.el ends here