diff --git a/.emacs.d/include/priime-completion.el b/.emacs.d/include/priime-completion.el
new file mode 100644
index 0000000..153bf35
--- /dev/null
+++ b/.emacs.d/include/priime-completion.el
@@ -0,0 +1,40 @@
+;;; priime-completion.el --- Completion configuration
+;;; Commentary:
+;; Provides configuration for completion-related packages.
+;;; Code:
+
+(use-package corfu :straight t
+  :custom
+  (completion-styles '(orderless basic))
+  (completion-category-overrides '((file (styles partial-completion))))
+  (corfu-auto t)
+  (corfu-popupinfo-delay 1)
+  :bind (:map corfu-map
+              ("C-n"   . corfu-next)
+              ("C-p"   . corfu-previous)
+              ("<tab>" . corfu-insert)
+              ("RET"   . nil))
+  :init
+  (global-corfu-mode)
+  (corfu-popupinfo-mode))
+(use-package cape :straight t
+  :bind ("M-p" . cape-prefix-map)
+  :init
+  (add-hook 'completion-at-point-functions #'cape-dabbrev)
+  (add-hook 'completion-at-point-functions #'cape-file)
+  (add-hook 'completion-at-point-functions #'cape-elisp-block)
+  (add-hook 'completion-at-point-functions #'cape-keyword))
+(use-package vertico :straight t
+  :init
+  (add-hook 'after-init-hook 'vertico-mode))
+(use-package marginalia :straight t
+  :init
+  (add-hook 'after-init-hook 'marginalia-mode))
+(use-package orderless :straight t)
+(use-package consult :straight t)
+(use-package yasnippet :straight t)
+(use-package yasnippet-snippets :straight t)
+
+(provide 'priime-completion)
+
+;;; priime-completion.el ends here
diff --git a/.emacs.d/include/priime-convenience.el b/.emacs.d/include/priime-convenience.el
new file mode 100644
index 0000000..5696e04
--- /dev/null
+++ b/.emacs.d/include/priime-convenience.el
@@ -0,0 +1,34 @@
+;;; priime-convenience.el --- Convenience packages configuration
+;;; Commentary:
+;; Provides configuration for convenient packages that improve
+;; development experience and productivity.
+;;; Code:
+
+(use-package projectile :straight t
+  :custom
+  (projectile-completion-system 'auto))
+(use-package bufler :straight t
+  :bind (("C-x C-b" . bufler-list)
+         ("C-x b" . bufler-switch-buffer))
+  :init
+  (bufler-mode 1))
+(use-package embark :straight t
+  :bind (("C-." . embark-act)))
+(use-package embark-consult :straight t)
+(use-package wgrep :straight t)
+(use-package no-littering :straight t)
+(use-package vterm :straight t)
+(use-package rg :straight t)
+(use-package anzu :straight t
+  :init
+  (add-hook 'after-init-hook 'global-anzu-mode))
+(use-package pdf-tools
+  :straight
+  '(pdf-tools :type git :host github
+              :repo "vedang/pdf-tools"))
+(use-package olivetti :straight t
+  :hook (org-mode . olivetti-mode))
+
+(provide 'priime-convenience)
+
+;;; priime-convenience.el ends here
diff --git a/.emacs.d/include/priime-edit.el b/.emacs.d/include/priime-edit.el
new file mode 100644
index 0000000..6cfce90
--- /dev/null
+++ b/.emacs.d/include/priime-edit.el
@@ -0,0 +1,33 @@
+;;; priime-edit.el --- Edit configuration
+;;; Commentary:
+;; Provides configuration for edit-related packages, including
+;; syntax-checking and formatting.
+;;; Code:
+
+(use-package meow :straight t
+  :init
+  (meow-global-mode)
+  (meow-setup-indicator))
+(use-package flycheck :straight t
+  :custom
+  (flycheck-check-syntax-automatically '(save mode-enable))
+  :init
+  (add-hook 'after-init-hook 'global-flycheck-mode))
+(use-package paredit :straight t
+  :bind (("M-<backspace>" . #'backward-kill-sexp)
+         ("M-k" . #'kill-sexp))
+  :hook ((emacs-lisp-mode scheme-mode clojure-mode lisp-mode)
+         . paredit-mode))
+(use-package undo-tree :straight t
+  :custom
+  (undo-tree-auto-save-history nil)
+  :config
+  (global-undo-tree-mode))
+(use-package format-all :straight t
+  :bind ("C-c f" . format-all-region-or-buffer))
+(use-package ws-butler :straight t
+  :hook (prog-mode . ws-butler-mode))
+
+(provide 'priime-edit)
+
+;;; priime-edit.el ends here
diff --git a/.emacs.d/include/priime-elisp.el b/.emacs.d/include/priime-elisp.el
new file mode 100644
index 0000000..68a5358
--- /dev/null
+++ b/.emacs.d/include/priime-elisp.el
@@ -0,0 +1,15 @@
+;;; priime-elisp.el --- Elisp configuration
+;;; Commentary:
+;; Provides configuration for Elisp-related libraries and functions
+;;; Code:
+
+(require 'straight)
+
+(use-package s :straight t)
+(use-package f :straight t)
+(use-package dash :straight t)
+(straight-use-package 'emacs-async)
+
+(provide 'priime-elisp)
+
+;;; priime-elisp.el ends here
diff --git a/.emacs.d/include/priime-languages.el b/.emacs.d/include/priime-languages.el
new file mode 100644
index 0000000..d14623b
--- /dev/null
+++ b/.emacs.d/include/priime-languages.el
@@ -0,0 +1,47 @@
+;;; priime-languages.el --- Programming language package configuration
+;;; Commentary:
+;; Provides configuration for programming language packages.
+;;; Code:
+
+(use-package racket-mode :straight t
+  :hook
+  ((racket-mode . racket-xp-mode)
+   (racket-mode . paredit-mode)))
+(use-package rust-mode :straight t
+  :hook (rust-mode . eglot))
+(use-package rustic :straight t)
+
+(use-package markdown-mode :straight t
+  :custom-face
+  (markdown-inline-code-face ((t (:inherit nano-salient)))))
+(use-package rjsx-mode :straight t)
+(use-package just-mode :straight t)
+(use-package justl :straight t
+  :bind (("C-c j" . #'justl-recipes)))
+(use-package scribble-mode :straight t)
+(use-package auctex :straight t)
+(use-package cdlatex :straight t)
+(use-package yaml-mode :straight t)
+(use-package poetry :straight t)
+(use-package sly :straight t)
+(use-package haskell-mode :straight t)
+(use-package llvm-mode
+  :straight
+  '(llvm-mode :type git :host github
+              :repo "nverno/llvm-mode"))
+(use-package clojure-mode :straight t)
+(use-package tuareg :straight t)
+(use-package utop :straight t)
+(use-package dune :straight t)
+(use-package flycheck-ocaml :straight t)
+(use-package merlin-eldoc :straight t)
+(use-package ocamlformat :straight t)
+(use-package elixir-mode :straight t)
+(use-package inf-elixir :straight t)
+(use-package nix-mode :straight t)
+(use-package irony :straight t
+  :hook ((c++-mode c-mode) . irony-mode))
+
+(provide 'priime-languages)
+
+;;; priime-languages.el ends here
diff --git a/.emacs.d/include/priime-lsp.el b/.emacs.d/include/priime-lsp.el
new file mode 100644
index 0000000..f15d5f4
--- /dev/null
+++ b/.emacs.d/include/priime-lsp.el
@@ -0,0 +1,16 @@
+;;; priime-lsp.el --- LSP configuration
+;;; Commentary:
+;; Provides configuration for LSP-related packages.
+;;; Code:
+
+(use-package eglot :straight t
+  :custom-face (eglot-inlay-hint-face ((t (:height 1.0))))
+  :hook ((racket-mode rust-mode irony-mode) . eglot-ensure))
+(use-package eldoc :straight t
+  :after (eglot))
+(use-package eldoc-box :straight t
+  :after (eldoc))
+
+(provide 'priime-lsp)
+
+;;; priime-lsp.el ends here
diff --git a/.emacs.d/include/priime-org.el b/.emacs.d/include/priime-org.el
new file mode 100644
index 0000000..378905f
--- /dev/null
+++ b/.emacs.d/include/priime-org.el
@@ -0,0 +1,31 @@
+;;; priime-org.el --- Org-mode configuration
+;;; Commentary:
+;; Provides configuration for org-related packages.
+;;; Code:
+
+(use-package org :straight t)
+(use-package org-roam :straight t
+  :after (org))
+(use-package org-modern :straight t
+  :after (org)
+  :hook (org-mode . org-modern-mode)
+  :custom
+  (org-modern-star 'fold))
+(use-package org-modern-indent
+  :straight
+  '(org-modern-indent
+    :type git
+    :host github
+    :repo "jdtsmith/org-modern-indent")
+  :after (org-modern)
+  :hook (org-mode . org-modern-indent-mode))
+(use-package ob-racket
+  :straight
+  '(ob-racket
+    :type git
+    :host github
+    :repo "hasu/emacs-ob-racket"))
+
+(provide 'priime-org)
+
+;;; priime-org.el ends here
diff --git a/.emacs.d/include/priime-ui.el b/.emacs.d/include/priime-ui.el
new file mode 100644
index 0000000..3c4f892
--- /dev/null
+++ b/.emacs.d/include/priime-ui.el
@@ -0,0 +1,29 @@
+;;; priime-ui.el --- UI configuration
+;;; Commentary:
+;; Provides configuration for the UI.
+;;; Code:
+
+(use-package nano-theme
+  :straight '(nano-theme :type git :host github
+                         :repo "rougier/nano-theme"))
+(use-package all-the-icons :straight t)
+(use-package neotree :straight t
+  :after (all-the-icons)
+  :custom
+  ((neo-theme 'icons)
+   (neo-smart-open t)
+   (neo-window-fixed-size nil)
+   (neo-show-hidden-files t))
+  :bind (("C-c t" . #'neotree-toggle-dir-or-project)))
+(use-package git-gutter :straight t
+  :hook (prog-mode . git-gutter-mode)
+  :custom
+  (git-gutter:update-interval 1)
+  :config
+  (git-gutter:start-update-timer))
+(use-package hl-todo :straight t
+  :hook (prog-mode . hl-todo-mode))
+
+(provide 'priime-ui)
+
+;;; priime-ui.el ends here
diff --git a/.emacs.d/include/priime-vc.el b/.emacs.d/include/priime-vc.el
new file mode 100644
index 0000000..686b571
--- /dev/null
+++ b/.emacs.d/include/priime-vc.el
@@ -0,0 +1,14 @@
+;;; priime-vc.el --- Version control configuration
+;;; Commentary:
+;; Provides configuration for Magit.
+;;; Code:
+
+(use-package magit :straight t
+  :bind (("<f5>" . magit-status)
+         ("C-x g" . magit-status)))
+(use-package forge :straight t
+  :after (magit))
+
+(provide 'priime-vc)
+
+;;; priime-vc.el ends here
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 9a9f9f5..da7f811 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -3,7 +3,7 @@
 ;;    Base configuration.
 ;;; Code:
 
-;; ====== Packages ===========================
+;;; Straight and Packages
 
 (defvar bootstrap-version)
 (let ((bootstrap-file
@@ -18,206 +18,18 @@
       (eval-print-last-sexp)))
   (load bootstrap-file nil 'nomessage))
 
-;;; Elisp
-(use-package s :straight t)
-(use-package f :straight t)
-(use-package dash :straight t)
-(straight-use-package 'emacs-async)
-
-;;; LSP
-;; For some reason, eglot-related configuration MUST be put here, or
-;; else it will complain about the following error:
-;;     Feature provided by other file: project
-(use-package eglot :straight t
-  :custom-face (eglot-inlay-hint-face ((t (:height 1.0))))
-  :hook ((racket-mode rust-mode irony-mode) . eglot-ensure))
-(use-package eldoc :straight t
-  :after (eglot))
-(use-package eldoc-box :straight t
-  :after (eldoc))
-
-;;; Completion
-(use-package corfu :straight t
-  :custom
-  (completion-styles '(orderless basic))
-  (completion-category-overrides '((file (styles partial-completion))))
-  (corfu-auto t)
-  (corfu-popupinfo-delay 1)
-  :bind (:map corfu-map
-              ("C-n"   . corfu-next)
-              ("C-p"   . corfu-previous)
-              ("<tab>" . corfu-insert)
-              ("RET"   . nil))
-  :init
-  (global-corfu-mode)
-  (corfu-popupinfo-mode))
-(use-package cape :straight t
-  :bind ("M-p" . cape-prefix-map)
-  :init
-  (add-hook 'completion-at-point-functions #'cape-dabbrev)
-  (add-hook 'completion-at-point-functions #'cape-file)
-  (add-hook 'completion-at-point-functions #'cape-elisp-block)
-  (add-hook 'completion-at-point-functions #'cape-keyword))
-(use-package vertico            :straight t
-  :init
-  (add-hook 'after-init-hook 'vertico-mode))
-(use-package marginalia         :straight t
-  :init
-  (add-hook 'after-init-hook 'marginalia-mode))
-(use-package orderless          :straight t)
-(use-package consult            :straight t)
-(use-package yasnippet          :straight t)
-(use-package yasnippet-snippets :straight t)
-
-;;; Syntax checking and editing, and formatting
-(use-package meow :straight t
-  :init
-  (meow-global-mode)
-  (meow-setup-indicator))
-(use-package flycheck :straight t
-  :custom
-  (flycheck-check-syntax-automatically '(save mode-enable))
-  :init
-  (add-hook 'after-init-hook 'global-flycheck-mode))
-(use-package paredit :straight t
-  :bind (("M-<backspace>" . #'backward-kill-sexp)
-         ("M-k" . #'kill-sexp))
-  :hook ((emacs-lisp-mode scheme-mode clojure-mode lisp-mode)
-         . paredit-mode))
-(use-package undo-tree :straight t
-  :custom
-  (undo-tree-auto-save-history nil)
-  :config
-  (global-undo-tree-mode))
-(use-package format-all :straight t
-  :bind ("C-c f" . format-all-region-or-buffer))
-(use-package ws-butler :straight t
-  :hook (prog-mode . ws-butler-mode))
-
-;;; Convenience
-(use-package projectile :straight t
-  :custom
-  (projectile-completion-system 'auto))
-(use-package bufler :straight t
-  :bind (("C-x C-b" . bufler-list)
-         ("C-x b" . bufler-switch-buffer))
-  :init
-  (bufler-mode 1))
-(use-package embark :straight t
-  :bind (("C-." . embark-act)))
-(use-package embark-consult   :straight t)
-(use-package wgrep            :straight t)
-(use-package no-littering :straight t)
-
-;;; Version control
-(use-package magit :straight t
-  :bind (("<f5>" . magit-status)
-         ("C-x g" . magit-status)))
-(use-package forge :straight t
-  :after (magit))
-
-;;; UI
-(use-package neotree :straight t
-  :custom
-  ((neo-theme 'icons)
-   (neo-smart-open t)
-   (neo-window-fixed-size nil)
-   (neo-show-hidden-files t))
-  :bind (("C-c t" . #'neotree-toggle-dir-or-project)))
-(use-package all-the-icons :straight t)
-(use-package git-gutter :straight t
-  :hook (prog-mode . git-gutter-mode)
-  :custom
-  (git-gutter:update-interval 1)
-  :config
-  (git-gutter:start-update-timer))
-(use-package hl-todo        :straight t
-  :hook (prog-mode . hl-todo-mode))
-(use-package nano-theme
-  :straight '(nano-theme :type git :host github
-                         :repo "rougier/nano-theme"))
-
-;;; Org
-(use-package org        :straight t)
-(use-package org-roam   :straight t
-  :after (org))
-(use-package org-modern :straight t
-  :after (org)
-  :hook (org-mode . org-modern-mode)
-  :custom
-  (org-modern-star 'fold))
-(use-package org-modern-indent
-  :straight
-  '(org-modern-indent
-    :type git
-    :host github
-    :repo "jdtsmith/org-modern-indent")
-  :after (org-modern)
-  :hook (org-mode . org-modern-indent-mode))
-(use-package ob-racket
-  :straight
-  '(ob-racket
-    :type git
-    :host github
-    :repo "hasu/emacs-ob-racket"))
-
-;;; Productivity
-(use-package vterm :straight t)
-(use-package rg :straight t)
-(use-package anzu :straight t
-  :init
-  (add-hook 'after-init-hook 'global-anzu-mode))
-(use-package pdf-tools
-  :straight
-  '(pdf-tools :type git :host github
-              :repo "vedang/pdf-tools"))
-(use-package olivetti :straight t
-  :hook (org-mode . olivetti-mode))
-
-;;; Languages
-(use-package racket-mode :straight t
-  :hook
-  ((racket-mode . racket-xp-mode)
-   (racket-mode . paredit-mode)))
-(use-package rust-mode :straight t
-  :hook (rust-mode . eglot))
-(use-package rustic :straight t)
-
-(use-package markdown-mode :straight t
-  :custom-face
-  (markdown-inline-code-face ((t (:inherit nano-salient)))))
-(use-package rjsx-mode :straight t)
-(use-package just-mode :straight t)
-(use-package justl :straight t
-  :bind (("C-c j" . #'justl-recipes)))
-(use-package scribble-mode :straight t)
-(use-package auctex :straight t)
-(use-package cdlatex :straight t)
-(use-package yaml-mode :straight t)
-(use-package poetry :straight t)
-(use-package sly :straight t)
-(use-package haskell-mode :straight t)
-(use-package llvm-mode
-  :straight
-  '(llvm-mode :type git :host github
-              :repo "nverno/llvm-mode"))
-(use-package clojure-mode :straight t)
-(use-package tuareg :straight t)
-(use-package utop :straight t)
-(use-package dune :straight t)
-(use-package flycheck-ocaml :straight t)
-(use-package merlin-eldoc :straight t)
-(use-package ocamlformat :straight t)
-(use-package elixir-mode :straight t)
-(use-package inf-elixir :straight t)
-(use-package nix-mode :straight t)
-(use-package irony :straight t
-  :hook ((c++-mode c-mode) . irony-mode))
-
-
-;; ====== Custom =============================
 (add-to-list 'load-path "~/.emacs.d/include")
 
+(load-library "priime-elisp")
+(load-library "priime-lsp")
+(load-library "priime-completion")
+(load-library "priime-edit")
+(load-library "priime-convenience")
+(load-library "priime-vc")
+(load-library "priime-ui")
+(load-library "priime-org")
+(load-library "priime-languages")
+
 (load-library "general")
 (load-library "misc")
 (load-library "utils")