diff --git a/.gitmodules b/.gitmodules
index cb3fd9a..9b9d31e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,57 +1,57 @@
 [submodule "custom/mu"]
-	path = custom/mu
+	path = submodule/mu
 	url = https://github.com/djcb/mu
 [submodule "custom/youtube-dl-emacs"]
-	path = custom/youtube-dl-emacs
+	path = submodule/youtube-dl-emacs
 	url = https://github.com/skeeto/youtube-dl-emacs
 [submodule "custom/dired-plus"]
-	path = custom/dired-plus
+	path = submodule/dired-plus
 	url = https://github.com/emacsmirror/dired-plus
 [submodule "custom/bookmark-plus"]
-	path = custom/bookmark-plus
+	path = submodule/bookmark-plus
 	url = https://github.com/emacsmirror/bookmark-plus
 [submodule "custom/emacs-memoize"]
-	path = custom/emacs-memoize
+	path = submodule/emacs-memoize
 	url = https://github.com/skeeto/emacs-memoize
 [submodule "custom/exwm"]
-	path = custom/exwm
+	path = submodule/exwm
 	url = https://github.com/ch11ng/exwm
 [submodule "custom/xelb"]
-	path = custom/xelb
+	path = submodule/xelb
 	url = https://github.com/ch11ng/xelb
 [submodule "custom/org-fstree"]
-	path = custom/org-fstree
+	path = submodule/org-fstree
 	url = http://repo.or.cz/org-fstree.git
 [submodule "custom/ts.el"]
-	path = custom/ts.el
+	path = submodule/ts.el
 	url = https://github.com/alphapapa/ts.el
 [submodule "custom/eosd"]
-	path = custom/eosd
+	path = submodule/eosd
 	url = https://github.com/clarete/eosd
 [submodule "custom/org-now"]
-	path = custom/org-now
+	path = submodule/org-now
 	url = https://github.com/alphapapa/org-now
 [submodule "custom/power-mode.el"]
-	path = custom/power-mode.el
+	path = submodule/power-mode.el
 	url = https://github.com/ALSchwalm/power-mode.el
 [submodule "custom/leetcode-emacs"]
-	path = custom/leetcode-emacs
+	path = submodule/leetcode-emacs
 	url = https://github.com/ginqi7/leetcode-emacs
 [submodule "custom/subed"]
-	path = custom/subed
+	path = submodule/subed
 	url = https://github.com/rndusr/subed
 [submodule "custom/exwm-background"]
-	path = custom/exwm-background
+	path = submodule/exwm-background
 	url = https://github.com/pestctrl/exwm-background
 [submodule "custom/erlang_ls"]
-	path = custom/erlang_ls
+	path = submodule/erlang_ls
 	url = https://github.com/erlang-ls/erlang_ls
 [submodule "custom/sourcer"]
-	path = custom/sourcer
+	path = submodule/sourcer
 	url = https://github.com/erlang/sourcer
 [submodule "custom/org-reveal"]
-	path = custom/org-reveal
+	path = submodule/org-reveal
 	url = https://github.com/yjwen/org-reveal
 [submodule "custom/org-ql"]
-	path = custom/org-ql
+	path = submodule/org-ql
 	url = https://github.com/pestctrl/org-ql/
diff --git a/custom/bookmark-plus b/submodule/bookmark-plus
similarity index 100%
rename from custom/bookmark-plus
rename to submodule/bookmark-plus
diff --git a/custom/dired-plus b/submodule/dired-plus
similarity index 100%
rename from custom/dired-plus
rename to submodule/dired-plus
diff --git a/custom/emacs-memoize b/submodule/emacs-memoize
similarity index 100%
rename from custom/emacs-memoize
rename to submodule/emacs-memoize
diff --git a/custom/eosd b/submodule/eosd
similarity index 100%
rename from custom/eosd
rename to submodule/eosd
diff --git a/custom/erlang_ls b/submodule/erlang_ls
similarity index 100%
rename from custom/erlang_ls
rename to submodule/erlang_ls
diff --git a/custom/exwm b/submodule/exwm
similarity index 100%
rename from custom/exwm
rename to submodule/exwm
diff --git a/custom/exwm-background b/submodule/exwm-background
similarity index 100%
rename from custom/exwm-background
rename to submodule/exwm-background
diff --git a/custom/header2.el b/submodule/header2.el
similarity index 100%
rename from custom/header2.el
rename to submodule/header2.el
diff --git a/custom/leetcode-emacs b/submodule/leetcode-emacs
similarity index 100%
rename from custom/leetcode-emacs
rename to submodule/leetcode-emacs
diff --git a/custom/mu b/submodule/mu
similarity index 100%
rename from custom/mu
rename to submodule/mu
diff --git a/custom/org-fstree b/submodule/org-fstree
similarity index 100%
rename from custom/org-fstree
rename to submodule/org-fstree
diff --git a/custom/org-now b/submodule/org-now
similarity index 100%
rename from custom/org-now
rename to submodule/org-now
diff --git a/custom/org-ql b/submodule/org-ql
similarity index 100%
rename from custom/org-ql
rename to submodule/org-ql
diff --git a/custom/org-reveal b/submodule/org-reveal
similarity index 100%
rename from custom/org-reveal
rename to submodule/org-reveal
diff --git a/custom/power-mode.el b/submodule/power-mode.el
similarity index 100%
rename from custom/power-mode.el
rename to submodule/power-mode.el
diff --git a/custom/sourcer b/submodule/sourcer
similarity index 100%
rename from custom/sourcer
rename to submodule/sourcer
diff --git a/custom/subed b/submodule/subed
similarity index 100%
rename from custom/subed
rename to submodule/subed
diff --git a/custom/ts.el b/submodule/ts.el
similarity index 100%
rename from custom/ts.el
rename to submodule/ts.el
diff --git a/custom/xelb b/submodule/xelb
similarity index 100%
rename from custom/xelb
rename to submodule/xelb
diff --git a/custom/youtube-dl-emacs b/submodule/youtube-dl-emacs
similarity index 100%
rename from custom/youtube-dl-emacs
rename to submodule/youtube-dl-emacs