diff --git a/lang/common-lisp.el b/lang/common-lisp.el
index 75e7b14..3ea6c09 100644
--- a/lang/common-lisp.el
+++ b/lang/common-lisp.el
@@ -9,7 +9,7 @@
 ;;; Code:
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-company-yasnippet "$HOME/.emacs.d/pkg/company-yasnippet.el")
+(require 'icejam-company-yasnippet)
 
 (use-package slime :straight t)
 (use-package slime-company :straight t
diff --git a/lang/elixir.el b/lang/elixir.el
index 609a3c6..66e4940 100644
--- a/lang/elixir.el
+++ b/lang/elixir.el
@@ -3,7 +3,7 @@
 ;;; Code:
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
+(require 'icejam-flycheck)
 (require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
 
 (use-package elixir-mode :defer t :straight t)
diff --git a/lang/fsharp.el b/lang/fsharp.el
index 4dfac94..a117abc 100644
--- a/lang/fsharp.el
+++ b/lang/fsharp.el
@@ -11,7 +11,7 @@
 ;;; Code:
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
+(require 'icejam-lsp)
 
 (use-package fsharp-mode
   :requires (lsp-mode lsp-ui)
diff --git a/lang/gleam.el b/lang/gleam.el
index b0d15b7..21bf34f 100644
--- a/lang/gleam.el
+++ b/lang/gleam.el
@@ -11,7 +11,6 @@
 ;;; Code:
 
 (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-transient "$HOME/.emacs.d/pkg/transient.el")
 
 (use-package gleam-mode
diff --git a/lang/haskell.el b/lang/haskell.el
index 3b895a7..b8fc44f 100644
--- a/lang/haskell.el
+++ b/lang/haskell.el
@@ -11,7 +11,6 @@
 ;;; Code:
 
 (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-transient "$HOME/.emacs.d/pkg/transient.el")
 
 (use-package haskell-mode
diff --git a/lang/javascript.el b/lang/javascript.el
index c820cd8..3c3dbd0 100644
--- a/lang/javascript.el
+++ b/lang/javascript.el
@@ -3,7 +3,7 @@
 ;;; Code:
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
+(require 'icejam-flycheck)
 (require 'icejam-lsp)
 
 (use-package js2-mode
diff --git a/lang/lean.el b/lang/lean.el
index be688d3..22efc56 100644
--- a/lang/lean.el
+++ b/lang/lean.el
@@ -3,7 +3,6 @@
 ;;; Code:
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
 
 (use-package lean4-mode
   :straight (lean4-mode
diff --git a/lang/php.el b/lang/php.el
index 735755c..acba1c7 100644
--- a/lang/php.el
+++ b/lang/php.el
@@ -11,7 +11,7 @@
 ;;; Code:
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
+(require 'icejam-flycheck)
 (require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
 
 (use-package php-mode
diff --git a/lang/rust.el b/lang/rust.el
index f4cb61d..97f2ec4 100644
--- a/lang/rust.el
+++ b/lang/rust.el
@@ -3,7 +3,6 @@
 ;;; Code:
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
-(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
 
 (use-package rust-mode
   :straight t
diff --git a/lang/web.el b/lang/web.el
index 27dee81..ae0b4b1 100644
--- a/lang/web.el
+++ b/lang/web.el
@@ -3,7 +3,7 @@
 ;;; Code:
 
 (require 'icejam-lsp)
-(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
+(require 'icejam-flycheck)
 
 (use-package web-mode
   :requires (lsp-mode flycheck)
diff --git a/pkg/company-yasnippet.el b/lisp/icejam-company-yasnippet.el
similarity index 96%
rename from pkg/company-yasnippet.el
rename to lisp/icejam-company-yasnippet.el
index 5011b36..bf6c006 100644
--- a/pkg/company-yasnippet.el
+++ b/lisp/icejam-company-yasnippet.el
@@ -1,4 +1,4 @@
-;;; pkg/company-yasnippet -- summary -*- lexical-binding: t; -*-
+;;; icejam-company-yasnippet.el -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Company completion framework configuration
 ;;; Code:
@@ -110,5 +110,5 @@
  gptel-model "claude-3-5-sonnet-20240620"
  gptel-backend (gptel-make-anthropic "Claude" :stream t :key (lambda () anthropic-api-key)))
 
-(provide '+custom-pkg-company-yasnippet)
-;;; company-yasnippet.el ends here
+(provide 'icejam-company-yasnippet)
+;;; icejam-company-yasnippet.el ends here
diff --git a/pkg/flycheck.el b/lisp/icejam-flycheck.el
similarity index 84%
rename from pkg/flycheck.el
rename to lisp/icejam-flycheck.el
index b1c580b..5d9d880 100644
--- a/pkg/flycheck.el
+++ b/lisp/icejam-flycheck.el
@@ -1,4 +1,4 @@
-;;; pkg/flycheck -- summary -*- lexical-binding: t; -*-
+;;; icejam-flycheck -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
 
@@ -8,6 +8,7 @@
   :straight t
   :defer t
   :config (global-flycheck-mode t)
+  (setq flycheck-emacs-lisp-load-path 'inherit)
   (unbind-key "C-c ! C-c" flycheck-mode-map)
   (unbind-key "C-c ! C-w" flycheck-mode-map)
   (unbind-key "C-c ! ?" flycheck-mode-map)
@@ -25,5 +26,5 @@
   (unbind-key "C-c ! v" flycheck-mode-map)
   (unbind-key "C-c ! x" flycheck-mode-map))
 
-(provide '+custom-pkg-flycheck)
-;;; flycheck.el ends here
+(provide 'icejam-flycheck)
+;;; icejam-flycheck.el ends here
diff --git a/lisp/icejam-init.el b/lisp/icejam-init.el
index 5dfb1fe..6d808e3 100644
--- a/lisp/icejam-init.el
+++ b/lisp/icejam-init.el
@@ -37,18 +37,18 @@
 (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 '+custom-pkg-company-yasnippet "$HOME/.emacs.d/pkg/company-yasnippet.el")
-(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.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-avy)
 (require 'icejam-speed-type)
 
 ;; Themes