diff --git a/docs/_diagrams/README.md b/docs/_diagrams/README.md
index bb121daa7..5bc8abe10 100644
--- a/docs/_diagrams/README.md
+++ b/docs/_diagrams/README.md
@@ -5,7 +5,7 @@ The ER diagrams were created with https://github.com/BurntSushi/erd/.
 You can go download erd from https://github.com/BurntSushi/erd/releases and then do:
 
 ```bash
-./erd_static-x86-64 -i film.er -o ../_static/film.png
+./erd_static-x86-64 -i ./er/film.er -o ../_static/film.png
 ```
 
 The fonts used belong to the GNU FreeFont family. You can download them here: http://ftp.gnu.org/gnu/freefont/
@@ -44,9 +44,9 @@ The UML diagrams are created with https://plantuml.com/.
 
 PlantUML only creates one diagram per file.
 That's why we need to create another one for dark mode.
-For example, for the file [arch.uml](./arch.uml) there's [arch-dark](./arch-dark.uml) which includes the first one:
+For example, for the file [uml/arch.uml](uml/arch.uml) there's [uml/dark/arch-dark.uml](uml/dark/arch-dark.uml) which includes the first one:
 
 ```bash
-plantuml -tsvg arch.uml -o ../_static
-plantuml -tsvg -darkmode arch-dark.uml -o ../_static
+plantuml -tsvg uml/arch.uml -o ../../_static
+plantuml -tsvg -darkmode uml/dark/arch-dark.uml -o ../../../_static
 ```
diff --git a/docs/_diagrams/arch-dark.uml b/docs/_diagrams/arch-dark.uml
deleted file mode 100644
index 6cc420d2e..000000000
--- a/docs/_diagrams/arch-dark.uml
+++ /dev/null
@@ -1,3 +0,0 @@
-@startuml
-!include arch.uml
-@enduml
diff --git a/docs/_diagrams/boxoffice.er b/docs/_diagrams/er/boxoffice.er
similarity index 100%
rename from docs/_diagrams/boxoffice.er
rename to docs/_diagrams/er/boxoffice.er
diff --git a/docs/_diagrams/employees.er b/docs/_diagrams/er/employees.er
similarity index 100%
rename from docs/_diagrams/employees.er
rename to docs/_diagrams/er/employees.er
diff --git a/docs/_diagrams/film.er b/docs/_diagrams/er/film.er
similarity index 100%
rename from docs/_diagrams/film.er
rename to docs/_diagrams/er/film.er
diff --git a/docs/_diagrams/orders.er b/docs/_diagrams/er/orders.er
similarity index 100%
rename from docs/_diagrams/orders.er
rename to docs/_diagrams/er/orders.er
diff --git a/docs/_diagrams/premieres.er b/docs/_diagrams/er/premieres.er
similarity index 100%
rename from docs/_diagrams/premieres.er
rename to docs/_diagrams/er/premieres.er
diff --git a/docs/_diagrams/presidents.er b/docs/_diagrams/er/presidents.er
similarity index 100%
rename from docs/_diagrams/presidents.er
rename to docs/_diagrams/er/presidents.er
diff --git a/docs/_diagrams/users.er b/docs/_diagrams/er/users.er
similarity index 100%
rename from docs/_diagrams/users.er
rename to docs/_diagrams/er/users.er
diff --git a/docs/_diagrams/arch.uml b/docs/_diagrams/uml/arch.uml
similarity index 100%
rename from docs/_diagrams/arch.uml
rename to docs/_diagrams/uml/arch.uml
diff --git a/docs/_diagrams/uml/dark/arch-dark.uml b/docs/_diagrams/uml/dark/arch-dark.uml
new file mode 100644
index 000000000..a655c3afa
--- /dev/null
+++ b/docs/_diagrams/uml/dark/arch-dark.uml
@@ -0,0 +1,3 @@
+@startuml
+!include ../arch.uml
+@enduml
diff --git a/nix/tools/docs.nix b/nix/tools/docs.nix
index f4edfa393..929da5017 100644
--- a/nix/tools/docs.nix
+++ b/nix/tools/docs.nix
@@ -90,8 +90,8 @@ let
         ${pdflatex}/bin/pdflatex -halt-on-error -output-directory="$tmpdir" db.tex
         ${imagemagick}/bin/convert -density 300 "$tmpdir/db.pdf" ../_static/db.png
 
-        ${plantuml}/bin/plantuml -tsvg arch.uml -o ../_static
-        ${plantuml}/bin/plantuml -tsvg -darkmode arch-dark.uml -o ../_static
+        ${plantuml}/bin/plantuml -tsvg uml/*.uml -o ../../_static
+        ${plantuml}/bin/plantuml -tsvg -darkmode uml/dark/*.uml -o ../../../_static
       '';
 
   server =