1 files changed, 7 insertions, 113 deletions
diff --git a/.gitmodules b/.gitmodules
index 66e31e9..7714589 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,127 +1,21 @@
 [submodule "alloy-mode"]
-	path = lib/alloy-mode
+	path = lisp/alloy-mode
 	url = https://github.com/dwwmmn/alloy-mode.git
 [submodule "amx"]
-	path = lib/amx
+	path = lisp/amx
 	url = https://github.com/DarwinAwardWinner/amx.git
-[submodule "async"]
-	path = lib/async
-	url = https://github.com/jwiegley/emacs-async.git
-[submodule "auto-compile"]
-	path = lib/auto-compile
-	url = https://github.com/emacscollective/auto-compile.git
-[submodule "biblio.el"]
-	path = lib/biblio.el
-	url = https://github.com/cpitclaudel/biblio.el.git
-[submodule "borg"]
-	path = lib/borg
-	url = https://github.com/emacscollective/borg.git
 [submodule "boxquote"]
-	path = lib/boxquote
+	path = lisp/boxquote
 	url = https://github.com/davep/boxquote.el.git
-[submodule "dash"]
-	path = lib/dash
-	url = https://github.com/magnars/dash.el.git
-    no-makeinfo = dash-template.texi
-	# dash creates a `dir' dash info file, which makes git think
-	# that the submodule is dirty. so, let's ignore the untracked
-	# files of dash's submodule
-	ignore = untracked
-[submodule "debbugs"]
-	path = lib/debbugs
-	url = https://github.com/emacsmirror/debbugs.git
-	# debbugs creates a `instructions.info' info file, which makes git
-	# think that the submodule is dirty. so, let's ignore the
-	# untracked files of debbugs' submodule
-	ignore = untracked
-[submodule "ebdb"]
-	path = lib/ebdb
-	url = https://github.com/girzel/ebdb.git
-[submodule "erc-hl-nicks"]
-	path = lib/erc-hl-nicks
-	url = https://github.com/leathekd/erc-hl-nicks.git
-[submodule "expand-region"]
-	path = lib/expand-region
-	url = https://github.com/magnars/expand-region.el.git
 [submodule "hl-todo"]
-	path = lib/hl-todo
+	path = lisp/hl-todo
 	url = https://github.com/tarsius/hl-todo.git
-[submodule "ivy"]
-	path = lib/ivy
-	url = https://github.com/abo-abo/swiper.git
-    info-path = doc
-[submodule "libgit"]
-	path = lib/libgit
-	url = https://github.com/magit/libegit2.git
-    build-step = make
-[submodule "magit"]
-	path = lib/magit
-	url = https://github.com/magit/magit.git
-    recursive-byte-compile = true
-	info-path = Documentation
-[submodule "minions"]
-	path = lib/minions
-	url = https://github.com/tarsius/minions.git
-[submodule "org"]
-	path = lib/org
-	url = https://code.orgmode.org/bzg/org-mode.git
-    build-step = make
-	load-path = lisp
-	load-path = contrib/lisp
-	info-path = doc
-[submodule "org-tanglesync"]
-	path = lib/org-tanglesync
-	url = https://github.com/mtekman/org-tanglesync.el.git
-[submodule "orgalist"]
-	path = lib/orgalist
-	url = https://github.com/emacsmirror/orgalist.git
-[submodule "packed"]
-	path = lib/packed
-	url = https://github.com/emacscollective/packed.git
 [submodule "page-break-lines"]
-	path = lib/page-break-lines
+	path = lisp/page-break-lines
 	url = https://github.com/purcell/page-break-lines.git
-[submodule "refinery-theme"]
-	path = lib/refinery-theme
-	url = https://git.bndl.org/refinery-theme
-[submodule "rich-minority"]
-	path = lib/rich-minority
-	url = https://github.com/Malabarba/rich-minority.git
-[submodule "rt-liberation"]
-	path = lib/rt-liberation
-	url = https://git.savannah.gnu.org/git/rtliber.git
-    info-path = doc
-    # rt-liberation creates doc/{dir,rt-liberation.info} files, which
-	# make git think that the submodule is dirty.  so, let's ignore
-	# the untracked files of rt-liberation's submodule
-	ignore = untracked
 [submodule "s"]
-	path = lib/s
+	path = lisp/s
 	url = https://github.com/magnars/s.el.git
 [submodule "scpaste"]
-	path = lib/scpaste
+	path = lisp/scpaste
 	url = https://git.sr.ht/~technomancy/scpaste
-[submodule "smart-mode-line"]
-	path = lib/smart-mode-line
-	url = https://github.com/Malabarba/smart-mode-line.git
-[submodule "switch-buffer-functions"]
-	path = lib/switch-buffer-functions
-	url = https://github.com/10sr/switch-buffer-functions-el.git
-[submodule "transient"]
-	path = lib/transient
-	url = https://github.com/magit/transient.git
-[submodule "unkillable-scratch"]
-	path = lib/unkillable-scratch
-	url = https://github.com/EricCrosson/unkillable-scratch.git
-[submodule "which-key"]
-	path = lib/which-key
-	url = https://github.com/justbur/emacs-which-key.git
-[submodule "with-editor"]
-	path = lib/with-editor
-	url = https://github.com/magit/with-editor.git
-[submodule "yasnippet"]
-	path = lib/yasnippet
-	url = https://github.com/joaotavora/yasnippet.git
-[submodule "znc"]
-	path = lib/znc
-	url = https://git.emacsconf.org/bandali/znc.el.git