diff --git a/pkg/avy.el b/lisp/icejam-avy.el
similarity index 63%
rename from pkg/avy.el
rename to lisp/icejam-avy.el
index 1bccbee..9924382 100644
--- a/pkg/avy.el
+++ b/lisp/icejam-avy.el
@@ -1,4 +1,4 @@
-;;; avy.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-avy.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -10,5 +10,5 @@
 
 ;;; Code:
 (use-package avy :straight t :defer t)
-(provide '+custom-pkg-avy)
-;;; avy.el ends here
+(provide 'icejam-avy)
+;;; icejam-avy.el ends here
diff --git a/custom-init.el b/lisp/icejam-init.el
similarity index 94%
rename from custom-init.el
rename to lisp/icejam-init.el
index df21086..25f3127 100644
--- a/custom-init.el
+++ b/lisp/icejam-init.el
@@ -30,7 +30,7 @@
 
 (straight-use-package 'use-package)
 
-(add-to-list 'load-path (concat user-emacs-directory "pkg"))
+;; (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")
@@ -49,8 +49,8 @@
 (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 '+custom-pkg-avy "$HOME/.emacs.d/pkg/avy.el")
-(require '+custom-pkg-speed-type "$HOME/.emacs.d/pkg/speed-type.el")
+(require 'icejam-avy)
+(require 'icejam-speed-type)
 
 ;; Themes
 (require '+custom-pkg-themes "$HOME/.emacs.d/pkg/themes.el")
@@ -91,5 +91,5 @@
 (setq gc-cons-threshold 100000000)
 (setq gc-cons-percentage 0.1)
 
-(provide '+custom-init)
-;;; custom-init.el ends here
+(provide 'icejam-init)
+;;; icejam-init.el ends here
diff --git a/pkg/speed-type.el b/lisp/icejam-speed-type.el
similarity index 63%
rename from pkg/speed-type.el
rename to lisp/icejam-speed-type.el
index eaaf889..f965e00 100644
--- a/pkg/speed-type.el
+++ b/lisp/icejam-speed-type.el
@@ -1,4 +1,4 @@
-;;; speed-type.el --- summary -*- lexical-binding: t; -*-
+;;; icejam-speed-type.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -15,5 +15,5 @@
   :ensure t
   :defer t)
 
-(provide '+custom-pkg-speed-type)
-;;; speed-type.el ends here
+(provide 'icejam-speed-type)
+;;; icejam-speed-type.el ends here
diff --git a/pkg/company-yasnippet.el b/pkg/company-yasnippet.el
index 8ad2124..5011b36 100644
--- a/pkg/company-yasnippet.el
+++ b/pkg/company-yasnippet.el
@@ -14,8 +14,9 @@
   :config
   (unbind-key "C-c & C-n" yas-minor-mode-map)
   (unbind-key "C-c & C-s" yas-minor-mode-map)
-  (unbind-key "C-c & C-v" yas-minor-mode-map)
-  (yas-global-mode t))
+  (unbind-key "C-c & C-v" yas-minor-mode-map))
+
+(yas-global-mode t)
 
 (use-package company
   :commands (company-indent-or-complete-common company-yasnippet)
diff --git a/pkg/prog-mode.el b/pkg/prog-mode.el
index 44e4f4d..f8dd04a 100644
--- a/pkg/prog-mode.el
+++ b/pkg/prog-mode.el
@@ -53,8 +53,10 @@
   :straight t
   :defer t
   :config
-  (add-to-list 'dash-at-point-mode-alist '(enh-ruby-mode  . "ruby,rubygems,rails"))
-  (add-to-list 'dash-at-point-mode-alist '(elixir-ts-mode . "elixir,hex")))
+  (add-to-list 'dash-at-point-mode-alist
+               '(enh-ruby-mode  . "ruby,rubygems,rails"))
+  (add-to-list 'dash-at-point-mode-alist
+               '(elixir-ts-mode . "elixir,hex")))
 
 ;; By default, use 2 spaces for indentation
 (setq tab-width 2)
diff --git a/pkg/transient.el b/pkg/transient.el
index 0a7f44c..aa1696b 100644
--- a/pkg/transient.el
+++ b/pkg/transient.el
@@ -3,7 +3,7 @@
 ;;; Global Transient definitions.
 ;;; Code:
 
-(require '+custom-pkg-avy "$HOME/.emacs.d/pkg/avy.el")
+(require 'icejam-avy)
 
 (use-package transient :straight t)