diff --git a/.gitignore b/.gitignore
index 1283c35e..e5240de7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,27 @@
 cmake.bld
-/papers/generated/
+/papers/**/generated/
 compile_commands.json
 .update-submodules
 .use-docker
-/papers/.venv/
-/papers/_minted-view-maybe/
-/papers/*.aux
-/papers/*.bbl
-/papers/*.blg
-/papers/*.dvi
-/papers/*.fdb_latexmk
-/papers/*.fls
-/papers/*.log
-/papers/*.out
-/papers/*.pdf
-/papers/*.toc
-/papers/*.idx
-/papers/*.xtr
-/papers/.deps/
-/papers/_minted-view-maybe.work/
-/papers/.venv.work/
-/papers/_minted-optional_ref/
-/papers/_minted-optional_ref_wording/
+/papers/**/.venv/
+/papers/**/_minted-*/
+/papers/**/*.aux
+/papers/**/*.bbl
+/papers/**/*.blg
+/papers/**/*.dvi
+/papers/**/*.fdb_latexmk
+/papers/**/*.fls
+/papers/**/*.log
+/papers/**/*.out
+/papers/**/*.pdf
+/papers/**/*.toc
+/papers/**/*.idx
+/papers/**/*.xtr
+/papers/**/.deps/
+/papers/**/_minted-view-maybe.work/
+/papers/**/.venv.work/
+/papers/**/_minted-optional_ref/
+/papers/**/_minted-optional_ref_wording/
 /.cache/
 *.pyg
+/.build/
diff --git a/.gitmodules b/.gitmodules
index 8a5bab5f..807f4886 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "papers/wg21"]
-	path = papers/wg21
+	path = papers/P2988/wg21
 	url = https://github.com/mpark/wg21.git
 [submodule "extern/googletest"]
 	path = extern/googletest
diff --git a/papers/P2988/.gitignore b/papers/P2988/.gitignore
new file mode 100644
index 00000000..31aaf3f8
--- /dev/null
+++ b/papers/P2988/.gitignore
@@ -0,0 +1 @@
+/papers/P2988/.deps/
diff --git a/papers/Makefile b/papers/P2988/Makefile
similarity index 100%
rename from papers/Makefile
rename to papers/P2988/Makefile
index 2dee632c..3bbfcb7f 100644
--- a/papers/Makefile
+++ b/papers/P2988/Makefile
@@ -1,9 +1,9 @@
+PYEXECPATH ?= $(shell which python3.12 || which python3.11 || which python3.10)
+PYTHON ?= $(shell basename $(PYEXECPATH))
 VENV := .venv/
 SOURCE_VENV := . $(VENV)/bin/activate;
 PYEXEC := $(SOURCE_VENV) $(PYTHON)
 PIP_SYNC := $(PYEXEC) -m piptools sync
-PYEXECPATH ?= $(shell which python3.12 || which python3.11 || which python3.10)
-PYTHON ?= $(shell basename $(PYEXECPATH))
 REQS_MARKER := $(VENV)/bin/.pip-sync
 PIP := $(PYEXEC) -m pip
 DEPS_DIR := .deps
diff --git a/papers/abstract.bst b/papers/P2988/abstract.bst
similarity index 100%
rename from papers/abstract.bst
rename to papers/P2988/abstract.bst
diff --git a/papers/common.tex b/papers/P2988/common.tex
similarity index 100%
rename from papers/common.tex
rename to papers/P2988/common.tex
diff --git a/papers/design.org b/papers/P2988/design.org
similarity index 100%
rename from papers/design.org
rename to papers/P2988/design.org
diff --git a/papers/homework-tokyo.html b/papers/P2988/homework-tokyo.html
similarity index 100%
rename from papers/homework-tokyo.html
rename to papers/P2988/homework-tokyo.html
diff --git a/papers/homework-tokyo.org b/papers/P2988/homework-tokyo.org
similarity index 100%
rename from papers/homework-tokyo.org
rename to papers/P2988/homework-tokyo.org
diff --git a/papers/mybiblio.bib b/papers/P2988/mybiblio.bib
similarity index 100%
rename from papers/mybiblio.bib
rename to papers/P2988/mybiblio.bib
diff --git a/papers/optional-ref.md b/papers/P2988/optional-ref.md
similarity index 100%
rename from papers/optional-ref.md
rename to papers/P2988/optional-ref.md
diff --git a/papers/optional_ref.h b/papers/P2988/optional_ref.h
similarity index 100%
rename from papers/optional_ref.h
rename to papers/P2988/optional_ref.h
diff --git a/papers/optional_ref_wording.tex b/papers/P2988/optional_ref_wording.tex
similarity index 100%
rename from papers/optional_ref_wording.tex
rename to papers/P2988/optional_ref_wording.tex
diff --git a/papers/requirements.txt b/papers/P2988/requirements.txt
similarity index 100%
rename from papers/requirements.txt
rename to papers/P2988/requirements.txt
diff --git a/papers/std.tex b/papers/P2988/std.tex
similarity index 100%
rename from papers/std.tex
rename to papers/P2988/std.tex
diff --git a/papers/stdtex/config.tex b/papers/P2988/stdtex/config.tex
similarity index 100%
rename from papers/stdtex/config.tex
rename to papers/P2988/stdtex/config.tex
diff --git a/papers/stdtex/layout.tex b/papers/P2988/stdtex/layout.tex
similarity index 100%
rename from papers/stdtex/layout.tex
rename to papers/P2988/stdtex/layout.tex
diff --git a/papers/stdtex/macros.tex b/papers/P2988/stdtex/macros.tex
similarity index 100%
rename from papers/stdtex/macros.tex
rename to papers/P2988/stdtex/macros.tex
diff --git a/papers/stdtex/paper_macros.tex b/papers/P2988/stdtex/paper_macros.tex
similarity index 100%
rename from papers/stdtex/paper_macros.tex
rename to papers/P2988/stdtex/paper_macros.tex
diff --git a/papers/stdtex/styles.tex b/papers/P2988/stdtex/styles.tex
similarity index 100%
rename from papers/stdtex/styles.tex
rename to papers/P2988/stdtex/styles.tex
diff --git a/papers/stdtex/tables.tex b/papers/P2988/stdtex/tables.tex
similarity index 100%
rename from papers/stdtex/tables.tex
rename to papers/P2988/stdtex/tables.tex
diff --git a/papers/wg21 b/papers/P2988/wg21
similarity index 100%
rename from papers/wg21
rename to papers/P2988/wg21
diff --git a/papers/wg21.bib b/papers/P2988/wg21.bib
similarity index 100%
rename from papers/wg21.bib
rename to papers/P2988/wg21.bib