diff --git a/core/core-autoload.el b/core/core-autoload.el
deleted file mode 100644
index 94e5697e3..000000000
--- a/core/core-autoload.el
+++ /dev/null
@@ -1,6 +0,0 @@
-;;; core-autoload.el
-
-
-
-(provide 'core-autoload)
-;;; core-autoload.el ends here
diff --git a/core/core-dashboard.el b/core/core-dashboard.el
deleted file mode 100644
index 62b3ec13a..000000000
--- a/core/core-dashboard.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;;; core-dashboard.el
-
-(setq initial-major-mode 'doom-mode
-      initial-scratch-message "\n  Loading..."
-      inhibit-startup-screen t
-      ;; shuts up emacs at startup
-      inhibit-startup-echo-area-message user-login-name)
-
-(define-derived-mode doom-mode special-mode
-  (concat "v" doom-version)
-  "Major mode for DOOM buffers.")
-
-(define-derived-mode doom-dashboard-mode doom-mode
-  (concat "v" doom-version)
-  "Major mode for DOOM buffers.")
-
-(defvar doom-dashboard-buffer value
-  "")
-
-(defvar doom-dashboard-buffer-name " *doom*"
-  "")
-
-(defvar doom-dashboard--edited nil
-  "")
-
-(defvar doom-dashboard-inhibit-reload nil
-  "")
-
-(defvar doom-dashboard-mode-line-format (assq 'minimal doom-modeline-formats)
-  "")
-
-(provide 'core-dashboard)
-;;; core-dashboard.el ends here
diff --git a/core/core-debug.el b/core/core-debug.el
deleted file mode 100644
index 8fa369c71..000000000
--- a/core/core-debug.el
+++ /dev/null
@@ -1,41 +0,0 @@
-;;; custom-debug.el --- debugging with `realgud'
-
-(after! debug
-  ;; For elisp debugging
-  (map! :map debugger-mode-map
-        :n "RET" 'debug-help-follow
-        :n "n" 'debugger-step-through
-        :n "c" 'debugger-continue))
-
-(use-package realgud
-  :commands (realgud:gdb realgud:trepanjs realgud:bashdb realgud:zshdb)
-  :config
-  (map! :map realgud:shortkey-mode-map
-        :n "j" 'evil-next-line
-        :n "k" 'evil-previous-line
-        :n "h" 'evil-backward-char
-        :n "l" 'evil-forward-char
-        :m "n" 'realgud:cmd-next
-        :m "b" 'realgud:cmd-break
-        :m "B" 'realgud:cmd-clear
-        :n "c" 'realgud:cmd-continue)
-
-  ;; Popup rules
-  (def-popup! "\\`\\*\\(g\\|zsh\\|bash\\)db.*?\\*\\'" :size 20 :regexp t)
-  (def-popup! "\\`\\*trepanjs.*?\\*\\'"               :size 20 :regexp t)
-
-  ;; Temporary Ex commands for the debugger
-  (def-tmp-excmd! doom:def-debug-on doom:def-debug-off
-    ("n[ext]" . realgud:cmd-next)
-    ("s[tep]" . realgud:cmd-step)
-    ("b[reak]" . doom:debug-toggle-breakpoint)
-    ("c[ontinue]" . realgud:cmd-continue))
-
-  ;; TODO does this work with shackle?
-  (advice-add 'realgud-cmdbuf-init :after 'doom:def-debug-on)
-  (advice-add 'realgud:cmd-quit :after 'doom:def-debug-off)
-  ;; Monkey-patch `realgud:run-process' to run in a popup.
-  (advice-add 'realgud:run-process :override 'doom*realgud:run-process))
-
-(provide 'custom-debug)
-;;; custom-debug.el ends here
diff --git a/core/core-sessions.el b/core/core-sessions.el
deleted file mode 100644
index 72245346c..000000000
--- a/core/core-sessions.el
+++ /dev/null
@@ -1,6 +0,0 @@
-;;; core-sessions.el
-
-;; TODO
-
-(provide 'core-sessions)
-;;; core-sessions.el ends here
diff --git a/core/core-settings.el b/core/core-set.el
similarity index 63%
rename from core/core-settings.el
rename to core/core-set.el
index 86583ee16..d58fd354f 100644
--- a/core/core-settings.el
+++ b/core/core-set.el
@@ -1,9 +1,13 @@
-;;; core-settings.el --- centralized inter-package configuration
+;;; core-set.el --- centralized inter-package configuration
 
 (defvar doom-settings '()
   "docstring")
 
-(defun doom-define-setting (name &optional docs &rest args))
+(defun doom-define-setting (name &optional docs &rest args)
+  (declare (indent defun)))
+
+(defun doom-set (mode key value)
+  (declare (indent defun)))
 
 (defmacro config! (package-name &rest args)
   (declare (indent defun))
@@ -15,8 +19,5 @@
 
 (defmacro set! (&rest args))
 
-(defun doom-set (mode key value)
-  (declare (indent defun)))
-
-(provide 'core-settings)
-;;; core-settings.el ends here
+(provide 'core-set)
+;;; core-set.el ends here
diff --git a/core/core.el b/core/core.el
index e15a4a582..6e958c82b 100644
--- a/core/core.el
+++ b/core/core.el
@@ -149,22 +149,21 @@ enable multiple minor modes for the same regexp.")
   (package! smex :commands smex)
 
   ;;; Let 'er rip! (order matters!)
-  ;; (require 'core-settings)        ; configuration management system
-  ;; (require 'core-popups)          ; taming sudden yet inevitable windows
-  (require 'core-evil)            ; come to the dark side, we have cookies
+  ;; (require 'core-set)           ; configuration management system
+  ;; (require 'core-popups)        ; taming sudden yet inevitable windows
+  (require 'core-evil)             ; come to the dark side, we have cookies
   ;; (require 'core-project)
   ;; (require 'core-os)
   ;; (require 'core-ui)
   ;; (require 'core-modeline)
   ;; (require 'core-editor)
   ;; (require 'core-completion)
-  ;; (require 'core-syntax-checking)
-  ;; (require 'core-snippets)
+  ;; (require 'core-jump)
   ;; (require 'core-repl)
-  ;; (require 'core-sessions)
-  ;; (require 'core-workspaces)
+  ;; (require 'core-snippets)
+  ;; (require 'core-syntax-checking)
   ;; (require 'core-vcs)
-  ;; (require 'core-dashboard)
+  ;; (require 'core-workspaces)
 
   (unless (require 'autoloads nil t)
     (doom/refresh-autoloads t)))