diff --git a/Makefile b/Makefile
index a3f5e28387daf506142644dffbfb4ddb86992a24..fd50a80f5221e2bf1fc7cdffb97b5b2c5fb66924 100644
--- a/Makefile
+++ b/Makefile
@@ -7,25 +7,16 @@
 # Stuff that can be built before ever running latex:
 pretex: rust_tex notebook_py_libs
 
-# Sage artifacts which can only be generated after the first run of (pdf/lua)latex.
-# `make main.sagetex.sout` is invoked by `latexmk -use-make` when needed
-SAGETEXARTIFACT=tex/aux_files/main.sagetex.sout
 # Location for all the python libraries generated from the jupyter notebooks:
 GENERATED_PYLIBS_DIR=generated_py_libs
 
-sage_artifacts: ${SAGETEXARTIFACT}
-
-SAGETEXSCRIPT = main.sagetex.sage # generated by latex compile
-${SAGETEXARTIFACT}: tex/aux_files/${SAGETEXSCRIPT} notebook_py_libs
-	cd tex/aux_files && PYTHONPATH=../${GENERATED_PYLIBS_DIR} sage ${SAGETEXSCRIPT}
-
 # PYTHON LIBS FROM NOTEBOOKS
 
-NOTEBOOKBASENAMES = $(basename $(wildcard *.ipynb))
+NOTEBOOKBASENAMES = $(basename $(notdir $(wildcard notebooks/*.ipynb)))
 
 define NOTEBOOK_TO_LIB_RULE
-$(addprefix $(GENERATED_PYLIBS_DIR)/, $(1).py): $(1).ipynb
-	jupyter nbconvert --to script $(1).ipynb --output-dir=$(GENERATED_PYLIBS_DIR)
+$(addprefix $(GENERATED_PYLIBS_DIR)/, $(1).py): $(addprefix notebooks/, $(1).ipynb)
+	jupyter nbconvert --to script $(addprefix notebooks/, $(1).ipynb) --output-dir=$(GENERATED_PYLIBS_DIR)
 	cd $(GENERATED_PYLIBS_DIR) &&\
 	mv $(1).py $(1).sage &&\
 	sed -e "/get_ipython/d" -i $(1).sage &&\
diff --git a/benchmark-results.tsv b/notebooks/benchmark-results.tsv
similarity index 100%
rename from benchmark-results.tsv
rename to notebooks/benchmark-results.tsv
diff --git a/benchmark.ipynb b/notebooks/benchmark.ipynb
similarity index 100%
rename from benchmark.ipynb
rename to notebooks/benchmark.ipynb
diff --git a/characteristic_curves.ipynb b/notebooks/characteristic_curves.ipynb
similarity index 100%
rename from characteristic_curves.ipynb
rename to notebooks/characteristic_curves.ipynb
diff --git a/examples.ipynb b/notebooks/examples.ipynb
similarity index 100%
rename from examples.ipynb
rename to notebooks/examples.ipynb
diff --git a/other_P_choice.ipynb b/notebooks/other_P_choice.ipynb
similarity index 100%
rename from other_P_choice.ipynb
rename to notebooks/other_P_choice.ipynb
diff --git a/plots_and_expressions.ipynb b/notebooks/plots_and_expressions.ipynb
similarity index 100%
rename from plots_and_expressions.ipynb
rename to notebooks/plots_and_expressions.ipynb
diff --git a/rank_zero_case.ipynb b/notebooks/rank_zero_case.ipynb
similarity index 100%
rename from rank_zero_case.ipynb
rename to notebooks/rank_zero_case.ipynb