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-custom-init.el b/lisp/icejam-custom-init.el
new file mode 100644
index 0000000..7c4bc6d
--- /dev/null
+++ b/lisp/icejam-custom-init.el
@@ -0,0 +1,97 @@
+;;; icejam-custom-init.el --- summary
+
+;; Author: Maciej Szlosarczyk
+;; Maintainer: Maciej Szlosarczyk
+;; Version: 0.1-snapshot
+
+;;; Commentary:
+
+;; custom-init does a thing.
+
+;;; Code:
+
+;; Set GC at 500 MB for startup
+(setq gc-cons-threshold 500000000)
+(setq gc-cons-percentage 0.6)
+
+;;; Use straight.el for package management
+(defvar bootstrap-version)
+(let ((bootstrap-file
+       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
+      (bootstrap-version 5))
+  (unless (file-exists-p bootstrap-file)
+    (with-current-buffer
+        (url-retrieve-synchronously
+         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
+         'silent 'inhibit-cookies)
+      (goto-char (point-max))
+      (eval-print-last-sexp)))
+  (load bootstrap-file nil 'nomessage))
+
+(straight-use-package 'use-package)
+
+;; I don't know why this needs to be here and with a lisp directory, but
+;; normal subdirs.el file doesn't work.
+(add-to-list 'load-path (concat user-emacs-directory "lisp/themes"))
+(add-to-list 'load-path (concat user-emacs-directory "lisp/langs"))
+
+;; General configuration files.
+(require 'icejam-keys-mode)
+(require 'icejam-base)
+(require 'icejam-sys-specific)
+(require 'icejam-ivy)
+(require 'icejam-avy)
+(require 'icejam-transient)
+(require 'icejam-prog-mode)
+(require 'icejam-company-yasnippet)
+(require 'icejam-flycheck)
+(require 'icejam-projectile)
+(require 'icejam-ispell)
+(require 'icejam-deft)
+(require 'icejam-lsp)
+(require 'icejam-dashboard)
+(require 'icejam-magit)
+(require 'icejam-vundo)
+(require 'icejam-speed-type)
+
+;; Themes
+(require 'icejam-themes)
+(require 'icejam-fonts)
+
+;; Actual supported languages and file syntax.
+(require 'icejam-lang-clang)
+(require 'icejam-lang-clojure)
+(require 'icejam-lang-common-lisp)
+(require 'icejam-lang-dart)
+(require 'icejam-lang-dhall)
+(require 'icejam-lang-elisp)
+(require 'icejam-lang-elixir)
+(require 'icejam-lang-erlang)
+(require 'icejam-lang-fsharp)
+(require 'icejam-lang-gleam)
+(require 'icejam-lang-golang)
+(require 'icejam-lang-haskell)
+(require 'icejam-lang-javascript)
+(require 'icejam-lang-kotlin)
+(require 'icejam-lang-lean)
+(require 'icejam-lang-markdown)
+(require 'icejam-lang-ocaml)
+(require 'icejam-lang-other)
+(require 'icejam-lang-php)
+(require 'icejam-lang-purescript)
+(require 'icejam-lang-python)
+(require 'icejam-lang-ruby)
+(require 'icejam-lang-rust)
+(require 'icejam-lang-sh)
+(require 'icejam-lang-web)
+(require 'icejam-lang-ziglang)
+
+;; Diminish modeline litter
+(require 'icejam-diminish)
+
+;; Restore GC to normal, but still high
+(setq gc-cons-threshold 100000000)
+(setq gc-cons-percentage 0.1)
+
+(provide 'icejam-custom-init)
+;;; icejam-custom-init.el ends here
diff --git a/lisp/icejam-deft.el b/lisp/icejam-deft.el
index 64ff7f2..583a2ca 100644
--- a/lisp/icejam-deft.el
+++ b/lisp/icejam-deft.el
@@ -1,10 +1,10 @@
-;;; pkg/deft.el -- summary -*- lexical-binding: t; -*-
+;;; icejam-deft.el -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Notational velocity, backed by OneDrive.
 ;;; Code:
 
-(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
-(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+(require 'icejam-keys-mode)
+(require 'icejam-transient)
 
 (use-package deft
   :straight t
diff --git a/pkg/diminish.el b/lisp/icejam-diminish.el
similarity index 86%
rename from pkg/diminish.el
rename to lisp/icejam-diminish.el
index 14ae3d5..b0855b4 100644
--- a/pkg/diminish.el
+++ b/lisp/icejam-diminish.el
@@ -1,4 +1,4 @@
-;;; diminish.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-diminish.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -23,5 +23,5 @@
 (eval-after-load "whitespace" '(diminish 'whitespace-mode))
 (eval-after-load "auto-revert-mode" '(diminish 'auto-revert-mode))
 
-(provide '+custom-pkg-diminish)
-;;; diminish.el ends here
+(provide 'icejam-diminish)
+;;; icejam-diminish.el ends here
diff --git a/pkg/fonts.el b/lisp/icejam-fonts.el
similarity index 97%
rename from pkg/fonts.el
rename to lisp/icejam-fonts.el
index d2235d1..8e365e5 100644
--- a/pkg/fonts.el
+++ b/lisp/icejam-fonts.el
@@ -1,4 +1,4 @@
-;;; fonts.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-fonts.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -118,5 +118,5 @@
                     :foreground (face-foreground 'default)
                     :background (face-background 'default))
 
-(provide '+custom-pkg-fonts)
-;;; fonts.el ends here
+(provide 'icejam-fonts)
+;;; icejam-fonts.el ends here
diff --git a/lisp/icejam-init.el b/lisp/icejam-init.el
deleted file mode 100644
index 6d808e3..0000000
--- a/lisp/icejam-init.el
+++ /dev/null
@@ -1,94 +0,0 @@
-;;; +custom-init.el --- summary
-
-;; Author: Maciej Szlosarczyk
-;; Maintainer: Maciej Szlosarczyk
-;; Version: 0.1-snapshot
-
-;;; Commentary:
-
-;; custom-init does a thing.
-
-;;; Code:
-
-;; Set GC at 500 MB for startup
-(setq gc-cons-threshold 500000000)
-(setq gc-cons-percentage 0.6)
-
-;;; Use straight.el for package management
-(defvar bootstrap-version)
-(let ((bootstrap-file
-       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-      (bootstrap-version 5))
-  (unless (file-exists-p bootstrap-file)
-    (with-current-buffer
-        (url-retrieve-synchronously
-         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
-         'silent 'inhibit-cookies)
-      (goto-char (point-max))
-      (eval-print-last-sexp)))
-  (load bootstrap-file nil 'nomessage))
-
-(straight-use-package 'use-package)
-
-;; (add-to-list 'load-path (concat user-emacs-directory "pkg"))
-
-;; 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-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)
-(require 'icejam-projectile)
-(require 'icejam-ispell)
-(require 'icejam-deft)
-(require 'icejam-lsp)
-(require 'icejam-dashboard)
-(require 'icejam-vundo)
-(require 'icejam-speed-type)
-
-;; Themes
-(require '+custom-pkg-themes "$HOME/.emacs.d/pkg/themes.el")
-(require '+custom-pkg-fonts "$HOME/.emacs.d/pkg/fonts.el")
-
-;; Actual supported languages and file syntax.
-(require '+custom-lang-clang "$HOME/.emacs.d/lang/clang.el")
-(require '+custom-lang-clojure "$HOME/.emacs.d/lang/clojure.el")
-(require '+custom-lang-common-lisp "$HOME/.emacs.d/lang/common-lisp.el")
-(require '+custom-lang-dart "$HOME/.emacs.d/lang/dart.el")
-(require '+custom-lang-dhall "$HOME/.emacs.d/lang/dhall.el")
-(require '+custom-lang-elisp "$HOME/.emacs.d/lang/elisp.el")
-(require '+custom-lang-elixir "$HOME/.emacs.d/lang/elixir.el")
-(require '+custom-lang-erlang "$HOME/.emacs.d/lang/erlang.el")
-(require '+custom-lang-fsharp "$HOME/.emacs.d/lang/fsharp.el")
-(require '+custom-lang-gleam "$HOME/.emacs.d/lang/gleam.el")
-(require '+custom-lang-golang "$HOME/.emacs.d/lang/golang.el")
-(require '+custom-lang-haskell "$HOME/.emacs.d/lang/haskell.el")
-(require '+custom-lang-javascript "$HOME/.emacs.d/lang/javascript.el")
-(require '+custom-lang-kotlin "$HOME/.emacs.d/lang/kotlin.el")
-(require '+custom-lang-lean "$HOME/.emacs.d/lang/lean.el")
-(require '+custom-lang-markdown "$HOME/.emacs.d/lang/markdown.el")
-(require '+custom-lang-ocaml "$HOME/.emacs.d/lang/ocaml.el")
-(require '+custom-lang-other "$HOME/.emacs.d/lang/other.el")
-(require '+custom-lang-php "$HOME/.emacs.d/lang/php.el")
-(require '+custom-lang-purescript "$HOME/.emacs.d/lang/purescript.el")
-(require '+custom-lang-python "$HOME/.emacs.d/lang/python.el")
-(require '+custom-lang-ruby "$HOME/.emacs.d/lang/ruby.el")
-(require '+custom-lang-rust "$HOME/.emacs.d/lang/rust.el")
-(require '+custom-lang-sh "$HOME/.emacs.d/lang/sh.el")
-(require '+custom-lang-web "$HOME/.emacs.d/lang/web.el")
-(require '+custom-lang-ziglang "$HOME/.emacs.d/lang/ziglang.el")
-
-;; Diminish modeline litter
-(require '+custom-pkg-diminish "$HOME/.emacs.d/pkg/diminish.el")
-
-;; Restore GC to normal, but still high
-(setq gc-cons-threshold 100000000)
-(setq gc-cons-percentage 0.1)
-
-(provide 'icejam-init)
-;;; icejam-init.el ends here
diff --git a/pkg/ivy.el b/lisp/icejam-ivy.el
similarity index 88%
rename from pkg/ivy.el
rename to lisp/icejam-ivy.el
index cd03ddb..0841116 100644
--- a/pkg/ivy.el
+++ b/lisp/icejam-ivy.el
@@ -1,10 +1,9 @@
-;;; pkg/ivy -- summary -*- lexical-binding: t; -*-
+;;; icejam-ivy -- Counsel, Swiper and Ivy. -*- lexical-binding: t; -*-
 ;;; Commentary:
-;;; Counsel, Swiper and Ivy.
+;;;
 ;;; Code:
 
-(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
-
+(require 'icejam-keys-mode)
 
 (use-package helpful :straight t :defer t)
 (use-package counsel :straight t :defer t :requires (helpful)
@@ -37,5 +36,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/keys-mode.el b/lisp/icejam-keys-mode.el
similarity index 93%
rename from pkg/keys-mode.el
rename to lisp/icejam-keys-mode.el
index e388d75..fac9a33 100644
--- a/pkg/keys-mode.el
+++ b/lisp/icejam-keys-mode.el
@@ -1,4 +1,4 @@
-;;; keys-mode.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-keys-mode.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -51,5 +51,5 @@
 (define-key +custom-keys-mode-map [home] 'beginning-of-line)
 (define-key +custom-keys-mode-map [end] 'end-of-line)
 
-(provide '+custom-pkg-keys-mode)
-;;; keys-mode.el ends here
+(provide 'icejam-keys-mode)
+;;; icejam-keys-mode.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/prog-mode.el b/lisp/icejam-prog-mode.el
similarity index 94%
rename from pkg/prog-mode.el
rename to lisp/icejam-prog-mode.el
index f8dd04a..2b2528d 100644
--- a/pkg/prog-mode.el
+++ b/lisp/icejam-prog-mode.el
@@ -1,4 +1,4 @@
-;;; pkg/prog-mode -- summary -*- lexical-binding: t; -*-
+;;; icejam-prog-mode.el -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
 
@@ -77,5 +77,5 @@
 ;; Vim-like regex replace with preview in buffer.
 (use-package visual-regexp :straight t :defer t)
 
-(provide '+custom-pkg-prog-mode)
-;;; prog-mode ends here
+(provide 'icejam-prog-mode)
+;;; icejam-prog-mode ends here
diff --git a/lisp/icejam-projectile.el b/lisp/icejam-projectile.el
index a60d176..56f1777 100644
--- a/lisp/icejam-projectile.el
+++ b/lisp/icejam-projectile.el
@@ -1,4 +1,4 @@
-;;; pkg/projectile -- summary -*- lexical-binding: t; -*-
+;;; icejam-projectile.el -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Project management based on git repos
 ;;; Code:
diff --git a/pkg/sys-specific.el b/lisp/icejam-sys-specific.el
similarity index 97%
rename from pkg/sys-specific.el
rename to lisp/icejam-sys-specific.el
index a378e5d..292cfd8 100644
--- a/pkg/sys-specific.el
+++ b/lisp/icejam-sys-specific.el
@@ -7,7 +7,7 @@
 (defconst IS-BSD (eq system-type 'berkeley-unix))
 (defconst IS-GNU (eq system-type 'gnu/linux))
 
-(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
+(require 'icejam-keys-mode)
 
 (defun +custom-function-delete-window ()
   "Kill a window."
@@ -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
diff --git a/pkg/themes.el b/lisp/icejam-themes.el
similarity index 81%
rename from pkg/themes.el
rename to lisp/icejam-themes.el
index 4943a4a..83171eb 100644
--- a/pkg/themes.el
+++ b/lisp/icejam-themes.el
@@ -1,4 +1,4 @@
-;;; Themes -- summary -*- lexical-binding: t; -*-
+;;; icejam-themes.el -- Theme configuration -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
 
@@ -43,15 +43,11 @@
 (load-theme 'sanityinc-tomorrow-night t t)
 
 ;; My own theme modifications:
-(require 'base16-zenburn-modified-theme
-         "$HOME/.emacs.d/themes/base16-zenburn-modified.el")
-
-(require 'base16-harmonic-light-modified-theme
-         "$HOME/.emacs.d/themes/base16-harmonic-light-modified.el")
+(require 'icejam-base16-zenburn)
+(require 'icejam-base16-harmonic-light)
 
 (spaceline-emacs-theme)
-
 (enable-theme 'base16-zenburn-modified)
 
-(provide '+custom-pkg-themes)
-;;; themes.el ends here
+(provide 'icejam-themes)
+;;; icejam-themes.el ends here
diff --git a/pkg/transient.el b/lisp/icejam-transient.el
similarity index 97%
rename from pkg/transient.el
rename to lisp/icejam-transient.el
index aa1696b..eacac9e 100644
--- a/pkg/transient.el
+++ b/lisp/icejam-transient.el
@@ -13,7 +13,7 @@
   (indent-region (point-min) (point-max)))
 
 (transient-define-prefix +custom-pkg-transient/project-menu ()
-  "Project Commands"
+  "Project Commands."
   [""
    ["Projectile"
     ("s" "Switch project"       counsel-projectile-switch-project)
@@ -89,7 +89,7 @@
    ("]" "Next" previous-buffer)])
 
 (transient-define-prefix +custom-pkg-transient/move-menu ()
-  "Move Commands"
+  "Move Commands."
   [""
    ["Move this buffer"
     ("{" "Up"    buf-move-left)
@@ -102,7 +102,7 @@
     ("c" "Line" avy-goto-char-2)]])
 
 (transient-define-prefix +custom-pkg-transient/font-menu ()
-  "Font Commands"
+  "Font Commands."
   [""
    ["Everywhere"
     ("R" "Reset to default" set-font-to-screen)
@@ -120,5 +120,5 @@
 (define-key global-map (kbd "C-c m") '+custom-pkg-transient/move-menu)
 (define-key global-map (kbd "C-c l") '+custom-pkg-transient/language-context-menu)
 
-(provide '+custom-pkg-transient)
-;;; transient.el ends here
+(provide 'icejam-transient)
+;;; icejam-transient.el ends here
diff --git a/lang/clang.el b/lisp/langs/icejam-lang-clang.el
similarity index 84%
rename from lang/clang.el
rename to lisp/langs/icejam-lang-clang.el
index a75bda4..781b942 100644
--- a/lang/clang.el
+++ b/lisp/langs/icejam-lang-clang.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 
 (defun +custom-lang-clang/activate-clang-mode ()
   "Goodies for editing c files."
@@ -24,5 +24,5 @@
 
 (add-hook 'c-mode-hook '+custom-lang-clang/activate-clang-mode)
 
-(provide '+custom-lang-clang)
-;;; clang.el ends here
+(provide 'icejam-lang-clang)
+;;; icejam-lang-clang.el ends here
diff --git a/lang/clojure.el b/lisp/langs/icejam-lang-clojure.el
similarity index 88%
rename from lang/clojure.el
rename to lisp/langs/icejam-lang-clojure.el
index 1b49965..52418de 100644
--- a/lang/clojure.el
+++ b/lisp/langs/icejam-lang-clojure.el
@@ -2,8 +2,8 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+(require 'icejam-prog-mode)
+(require 'icejam-transient)
 
 (use-package clojure-mode :defer t :straight t)
 
@@ -21,7 +21,7 @@
 
 ;; Transient
 (transient-define-prefix +custom-lang-clojure/cider-context-menu ()
-  "Clojure Buffer Commands"
+  "Clojure Buffer Commands."
   [""
    ["Cider"
     ("j" "Jack in"     cider-jack-in)
@@ -59,5 +59,5 @@
 (add-hook 'cider-repl-mode-hook '+custom-lang-clojure/clj-repl-config)
 (add-hook 'cider-mode-hook #'cider-company-enable-fuzzy-completion)
 
-(provide '+custom-lang-clojure)
-;;; clojure.el ends here
+(provide 'icejam-lang-clojure)
+;;; icejam-lang-clojure.el ends here
diff --git a/lang/common-lisp.el b/lisp/langs/icejam-lang-common-lisp.el
similarity index 76%
rename from lang/common-lisp.el
rename to lisp/langs/icejam-lang-common-lisp.el
index 3ea6c09..ae737e9 100644
--- a/lang/common-lisp.el
+++ b/lisp/langs/icejam-lang-common-lisp.el
@@ -8,7 +8,7 @@
 
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 (require 'icejam-company-yasnippet)
 
 (use-package slime :straight t)
@@ -19,5 +19,5 @@
 (setq inferior-lisp-program "sbcl")
 (slime-setup '(slime-fancy slime-company slime-quicklisp slime-asdf))
 
-(provide '+custom-lang-common-lisp)
-;;; common-lisp.el ends here
+(provide 'icejam-lang-common-lisp)
+;;; icejam-lang-common-lisp.el ends here
diff --git a/lang/dart.el b/lisp/langs/icejam-lang-dart.el
similarity index 75%
rename from lang/dart.el
rename to lisp/langs/icejam-lang-dart.el
index d7aff77..e4b3f46 100644
--- a/lang/dart.el
+++ b/lisp/langs/icejam-lang-dart.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 
 (use-package dart-mode :straight t :defer t)
 (use-package lsp-dart :defer t :straight t :requires (dart-mode lsp))
@@ -13,5 +13,5 @@
 
 (add-hook 'dart-mode-hook '+custom-lang-dart/activate-dart-mode)
 
-(provide '+custom-lang-dart)
-;;; dart.el ends here
+(provide 'icejam-lang-dart)
+;;; icejam-lang-dart.el ends here
diff --git a/lang/dhall.el b/lisp/langs/icejam-lang-dhall.el
similarity index 75%
rename from lang/dhall.el
rename to lisp/langs/icejam-lang-dhall.el
index 6199e1d..3f19c22 100644
--- a/lang/dhall.el
+++ b/lisp/langs/icejam-lang-dhall.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 
 (use-package dhall-mode :straight t :defer t :requires (lsp))
 
@@ -13,5 +13,5 @@
 (add-hook 'dhall-mode-hook '+custom-lang-dhall/activate-dhall-mode)
 (add-hook 'dhall-mode-hook 'display-line-numbers-mode)
 
-(provide '+custom-lang-dhall)
-;;; dhall.el ends here
+(provide 'icejam-lang-dhall)
+;;; icejam-lang-dhall.el ends here
diff --git a/lang/elisp.el b/lisp/langs/icejam-lang-elisp.el
similarity index 88%
rename from lang/elisp.el
rename to lisp/langs/icejam-lang-elisp.el
index ac4c49c..b17fd55 100644
--- a/lang/elisp.el
+++ b/lisp/langs/icejam-lang-elisp.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 
 (transient-define-prefix +custom-lang-elisp/transient-context-menu ()
   "Elisp Buffer Commands."
@@ -29,5 +29,5 @@
 
 (add-hook 'emacs-lisp-mode-hook 'activate-emacs-lisp-mode)
 
-(provide '+custom-lang-elisp)
-;;; elisp.el ends here
+(provide 'icejam-lang-elisp)
+;;; icejam-lang-elisp.el ends here
diff --git a/lang/elixir.el b/lisp/langs/icejam-lang-elixir.el
similarity index 87%
rename from lang/elixir.el
rename to lisp/langs/icejam-lang-elixir.el
index 66e4940..a163a62 100644
--- a/lang/elixir.el
+++ b/lisp/langs/icejam-lang-elixir.el
@@ -2,9 +2,9 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 (require 'icejam-flycheck)
-(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+(require 'icejam-transient)
 
 (use-package elixir-mode :defer t :straight t)
 (use-package elixir-ts-mode :requires (elixir-mode lsp-mode lsp-ui) :straight t)
@@ -14,7 +14,7 @@
 (add-to-list 'auto-mode-alist '("\\.heex\\'" . elixir-ts-mode))
 
 (transient-define-prefix +custom-lang-elixir/transient-context-menu ()
-  "Elixir Buffer Commands"
+  "Elixir Buffer Commands."
   [""
    ["LSP"
     ("m" "iMenu"       lsp-ui-imenu)]
@@ -46,5 +46,5 @@
 
 (add-hook 'elixir-ts-mode-hook '+custom-lang-elixir/activate-elixir-ts-mode)
 
-(provide '+custom-lang-elixir)
-;;; elixir.el ends here
+(provide 'icejam-lang-elixir)
+;;; icejam-lang-elixir.el ends here
diff --git a/lang/erlang.el b/lisp/langs/icejam-lang-erlang.el
similarity index 96%
rename from lang/erlang.el
rename to lisp/langs/icejam-lang-erlang.el
index 8ba6539..fae1e92 100644
--- a/lang/erlang.el
+++ b/lisp/langs/icejam-lang-erlang.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 (require 'icejam-lsp)
 (require 'icejam-projectile)
 
@@ -99,5 +99,5 @@
 
 (add-hook 'erlang-mode-hook 'erlang/activate-erlang-mode)
 
-(provide '+custom-lang-erlang)
-;;; erlang.el ends here
+(provide 'icejam-lang-erlang)
+;;; icejam-lang-erlang.el ends here
diff --git a/lang/fsharp.el b/lisp/langs/icejam-lang-fsharp.el
similarity index 83%
rename from lang/fsharp.el
rename to lisp/langs/icejam-lang-fsharp.el
index a117abc..646b41b 100644
--- a/lang/fsharp.el
+++ b/lisp/langs/icejam-lang-fsharp.el
@@ -10,7 +10,7 @@
 
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 (require 'icejam-lsp)
 
 (use-package fsharp-mode
@@ -30,5 +30,5 @@
 
 (add-hook 'fsharp-mode-hook 'activate-fsharp-mode)
 
-(provide '+custom-lang-fsharp)
-;;; fsharp.el ends here
+(provide 'icejam-lang-fsharp)
+;;; icejam-lang-fsharp.el ends here
diff --git a/lang/gleam.el b/lisp/langs/icejam-lang-gleam.el
similarity index 77%
rename from lang/gleam.el
rename to lisp/langs/icejam-lang-gleam.el
index 21bf34f..4f177b7 100644
--- a/lang/gleam.el
+++ b/lisp/langs/icejam-lang-gleam.el
@@ -10,8 +10,7 @@
 
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+(require 'icejam-prog-mode)
 
 (use-package gleam-mode
   :requires (tree-sitter-indent lsp column-enforce-mode)
@@ -28,5 +27,5 @@
 
 (add-hook 'gleam-mode-hook '+custom-lang-gleam/activate-gleam-mode)
 
-(provide '+custom-lang-gleam)
-;;; gleam.el ends here
+(provide 'icejam-lang-gleam)
+;;; icejam-lang-gleam.el ends here
diff --git a/lang/golang.el b/lisp/langs/icejam-lang-golang.el
similarity index 68%
rename from lang/golang.el
rename to lisp/langs/icejam-lang-golang.el
index 23d203a..23c67f6 100644
--- a/lang/golang.el
+++ b/lisp/langs/icejam-lang-golang.el
@@ -10,8 +10,7 @@
 
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+(require 'icejam-prog-mode)
 
 (use-package go-mode
   :requires (lsp-mode lsp-ui)
@@ -25,5 +24,5 @@
 
 (add-hook 'go-mode-hook 'activate-golang-mode)
 
-(provide '+custom-lang-golang)
-;;; golang.el ends here
+(provide 'icejam-lang-golang)
+;;; icejam-lang-golang.el ends here
diff --git a/lang/haskell.el b/lisp/langs/icejam-lang-haskell.el
similarity index 78%
rename from lang/haskell.el
rename to lisp/langs/icejam-lang-haskell.el
index b8fc44f..ffc9e08 100644
--- a/lang/haskell.el
+++ b/lisp/langs/icejam-lang-haskell.el
@@ -10,8 +10,7 @@
 
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+(require 'icejam-prog-mode)
 
 (use-package haskell-mode
   :straight t
@@ -34,5 +33,5 @@
 
 (add-hook 'haskell-mode-hook 'activate-haskell-mode)
 
-(provide '+custom-lang-haskell)
-;;; haskell.el ends here
+(provide 'icejam-lang-haskell)
+;;; icejam-lang-haskell.el ends here
diff --git a/lang/javascript.el b/lisp/langs/icejam-lang-javascript.el
similarity index 89%
rename from lang/javascript.el
rename to lisp/langs/icejam-lang-javascript.el
index 3c3dbd0..bdaf086 100644
--- a/lang/javascript.el
+++ b/lisp/langs/icejam-lang-javascript.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 (require 'icejam-flycheck)
 (require 'icejam-lsp)
 
@@ -43,5 +43,5 @@
 
 (add-hook 'js2-mode-hook 'activate-js2-mode)
 
-(provide '+custom-lang-javascript)
-;;; javascript.el ends here
+(provide 'icejam-lang-javascript)
+;;; icejam-lang-javascript.el ends here
diff --git a/lang/kotlin.el b/lisp/langs/icejam-lang-kotlin.el
similarity index 89%
rename from lang/kotlin.el
rename to lisp/langs/icejam-lang-kotlin.el
index 731b862..408c1a5 100644
--- a/lang/kotlin.el
+++ b/lisp/langs/icejam-lang-kotlin.el
@@ -30,5 +30,5 @@
 
 (add-hook 'kotlin-mode-hook 'activate-kotlin-mode)
 
-(provide '+custom-lang-kotlin)
-;;; kotlin.el ends here
+(provide 'icejam-lang-kotlin)
+;;; icejam-lang-kotlin.el ends here
diff --git a/lang/lean.el b/lisp/langs/icejam-lang-lean.el
similarity index 82%
rename from lang/lean.el
rename to lisp/langs/icejam-lang-lean.el
index 22efc56..055b764 100644
--- a/lang/lean.el
+++ b/lisp/langs/icejam-lang-lean.el
@@ -2,7 +2,8 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
+(require 'icejam-lsp)
 
 (use-package lean4-mode
   :straight (lean4-mode
@@ -26,5 +27,5 @@
 
 (add-hook 'lean4-mode-hook 'activate-lean-mode)
 
-(provide '+custom-lang-lean)
-;;; lean.el ends here
+(provide 'icejam-lang-lean)
+;;; icejam-lang-lean.el ends here
diff --git a/lang/markdown.el b/lisp/langs/icejam-lang-markdown.el
similarity index 86%
rename from lang/markdown.el
rename to lisp/langs/icejam-lang-markdown.el
index 4dc1877..c4edfd2 100644
--- a/lang/markdown.el
+++ b/lisp/langs/icejam-lang-markdown.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 
 (use-package markdown-mode
   :straight t
@@ -24,5 +24,5 @@
 (add-hook 'markdown-mode-hook '+custom-lang-markdown/activate-markdown-mode)
 (add-hook 'markdown-mode-hook 'display-line-numbers-mode)
 
-(provide '+custom-lang-markdown)
-;;; markdown.el ends here
+(provide 'icejam-lang-markdown)
+;;; icejam-lang-markdown.el ends here
diff --git a/lang/ocaml.el b/lisp/langs/icejam-lang-ocaml.el
similarity index 95%
rename from lang/ocaml.el
rename to lisp/langs/icejam-lang-ocaml.el
index b1caea3..9f32e66 100644
--- a/lang/ocaml.el
+++ b/lisp/langs/icejam-lang-ocaml.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+(require 'icejam-transient)
 
 (use-package tuareg
   :defer t
@@ -24,7 +24,7 @@
   :straight t)
 
 (transient-define-prefix +custom-lang-ocaml/context-menu ()
-  "Ocaml Actions"
+  "Ocaml Actions."
   ["OCaml actions"
    [""
     ("r" "Reload"   revert-buffer-no-confirm)
@@ -91,5 +91,5 @@
 (add-hook 'reason-mode-hook 'custom-lang-ocaml/activate-reason-mode)
 (add-hook 'reason-mode-hook 'merlin-mode)
 
-(provide '+custom-lang-ocaml)
-;;; ocaml.el ends here
+(provide 'icejam-lang-ocaml)
+;;; icejam-lang-ocaml.el ends here
diff --git a/lang/other.el b/lisp/langs/icejam-lang-other.el
similarity index 94%
rename from lang/other.el
rename to lisp/langs/icejam-lang-other.el
index b20f12a..81b3f34 100644
--- a/lang/other.el
+++ b/lisp/langs/icejam-lang-other.el
@@ -38,5 +38,5 @@
   :hook ((gitignore-mode . whitespace-mode)
          (before-save . whitespace-cleanup)))
 
-(provide '+custom-lang-other)
-;;; other.el ends here
+(provide 'icejam-lang-other)
+;;; icejam-lang-other.el ends here
diff --git a/lang/php.el b/lisp/langs/icejam-lang-php.el
similarity index 83%
rename from lang/php.el
rename to lisp/langs/icejam-lang-php.el
index acba1c7..e1a38fc 100644
--- a/lang/php.el
+++ b/lisp/langs/icejam-lang-php.el
@@ -10,16 +10,16 @@
 
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 (require 'icejam-flycheck)
-(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+(require 'icejam-transient)
 
 (use-package php-mode
   :requires (lsp-mode lsp-ui)
   :straight t)
 
 (transient-define-prefix +custom-lang-php/context-menu ()
-  "PHP Buffer Commands"
+  "PHP Buffer Commands."
   [""
    ["LSP"
     ("m" "iMenu"       lsp-ui-imenu)]
@@ -45,5 +45,5 @@
 
 (add-hook 'php-mode-hook '+custom-lang-php/activate-php-mode)
 
-(provide '+custom-lang-php)
-;;; php.el ends here
+(provide 'icejam-lang-php)
+;;; icejam-lang-php.el ends here
diff --git a/lang/purescript.el b/lisp/langs/icejam-lang-purescript.el
similarity index 89%
rename from lang/purescript.el
rename to lisp/langs/icejam-lang-purescript.el
index 10451cf..60b7305 100644
--- a/lang/purescript.el
+++ b/lisp/langs/icejam-lang-purescript.el
@@ -27,5 +27,5 @@
 
 (add-hook 'purescript-mode-hook 'activate-purescript-mode)
 
-(provide '+custom-lang-purescript)
-;;; purescript.el ends here
+(provide 'icejam-lang-purescript)
+;;; icejam-lang-purescript.el ends here
diff --git a/lang/python.el b/lisp/langs/icejam-lang-python.el
similarity index 87%
rename from lang/python.el
rename to lisp/langs/icejam-lang-python.el
index 75b6383..5546c3e 100644
--- a/lang/python.el
+++ b/lisp/langs/icejam-lang-python.el
@@ -2,7 +2,8 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
+(require 'icejam-transient)
 
 (transient-define-prefix +custom-lang-python/transient-context-menu ()
   "Python Buffer Commands."
@@ -31,5 +32,5 @@
 
 (add-hook 'python-mode-hook '+custom-lang-python/activate-python-mode)
 
-(provide '+custom-lang-python)
-;;; python.el ends here
+(provide 'icejam-lang-python)
+;;; icejam-lang-python.el ends here
diff --git a/lang/ruby.el b/lisp/langs/icejam-lang-ruby.el
similarity index 90%
rename from lang/ruby.el
rename to lisp/langs/icejam-lang-ruby.el
index 99a9682..15fa6fb 100644
--- a/lang/ruby.el
+++ b/lisp/langs/icejam-lang-ruby.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 (require 'icejam-projectile)
 
 (use-package rspec-mode :straight t :defer t)
@@ -36,5 +36,5 @@
 (add-hook 'enh-ruby-mode-hook 'activate-ruby-mode)
 ;; (add-hook 'enh-ruby-mode-hook 'lsp-deferred)
 
-(provide '+custom-lang-ruby)
-;;; ruby.el ends here
+(provide 'icejam-lang-ruby)
+;;; icejam-lang-ruby.el ends here
diff --git a/lang/rust.el b/lisp/langs/icejam-lang-rust.el
similarity index 83%
rename from lang/rust.el
rename to lisp/langs/icejam-lang-rust.el
index 97f2ec4..7f7e524 100644
--- a/lang/rust.el
+++ b/lisp/langs/icejam-lang-rust.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 
 (use-package rust-mode
   :straight t
@@ -29,5 +29,5 @@
 (add-hook 'rust-mode-hook 'activate-rust-mode)
 (add-hook 'rust-mode-hook 'flycheck-rust-setup)
 
-(provide '+custom-lang-rust)
-;;; rust.el ends here
+(provide 'icejam-lang-rust)
+;;; icejam-lang-rust.el ends here
diff --git a/lang/sh.el b/lisp/langs/icejam-lang-sh.el
similarity index 85%
rename from lang/sh.el
rename to lisp/langs/icejam-lang-sh.el
index 3f239f3..e43033a 100644
--- a/lang/sh.el
+++ b/lisp/langs/icejam-lang-sh.el
@@ -9,5 +9,5 @@
 (add-to-list 'auto-mode-alist '("\\.zshrc\\'" . sh-mode))
 (add-to-list 'auto-mode-alist '("\\.envrc\\'" . sh-mode))
 
-(provide '+custom-lang-sh)
-;;; sh.el ends here
+(provide 'icejam-lang-sh)
+;;; icejam-lang-sh.el ends here
diff --git a/lang/web.el b/lisp/langs/icejam-lang-web.el
similarity index 95%
rename from lang/web.el
rename to lisp/langs/icejam-lang-web.el
index ae0b4b1..0469a2d 100644
--- a/lang/web.el
+++ b/lisp/langs/icejam-lang-web.el
@@ -46,5 +46,5 @@
 
 (add-hook 'web-mode-hook 'activate-web-mode)
 
-(provide '+custom-lang-web)
-;;; web.el ends here
+(provide 'icejam-lang-web)
+;;; icejam-lang-web.el ends here
diff --git a/lang/ziglang.el b/lisp/langs/icejam-lang-ziglang.el
similarity index 78%
rename from lang/ziglang.el
rename to lisp/langs/icejam-lang-ziglang.el
index ba4d06b..d28db07 100644
--- a/lang/ziglang.el
+++ b/lisp/langs/icejam-lang-ziglang.el
@@ -9,7 +9,7 @@
 ;; ziglang does a thing.
 
 ;;; Code:
-(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require 'icejam-prog-mode)
 
 (use-package zig-mode :straight t :defer t :requires (lsp))
 
@@ -25,5 +25,5 @@
 
 (add-hook 'zig-mode-hook 'activate-zig-mode)
 
-(provide '+custom-lang-ziglang)
-;;; ziglang.el ends here
+(provide 'icejam-lang-ziglang)
+;;; icejam-lang-ziglang.el ends here
diff --git a/themes/base16-harmonic-light-modified.el b/lisp/themes/icejam-base16-harmonic-light.el
similarity index 89%
rename from themes/base16-harmonic-light-modified.el
rename to lisp/themes/icejam-base16-harmonic-light.el
index 6c21eb8..e5b4d0f 100644
--- a/themes/base16-harmonic-light-modified.el
+++ b/lisp/themes/icejam-base16-harmonic-light.el
@@ -36,5 +36,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-harmonic-light-modified)
-(provide 'themes/base16-harmonic-light-modified-theme)
-;;; base16-harmonic-light-modified-theme.el ends here
+(provide 'icejam-base16-harmonic-light)
+;;; icejam-base16-harmonic-light.el ends here
diff --git a/themes/themes-base16-not-harmonic.el b/lisp/themes/icejam-base16-not-harmonic.el
similarity index 95%
rename from themes/themes-base16-not-harmonic.el
rename to lisp/themes/icejam-base16-not-harmonic.el
index d54ef6e..3719dd5 100644
--- a/themes/themes-base16-not-harmonic.el
+++ b/lisp/themes/icejam-base16-not-harmonic.el
@@ -55,7 +55,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-not-harmonic)
-
-(provide 'base16-not-harmonic-theme)
-
-;;; base16-not-harmonic-theme.el ends here
+(provide 'icejam-base16-not-harmonic)
+;;; icejam-base16-not-harmonic.el ends here
diff --git a/themes/base16-summerfruit-light-modified-theme.el b/lisp/themes/icejam-base16-summerfruit-light.el
similarity index 89%
rename from themes/base16-summerfruit-light-modified-theme.el
rename to lisp/themes/icejam-base16-summerfruit-light.el
index 4c3818d..dba356b 100644
--- a/themes/base16-summerfruit-light-modified-theme.el
+++ b/lisp/themes/icejam-base16-summerfruit-light.el
@@ -36,5 +36,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-summerfruit-light-modified)
-(provide 'themes/base16-summerfruit-light-modified-theme)
-;;; base16-summerfruit-light-modified-theme.el ends here
+(provide 'icejam-base16-summerfruit-light)
+;;; icejam-base16-summerfruit-light.el ends here
diff --git a/themes/base16-zenburn-modified.el b/lisp/themes/icejam-base16-zenburn.el
similarity index 93%
rename from themes/base16-zenburn-modified.el
rename to lisp/themes/icejam-base16-zenburn.el
index 0b0f939..2ba0acb 100644
--- a/themes/base16-zenburn-modified.el
+++ b/lisp/themes/icejam-base16-zenburn.el
@@ -46,6 +46,5 @@
 
 ;; Mark the theme as provided
 (provide-theme 'base16-zenburn-modified)
-
-(provide 'base16-zenburn-modified-theme)
-;;; base16-zenburn-modified-theme.el ends here
+(provide 'icejam-base16-zenburn)
+;;; icejam-base16-zenburn.el ends here
diff --git a/themes/themes-tronesque.el b/lisp/themes/icejam-tronesque.el
similarity index 99%
rename from themes/themes-tronesque.el
rename to lisp/themes/icejam-tronesque.el
index 2ee9c3b..71b998f 100644
--- a/themes/themes-tronesque.el
+++ b/lisp/themes/icejam-tronesque.el
@@ -384,4 +384,5 @@ More information on Tron: https://en.wikipedia.org/wiki/Tron")
                (file-name-as-directory (file-name-directory load-file-name))))
 
 (provide-theme 'tronesque)
-;;; tronesque-theme.el ends here
+(provide icejam-tronesque)
+;;; icejam-tronesque.el ends here