diff --git a/.gitignore b/.gitignore
index e10b82f..5a5c333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@
 !/load-lisp.el
 !/custom.el
 !/themes
-!/config
+!/init
 !/lisp
\ No newline at end of file
diff --git a/config/conf-mode/config-conf-mode.el b/config/conf-mode/config-conf-mode.el
deleted file mode 100644
index 1e1554b..0000000
--- a/config/conf-mode/config-conf-mode.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(require 'config-text-mode)
-
-(load "config-conf-mode-hooks")
-
-(provide 'config-conf-mode)
diff --git a/config/eglot/config-eglot-servers.el b/config/eglot/config-eglot-servers.el
deleted file mode 100644
index 833766d..0000000
--- a/config/eglot/config-eglot-servers.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(defvar config-eglot-server-clangd '((c-mode c++-mode) .
-                                     ("clangd"
-                                      "--header-insersion=never")))
-
-(defvar config-eglot-server-rust-analyzer '((rust-mode) .
-                                            ("rust-analyzer")))
-  
-(add-to-list 'eglot-server-programs config-eglot-server-clangd)
-(add-to-list 'eglot-server-programs config-eglot-server-rust-analyzer)
diff --git a/config/eglot/config-eglot.el b/config/eglot/config-eglot.el
deleted file mode 100644
index 17b36de..0000000
--- a/config/eglot/config-eglot.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(require 'eglot)
-
-(setq eglot-autoshutdown t)
-
-(load "config-eglot-servers")
-
-(provide 'config-eglot)
diff --git a/config/prog-mode/config-prog-mode.el b/config/prog-mode/config-prog-mode.el
deleted file mode 100644
index 5caf9f2..0000000
--- a/config/prog-mode/config-prog-mode.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(require 'config-text-mode)
-
-(load "config-prog-mode-hooks")
-
-(provide 'config-prog-mode)
diff --git a/config/project/config-project.el b/config/project/config-project.el
deleted file mode 100644
index c4c61ea..0000000
--- a/config/project/config-project.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(load "config-project-find-rust-projects")
-
-(provide 'config-project)
diff --git a/config/text-mode/config-text-mode.el b/config/text-mode/config-text-mode.el
deleted file mode 100644
index f2a832e..0000000
--- a/config/text-mode/config-text-mode.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(load "config-text-mode-hooks")
-
-(provide 'config-text-mode)
diff --git a/init.el b/init.el
index 0f42efb..013392c 100644
--- a/init.el
+++ b/init.el
@@ -35,3 +35,65 @@
 (scroll-bar-mode 0)
 (tool-bar-mode 0)
 (tooltip-mode 0)
+
+(let ((config-directory (file-name-concat user-emacs-directory "init")))
+  (add-to-list 'load-path (file-name-concat config-directory "company"))
+  (add-to-list 'load-path (file-name-concat config-directory "conf-mode"))
+  (add-to-list 'load-path (file-name-concat config-directory "dired"))
+  (add-to-list 'load-path (file-name-concat config-directory "display-buffer"))
+  (add-to-list 'load-path (file-name-concat config-directory "eglot"))
+  (add-to-list 'load-path (file-name-concat config-directory "eldoc"))
+  (add-to-list 'load-path (file-name-concat config-directory "electric"))
+  (add-to-list 'load-path (file-name-concat config-directory "flycheck"))
+  (add-to-list 'load-path (file-name-concat config-directory "flymake"))
+  (add-to-list 'load-path (file-name-concat config-directory "garbage-collection"))
+  (add-to-list 'load-path (file-name-concat config-directory "ibuffer"))
+  (add-to-list 'load-path (file-name-concat config-directory "keys"))
+  (add-to-list 'load-path (file-name-concat config-directory "man"))
+  (add-to-list 'load-path (file-name-concat config-directory "lsp-mode"))
+  (add-to-list 'load-path (file-name-concat config-directory "native-comp"))
+  (add-to-list 'load-path (file-name-concat config-directory "package"))
+  (add-to-list 'load-path (file-name-concat config-directory "prog-mode"))
+  (add-to-list 'load-path (file-name-concat config-directory "project"))
+  (add-to-list 'load-path (file-name-concat config-directory "recentf"))
+  (add-to-list 'load-path (file-name-concat config-directory "savehist"))
+  (add-to-list 'load-path (file-name-concat config-directory "text-mode"))
+  (add-to-list 'load-path (file-name-concat config-directory "tramp")))
+
+(require 'init-text-mode)
+(require 'init-conf-mode)
+(require 'init-prog-mode)
+(require 'init-dired)
+(require 'init-display-buffer)
+(require 'init-eldoc)
+(require 'init-electric)
+(require 'init-flymake)
+(require 'init-garbage-collection)
+(require 'init-ibuffer)
+(require 'init-keys)
+(require 'init-man)
+(require 'init-package)
+(require 'init-project)
+(require 'init-recentf)
+(require 'init-savehist)
+(require 'init-tramp)
+
+(when (locate-library "company")
+  (require 'init-company))
+
+(when (locate-library "eglot")
+  (require 'init-eglot))
+
+(when (locate-library "flycheck")
+  (require 'init-flycheck))
+
+(when (locate-library "lsp-mode")
+  (require 'init-lsp-mode))
+
+(when (and (> emacs-major-version 28) (native-comp-available-p))
+  (require 'init-native-comp))
+
+(let ((local-lisp-directory (file-name-concat user-emacs-directory "lisp")))
+  (add-to-list 'load-path (file-name-concat local-lisp-directory "man-wrapper")))
+
+(require 'man-wrapper)
diff --git a/config/company/config-company.el b/init/company/init-company.el
similarity index 87%
rename from config/company/config-company.el
rename to init/company/init-company.el
index e98e2a2..633efe7 100644
--- a/config/company/config-company.el
+++ b/init/company/init-company.el
@@ -5,4 +5,4 @@
       company-clang-insert-arguments nil
       company-minimum-prefix-length 1)
 
-(provide 'config-company)
+(provide 'init-company)
diff --git a/config/conf-mode/config-conf-mode-hooks.el b/init/conf-mode/init-conf-mode-hooks.el
similarity index 100%
rename from config/conf-mode/config-conf-mode-hooks.el
rename to init/conf-mode/init-conf-mode-hooks.el
diff --git a/init/conf-mode/init-conf-mode.el b/init/conf-mode/init-conf-mode.el
new file mode 100644
index 0000000..4a77537
--- /dev/null
+++ b/init/conf-mode/init-conf-mode.el
@@ -0,0 +1,5 @@
+(require 'init-text-mode)
+
+(load "init-conf-mode-hooks")
+
+(provide 'init-conf-mode)
diff --git a/config/dir-locals/eglot-dir-locals.el b/init/dir-locals/eglot-dir-locals.el
similarity index 100%
rename from config/dir-locals/eglot-dir-locals.el
rename to init/dir-locals/eglot-dir-locals.el
diff --git a/config/dired/config-dired.el b/init/dired/init-dired.el
similarity index 78%
rename from config/dired/config-dired.el
rename to init/dired/init-dired.el
index d037bfb..1d47ccf 100644
--- a/config/dired/config-dired.el
+++ b/init/dired/init-dired.el
@@ -1,4 +1,4 @@
 (setq dired-listing-switches "-alh"
       dired-kill-when-opening-new-dired-buffer t)
 
-(provide 'config-dired)
+(provide 'init-dired)
diff --git a/config/display-buffer/config-display-buffer-best-side.el b/init/display-buffer/init-display-buffer-best-side.el
similarity index 69%
rename from config/display-buffer/config-display-buffer-best-side.el
rename to init/display-buffer/init-display-buffer-best-side.el
index 9a2ff48..e0f588a 100644
--- a/config/display-buffer/config-display-buffer-best-side.el
+++ b/init/display-buffer/init-display-buffer-best-side.el
@@ -1,7 +1,7 @@
-(defun config-display-buffer-frame-wide-p ()
+(defun init-display-buffer-frame-wide-p ()
   (> (frame-pixel-width) (/ (x-display-pixel-width) 2)))
 
-(defun config-display-buffer-best-side (buffer alist)
+(defun init-display-buffer-best-side (buffer alist)
   (let* ((side (funcall (alist-get 'which-side alist)))
          (alist (append (cdr alist) (list (cons 'side side)))))
     (display-buffer-in-side-window buffer alist)))
diff --git a/config/display-buffer/config-display-buffer.el b/init/display-buffer/init-display-buffer.el
similarity index 55%
rename from config/display-buffer/config-display-buffer.el
rename to init/display-buffer/init-display-buffer.el
index 022b1df..f1c4290 100644
--- a/config/display-buffer/config-display-buffer.el
+++ b/init/display-buffer/init-display-buffer.el
@@ -1,5 +1,5 @@
 (setq display-buffer-base-action '(display-buffer-same-window display-buffer-reuse-window))
 
-(load "config-display-buffer-best-side")
+(load "init-display-buffer-best-side")
 
-(provide 'config-display-buffer)
+(provide 'init-display-buffer)
diff --git a/init/eglot/init-eglot-servers.el b/init/eglot/init-eglot-servers.el
new file mode 100644
index 0000000..2dce402
--- /dev/null
+++ b/init/eglot/init-eglot-servers.el
@@ -0,0 +1,9 @@
+(defvar init-eglot-server-clangd '((c-mode c++-mode) .
+                                     ("clangd"
+                                      "--header-insersion=never")))
+
+(defvar init-eglot-server-rust-analyzer '((rust-mode) .
+                                            ("rust-analyzer")))
+  
+(add-to-list 'eglot-server-programs init-eglot-server-clangd)
+(add-to-list 'eglot-server-programs init-eglot-server-rust-analyzer)
diff --git a/init/eglot/init-eglot.el b/init/eglot/init-eglot.el
new file mode 100644
index 0000000..dd85cca
--- /dev/null
+++ b/init/eglot/init-eglot.el
@@ -0,0 +1,7 @@
+(require 'eglot)
+
+(setq eglot-autoshutdown t)
+
+(load "init-eglot-servers")
+
+(provide 'init-eglot)
diff --git a/config/eldoc/config-eldoc.el b/init/eldoc/init-eldoc.el
similarity index 73%
rename from config/eldoc/config-eldoc.el
rename to init/eldoc/init-eldoc.el
index 9513919..c4568e0 100644
--- a/config/eldoc/config-eldoc.el
+++ b/init/eldoc/init-eldoc.el
@@ -1,4 +1,4 @@
 (setq eldoc-idle-delay 0
       eldoc-echo-area-use-multiline-p 5)
 
-(provide 'config-eldoc)
+(provide 'init-eldoc)
diff --git a/config/electric/config-electric.el b/init/electric/init-electric.el
similarity index 84%
rename from config/electric/config-electric.el
rename to init/electric/init-electric.el
index a401739..7d668b6 100644
--- a/config/electric/config-electric.el
+++ b/init/electric/init-electric.el
@@ -4,4 +4,4 @@
 (add-to-list 'electric-pair-pairs '("?(" . "?)"))
 (add-to-list 'electric-pair-pairs '("?{" . "?}"))
 
-(provide 'config-electric)
+(provide 'init-electric)
diff --git a/config/flycheck/config-flycheck-cargo-has-command-p-fix.el b/init/flycheck/init-flycheck-cargo-has-command-p-fix.el
similarity index 65%
rename from config/flycheck/config-flycheck-cargo-has-command-p-fix.el
rename to init/flycheck/init-flycheck-cargo-has-command-p-fix.el
index 1135165..48d53d6 100644
--- a/config/flycheck/config-flycheck-cargo-has-command-p-fix.el
+++ b/init/flycheck/init-flycheck-cargo-has-command-p-fix.el
@@ -1,7 +1,7 @@
-(defun config-flycheck-rust-cargo-has-command-p (command)
+(defun init-flycheck-rust-cargo-has-command-p (command)
   (let* ((commands (process-lines "cargo" "--list"))
          (trimmed (-map (lambda (row) (-slice row 4 (string-search " " 4))) commands)))
     (seq-contains-p (-rest trimmed) command)))
 
 (advice-add 'flycheck-rust-cargo-has-command-p
-            :override 'config-flycheck-rust-cargo-has-command-p)
+            :override 'init-flycheck-rust-cargo-has-command-p)
diff --git a/config/flycheck/config-flycheck.el b/init/flycheck/init-flycheck.el
similarity index 59%
rename from config/flycheck/config-flycheck.el
rename to init/flycheck/init-flycheck.el
index 95c0b49..ee59ef8 100644
--- a/config/flycheck/config-flycheck.el
+++ b/init/flycheck/init-flycheck.el
@@ -1,15 +1,15 @@
 (require 'flycheck)
 
-(load "config-flycheck-cargo-has-command-p-fix")
+(load "init-flycheck-cargo-has-command-p-fix")
 
 (add-hook 'flycheck-error-list-mode-hook (lambda () (visual-line-mode 1)))
 
 (add-to-list 'display-buffer-alist '("\\*Flycheck errors.*"
-                                     (config-display-buffer-best-side)
+                                     (init-display-buffer-best-side)
                                      (which-side . (lambda ()
-                                                     (if (config-display-buffer-frame-wide-p)
+                                                     (if (init-display-buffer-frame-wide-p)
                                                          'right
                                                        'bottom)))))
 
 
-(provide 'config-flycheck)
+(provide 'init-flycheck)
diff --git a/config/flymake/config-flymake-hooks.el b/init/flymake/init-flymake-hooks.el
similarity index 100%
rename from config/flymake/config-flymake-hooks.el
rename to init/flymake/init-flymake-hooks.el
diff --git a/config/flymake/config-flymake.el b/init/flymake/init-flymake.el
similarity index 55%
rename from config/flymake/config-flymake.el
rename to init/flymake/init-flymake.el
index c9a3dfe..0fbd45a 100644
--- a/config/flymake/config-flymake.el
+++ b/init/flymake/init-flymake.el
@@ -1,12 +1,12 @@
 (require 'flymake)
 
-(load "config-flymake-hooks")
+(load "init-flymake-hooks")
 
 (add-to-list 'display-buffer-alist '("\\*Flymake diagnostics.*"
-                                     (config-display-buffer-best-side)
+                                     (init-display-buffer-best-side)
                                      (which-side . (lambda ()
-                                                     (if (config-display-buffer-frame-wide-p)
+                                                     (if (init-display-buffer-frame-wide-p)
                                                          'right
                                                        'bottom)))))
 
-(provide 'config-flymake)
+(provide 'init-flymake)
diff --git a/config/garbage-collection/config-garbage-collection.el b/init/garbage-collection/init-garbage-collection.el
similarity index 55%
rename from config/garbage-collection/config-garbage-collection.el
rename to init/garbage-collection/init-garbage-collection.el
index 1540baf..96b2252 100644
--- a/config/garbage-collection/config-garbage-collection.el
+++ b/init/garbage-collection/init-garbage-collection.el
@@ -1,3 +1,3 @@
 (setq gc-cons-threshold (* (expt 1024 2) 25))
 
-(provide 'config-garbage-collection)
+(provide 'init-garbage-collection)
diff --git a/config/ibuffer/config-ibuffer-filter-groups.el b/init/ibuffer/init-ibuffer-filter-groups.el
similarity index 88%
rename from config/ibuffer/config-ibuffer-filter-groups.el
rename to init/ibuffer/init-ibuffer-filter-groups.el
index 6f9c8d2..fbdd8ff 100644
--- a/config/ibuffer/config-ibuffer-filter-groups.el
+++ b/init/ibuffer/init-ibuffer-filter-groups.el
@@ -7,4 +7,4 @@
 
 (add-hook 'ibuffer-mode-hook (lambda () (ibuffer-switch-to-saved-filter-groups "default")))
 
-(provide 'config-ibuffer-filter-groups)
+(provide 'init-ibuffer-filter-groups)
diff --git a/config/ibuffer/config-ibuffer-human-readable-size.el b/init/ibuffer/init-ibuffer-human-readable-size.el
similarity index 90%
rename from config/ibuffer/config-ibuffer-human-readable-size.el
rename to init/ibuffer/init-ibuffer-human-readable-size.el
index 5cec3a9..6d62521 100644
--- a/config/ibuffer/config-ibuffer-human-readable-size.el
+++ b/init/ibuffer/init-ibuffer-human-readable-size.el
@@ -13,4 +13,4 @@
      (t
       (format "%sB" size)))))
        
-(provide 'config-ibuffer-human-readable-size)
+(provide 'init-ibuffer-human-readable-size)
diff --git a/config/ibuffer/config-ibuffer-never-show.el b/init/ibuffer/init-ibuffer-never-show.el
similarity index 77%
rename from config/ibuffer/config-ibuffer-never-show.el
rename to init/ibuffer/init-ibuffer-never-show.el
index d9c0e2c..0cf8db2 100644
--- a/config/ibuffer/config-ibuffer-never-show.el
+++ b/init/ibuffer/init-ibuffer-never-show.el
@@ -1,4 +1,4 @@
-(defvar config-ibuffer-never-show '("^\\*Messages\\*$"
+(defvar init-ibuffer-never-show '("^\\*Messages\\*$"
                                     "^\\*Help\\*$"
                                     "^\\*Completions\\*$"
                                     "^\\*Backtrace\\*$"
@@ -8,6 +8,6 @@
 
 (mapc (lambda (p)
         (add-to-list 'ibuffer-never-show-predicates p))
-      config-ibuffer-never-show)
+      init-ibuffer-never-show)
 
-(provide 'config-ibuffer-never-show)
+(provide 'init-ibuffer-never-show)
diff --git a/config/ibuffer/config-ibuffer.el b/init/ibuffer/init-ibuffer.el
similarity index 75%
rename from config/ibuffer/config-ibuffer.el
rename to init/ibuffer/init-ibuffer.el
index 5907510..209328c 100644
--- a/config/ibuffer/config-ibuffer.el
+++ b/init/ibuffer/init-ibuffer.el
@@ -1,8 +1,8 @@
 (require 'ibuffer)
 (require 'ibuf-ext)
-(require 'config-ibuffer-human-readable-size)
-(require 'config-ibuffer-never-show)
-(require 'config-ibuffer-filter-groups)
+(require 'init-ibuffer-human-readable-size)
+(require 'init-ibuffer-never-show)
+(require 'init-ibuffer-filter-groups)
 
 (setq ibuffer-display-summary nil
       ibuffer-expert t)
@@ -19,4 +19,4 @@
               (name 16 -1)
               " " filename)))
       
-(provide 'config-ibuffer)
+(provide 'init-ibuffer)
diff --git a/config/keys/config-keys.el b/init/keys/init-keys.el
similarity index 94%
rename from config/keys/config-keys.el
rename to init/keys/init-keys.el
index 286521c..4bbaa5e 100644
--- a/config/keys/config-keys.el
+++ b/init/keys/init-keys.el
@@ -9,4 +9,4 @@
 (global-set-key   (kbd "C-x k")     'kill-buffer)
 (global-set-key   (kbd "C-x C-b")   'ibuffer)
 
-(provide 'config-keys)
+(provide 'init-keys)
diff --git a/config/lsp-mode/config-lsp-mode-disable-install-server.el b/init/lsp-mode/init-lsp-mode-disable-install-server.el
similarity index 51%
rename from config/lsp-mode/config-lsp-mode-disable-install-server.el
rename to init/lsp-mode/init-lsp-mode-disable-install-server.el
index 7a3c415..ed5e73a 100644
--- a/config/lsp-mode/config-lsp-mode-disable-install-server.el
+++ b/init/lsp-mode/init-lsp-mode-disable-install-server.el
@@ -1,40 +1,40 @@
 (setq lsp-server-install-dir "/somewhere/that/doesnt/exist")
 
-(defun config-lsp-mode-disable-install-server-error ()
+(defun init-lsp-mode-disable-install-server-error ()
   (error "lsp-mode server install features have been disabled"))
 
 (advice-add 'lsp-install-server
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
 
 (advice-add 'lsp-update-server
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
 
 (advice-add 'lsp-update-servers
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
 
 (advice-add 'lsp-download-install
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
 
 (advice-add 'lsp-download-path
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
 
 (advice-add 'lsp-async-start-process
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
 
 (advice-add 'lsp--download-status
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
 
 (advice-add 'lsp--install-server-internal
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
 
 (advice-add 'lsp--npm-dependency-install
             :around
-            'config-lsp-mode-disable-install-server-error)
+            'init-lsp-mode-disable-install-server-error)
diff --git a/config/lsp-mode/config-lsp-mode.el b/init/lsp-mode/init-lsp-mode.el
similarity index 85%
rename from config/lsp-mode/config-lsp-mode.el
rename to init/lsp-mode/init-lsp-mode.el
index a42498e..f77e503 100644
--- a/config/lsp-mode/config-lsp-mode.el
+++ b/init/lsp-mode/init-lsp-mode.el
@@ -14,6 +14,6 @@
       lsp-rls-server-command nil
       lsp-enable-suggest-server-download nil)
 
-(load "config-lsp-mode-disable-install-server")
+(load "init-lsp-mode-disable-install-server")
 
-(provide 'config-lsp-mode)
+(provide 'init-lsp-mode)
diff --git a/config/man/config-man.el b/init/man/init-man.el
similarity index 60%
rename from config/man/config-man.el
rename to init/man/init-man.el
index b4c5060..521f491 100644
--- a/config/man/config-man.el
+++ b/init/man/init-man.el
@@ -1,3 +1,3 @@
 (setq Man-notify-method 'pushy)
 
-(provide 'config-man)
+(provide 'init-man)
diff --git a/config/native-comp/config-native-comp.el b/init/native-comp/init-native-comp.el
similarity index 75%
rename from config/native-comp/config-native-comp.el
rename to init/native-comp/init-native-comp.el
index c44a984..9ae0489 100644
--- a/config/native-comp/config-native-comp.el
+++ b/init/native-comp/init-native-comp.el
@@ -1,3 +1,3 @@
 (setq native-comp-async-jobs-number (string-to-number (shell-command-to-string "nproc")))
 
-(provide 'config-native-comp)
+(provide 'init-native-comp)
diff --git a/config/package/config-package.el b/init/package/init-package.el
similarity index 71%
rename from config/package/config-package.el
rename to init/package/init-package.el
index d3be495..3e2129d 100644
--- a/config/package/config-package.el
+++ b/init/package/init-package.el
@@ -1,4 +1,4 @@
 (setq package-archives nil
       package-check-signature 'all)
 
-(provide 'config-package)
+(provide 'init-package)
diff --git a/config/prog-mode/config-prog-mode-hooks.el b/init/prog-mode/init-prog-mode-hooks.el
similarity index 100%
rename from config/prog-mode/config-prog-mode-hooks.el
rename to init/prog-mode/init-prog-mode-hooks.el
diff --git a/init/prog-mode/init-prog-mode.el b/init/prog-mode/init-prog-mode.el
new file mode 100644
index 0000000..eec9811
--- /dev/null
+++ b/init/prog-mode/init-prog-mode.el
@@ -0,0 +1,5 @@
+(require 'init-text-mode)
+
+(load "init-prog-mode-hooks")
+
+(provide 'init-prog-mode)
diff --git a/config/project/config-project-find-rust-projects.el b/init/project/init-project-find-rust-projects.el
similarity index 100%
rename from config/project/config-project-find-rust-projects.el
rename to init/project/init-project-find-rust-projects.el
diff --git a/init/project/init-project.el b/init/project/init-project.el
new file mode 100644
index 0000000..2e83d81
--- /dev/null
+++ b/init/project/init-project.el
@@ -0,0 +1,3 @@
+(load "init-project-find-rust-projects")
+
+(provide 'init-project)
diff --git a/config/recentf/config-recentf.el b/init/recentf/init-recentf.el
similarity index 72%
rename from config/recentf/config-recentf.el
rename to init/recentf/init-recentf.el
index 3b7466a..293db0d 100644
--- a/config/recentf/config-recentf.el
+++ b/init/recentf/init-recentf.el
@@ -1,4 +1,4 @@
 (setq recentf-max-menu-items 25
       recentf-max-saved-items 25)
 
-(provide 'config-recentf)
+(provide 'init-recentf)
diff --git a/config/savehist/config-savehist.el b/init/savehist/init-savehist.el
similarity index 90%
rename from config/savehist/config-savehist.el
rename to init/savehist/init-savehist.el
index 7a1cc40..7e6e311 100644
--- a/config/savehist/config-savehist.el
+++ b/init/savehist/init-savehist.el
@@ -8,4 +8,4 @@
 (unless (file-exists-p savehist-file)
   (make-empty-file savehist-file))
 
-(provide 'config-savehist)
+(provide 'init-savehist)
diff --git a/config/text-mode/config-text-mode-hooks.el b/init/text-mode/init-text-mode-hooks.el
similarity index 100%
rename from config/text-mode/config-text-mode-hooks.el
rename to init/text-mode/init-text-mode-hooks.el
diff --git a/init/text-mode/init-text-mode.el b/init/text-mode/init-text-mode.el
new file mode 100644
index 0000000..4318c95
--- /dev/null
+++ b/init/text-mode/init-text-mode.el
@@ -0,0 +1,3 @@
+(load "init-text-mode-hooks")
+
+(provide 'init-text-mode)
diff --git a/config/tramp/config-tramp-connection-properties.el b/init/tramp/init-tramp-connection-properties.el
similarity index 100%
rename from config/tramp/config-tramp-connection-properties.el
rename to init/tramp/init-tramp-connection-properties.el
diff --git a/config/tramp/config-tramp-sudo-hang-fix.el b/init/tramp/init-tramp-sudo-hang-fix.el
similarity index 100%
rename from config/tramp/config-tramp-sudo-hang-fix.el
rename to init/tramp/init-tramp-sudo-hang-fix.el
diff --git a/config/tramp/config-tramp.el b/init/tramp/init-tramp.el
similarity index 52%
rename from config/tramp/config-tramp.el
rename to init/tramp/init-tramp.el
index e50ff1d..aad0582 100644
--- a/config/tramp/config-tramp.el
+++ b/init/tramp/init-tramp.el
@@ -4,7 +4,7 @@
       password-cache-expiry 0
       tramp-persistency-file-name nil)
 
-(load "config-tramp-connection-properties")
-(load "config-tramp-sudo-hang-fix")
+(load "init-tramp-connection-properties")
+(load "init-tramp-sudo-hang-fix")
 
-(provide 'config-tramp)
+(provide 'init-tramp)
diff --git a/load-config.el b/load-config.el
index 231787d..e69de29 100644
--- a/load-config.el
+++ b/load-config.el
@@ -1,56 +0,0 @@
-(let ((config-directory (file-name-concat user-emacs-directory "config")))
-  (add-to-list 'load-path (file-name-concat config-directory "company"))
-  (add-to-list 'load-path (file-name-concat config-directory "conf-mode"))
-  (add-to-list 'load-path (file-name-concat config-directory "dired"))
-  (add-to-list 'load-path (file-name-concat config-directory "display-buffer"))
-  (add-to-list 'load-path (file-name-concat config-directory "eglot"))
-  (add-to-list 'load-path (file-name-concat config-directory "eldoc"))
-  (add-to-list 'load-path (file-name-concat config-directory "electric"))
-  (add-to-list 'load-path (file-name-concat config-directory "flycheck"))
-  (add-to-list 'load-path (file-name-concat config-directory "flymake"))
-  (add-to-list 'load-path (file-name-concat config-directory "garbage-collection"))
-  (add-to-list 'load-path (file-name-concat config-directory "ibuffer"))
-  (add-to-list 'load-path (file-name-concat config-directory "keys"))
-  (add-to-list 'load-path (file-name-concat config-directory "man"))
-  (add-to-list 'load-path (file-name-concat config-directory "lsp-mode"))
-  (add-to-list 'load-path (file-name-concat config-directory "native-comp"))
-  (add-to-list 'load-path (file-name-concat config-directory "package"))
-  (add-to-list 'load-path (file-name-concat config-directory "prog-mode"))
-  (add-to-list 'load-path (file-name-concat config-directory "project"))
-  (add-to-list 'load-path (file-name-concat config-directory "recentf"))
-  (add-to-list 'load-path (file-name-concat config-directory "savehist"))
-  (add-to-list 'load-path (file-name-concat config-directory "text-mode"))
-  (add-to-list 'load-path (file-name-concat config-directory "tramp")))
-
-(require 'config-text-mode)
-(require 'config-conf-mode)
-(require 'config-prog-mode)
-(require 'config-dired)
-(require 'config-display-buffer)
-(require 'config-eldoc)
-(require 'config-electric)
-(require 'config-flymake)
-(require 'config-garbage-collection)
-(require 'config-ibuffer)
-(require 'config-keys)
-(require 'config-man)
-(require 'config-package)
-(require 'config-project)
-(require 'config-recentf)
-(require 'config-savehist)
-(require 'config-tramp)
-
-(when (locate-library "company")
-  (require 'config-company))
-
-(when (locate-library "eglot")
-  (require 'config-eglot))
-
-(when (locate-library "flycheck")
-  (require 'config-flycheck))
-
-(when (locate-library "lsp-mode")
-  (require 'config-lsp-mode))
-
-(when (and (> emacs-major-version 28) (native-comp-available-p))
-  (require 'config-native-comp))
diff --git a/load-lisp.el b/load-lisp.el
index bfad1ad..e69de29 100644
--- a/load-lisp.el
+++ b/load-lisp.el
@@ -1,4 +0,0 @@
-(let ((local-lisp-directory (file-name-concat user-emacs-directory "lisp")))
-  (add-to-list 'load-path (file-name-concat local-lisp-directory "man-wrapper")))
-
-(require 'man-wrapper)