diff --git a/core/siren-modules.el b/core/siren-modules.el
index 79e09ac..0cb848e 100644
--- a/core/siren-modules.el
+++ b/core/siren-modules.el
@@ -17,7 +17,6 @@
 
 ;; Completion
 (require 'siren-company)
-(require 'siren-lsp)
 
 ;; Debugging
 (require 'siren-realgud)
@@ -73,6 +72,11 @@
 (require 'siren-neotree)
 (require 'siren-projectile)
 
+;; Language Servers
+(require 'siren-lsp)
+(require 'siren-lsp-ui)
+(require 'siren-company-lsp)
+
 ;; Spelling
 (require 'siren-flyspell)
 
diff --git a/modules/lsp/siren-company-lsp.el b/modules/lsp/siren-company-lsp.el
new file mode 100644
index 0000000..c4d873c
--- /dev/null
+++ b/modules/lsp/siren-company-lsp.el
@@ -0,0 +1,16 @@
+;;; siren-company-lsp.el --- jimeh's Emacs Siren: company-lsp configuration.
+
+;;; Commentary:
+
+;; Basic configuration for company-lsp.
+
+;;; Code:
+
+(require 'siren-company)
+(require 'siren-lsp)
+
+(use-package company-lsp
+  :commands company-lsp)
+
+(provide 'siren-company-lsp)
+;;; siren-company-lsp.el ends here
diff --git a/modules/lsp/siren-lsp-ui.el b/modules/lsp/siren-lsp-ui.el
new file mode 100644
index 0000000..e207337
--- /dev/null
+++ b/modules/lsp/siren-lsp-ui.el
@@ -0,0 +1,19 @@
+;;; siren-lsp-ui.el --- jimeh's Emacs Siren: lsp-ui configuration.
+
+;;; Commentary:
+
+;; Basic configuration for lsp-ui.
+
+;;; Code:
+
+(require 'siren-lsp)
+
+(use-package lsp-ui
+  :commands lsp-ui-mode
+  :hook (lsp-mode . lsp-ui-mode)
+  :config
+  (setq  lsp-ui-doc-enable nil
+         lsp-ui-sideline-enable nil))
+
+(provide 'siren-lsp-ui)
+;;; siren-lsp-ui.el ends here
diff --git a/modules/completion/siren-lsp.el b/modules/lsp/siren-lsp.el
similarity index 59%
rename from modules/completion/siren-lsp.el
rename to modules/lsp/siren-lsp.el
index 35dae01..28c1687 100644
--- a/modules/completion/siren-lsp.el
+++ b/modules/lsp/siren-lsp.el
@@ -6,20 +6,11 @@
 
 ;;; Code:
 
-(require 'siren-company)
-
 (use-package lsp-mode
+  :commands lsp
   :config
   (require 'lsp-clients)
   (setq lsp-eldoc-render-all nil))
 
-(use-package company-lsp)
-
-(use-package lsp-ui
-  :hook (lsp-mode . lsp-ui-mode)
-  :config
-  (setq  lsp-ui-doc-enable nil
-         lsp-ui-sideline-enable nil))
-
 (provide 'siren-lsp)
 ;;; siren-lsp.el ends here