diff --git a/src/wip/proof.pydict b/src/environments/refproof/proof.pydict
similarity index 100%
rename from src/wip/proof.pydict
rename to src/environments/refproof/proof.pydict
diff --git a/src/wip/refproof.pysty3 b/src/environments/refproof/refproof.pysty3
similarity index 100%
rename from src/wip/refproof.pysty3
rename to src/environments/refproof/refproof.pysty3
diff --git a/src/environments/thmstyle.pysty b/src/environments/thmstyle/thmstyle.pysty
similarity index 100%
rename from src/environments/thmstyle.pysty
rename to src/environments/thmstyle/thmstyle.pysty
diff --git a/src/exercises/sheet.pycls b/src/exercises/sheet/sheet.pycls
similarity index 100%
rename from src/exercises/sheet.pycls
rename to src/exercises/sheet/sheet.pycls
diff --git a/src/utils/symbindex.pysty3 b/src/indexing/symbindex/symbindex.pysty3
similarity index 100%
rename from src/utils/symbindex.pysty3
rename to src/indexing/symbindex/symbindex.pysty3
diff --git a/src/misc/vocab.pysty b/src/indexing/vocab/vocab.pysty
similarity index 100%
rename from src/misc/vocab.pysty
rename to src/indexing/vocab/vocab.pysty
diff --git a/src/lecture-notes/lectures.pysty b/src/lecture-notes/lectures/lectures.pysty
similarity index 100%
rename from src/lecture-notes/lectures.pysty
rename to src/lecture-notes/lectures/lectures.pysty
diff --git a/src/lecture-notes/script.pycls b/src/lecture-notes/script/script.pycls
similarity index 100%
rename from src/lecture-notes/script.pycls
rename to src/lecture-notes/script/script.pycls
diff --git a/src/math/categories.pysty3 b/src/math/categories/categories.pysty3
similarity index 100%
rename from src/math/categories.pysty3
rename to src/math/categories/categories.pysty3
diff --git a/src/utils/mathematical-categories.pydict b/src/math/categories/mathematical-categories.pydict
similarity index 100%
rename from src/utils/mathematical-categories.pydict
rename to src/math/categories/mathematical-categories.pydict
diff --git a/src/math/faktor.pysty b/src/math/faktor/faktor.pysty
similarity index 100%
rename from src/math/faktor.pysty
rename to src/math/faktor/faktor.pysty
diff --git a/src/math/mathalias.pysty b/src/math/mathalias/mathalias.pysty
similarity index 100%
rename from src/math/mathalias.pysty
rename to src/math/mathalias/mathalias.pysty
diff --git a/src/math/mathfig.pysty b/src/math/mathfig/mathfig.pysty
similarity index 100%
rename from src/math/mathfig.pysty
rename to src/math/mathfig/mathfig.pysty
diff --git a/src/math/mathfixes.pysty b/src/math/mathfixes/mathfixes.pysty
similarity index 100%
rename from src/math/mathfixes.pysty
rename to src/math/mathfixes/mathfixes.pysty
diff --git a/src/math/mathfont.pysty b/src/math/mathfont/mathfont.pysty
similarity index 100%
rename from src/math/mathfont.pysty
rename to src/math/mathfont/mathfont.pysty
diff --git a/src/math/mathop.pysty b/src/math/mathop/mathop.pysty
similarity index 100%
rename from src/math/mathop.pysty
rename to src/math/mathop/mathop.pysty
diff --git a/src/math/mathsymb.pysty b/src/math/mathsymb/mathsymb.pysty
similarity index 100%
rename from src/math/mathsymb.pysty
rename to src/math/mathsymb/mathsymb.pysty
diff --git a/src/math/unicodechar.pysty b/src/math/unicodechar/unicodechar.pysty
similarity index 100%
rename from src/math/unicodechar.pysty
rename to src/math/unicodechar/unicodechar.pysty
diff --git a/src/utils/counters.pysty b/src/utils/counters/counters.pysty
similarity index 100%
rename from src/utils/counters.pysty
rename to src/utils/counters/counters.pysty
diff --git a/src/utils/findpackage.pysty b/src/utils/findpackage/findpackage.pysty
similarity index 100%
rename from src/utils/findpackage.pysty
rename to src/utils/findpackage/findpackage.pysty
diff --git a/src/utils/powerset.pysty3 b/src/utils/powerset/powerset.pysty3
similarity index 100%
rename from src/utils/powerset.pysty3
rename to src/utils/powerset/powerset.pysty3
diff --git a/src/wip/bibliography.pysty b/src/wip/bibliography/bibliography.pysty
similarity index 100%
rename from src/wip/bibliography.pysty
rename to src/wip/bibliography/bibliography.pysty
diff --git a/src/wip/exsheet.pysty b/src/wip/exsheet/exsheet.pysty
similarity index 100%
rename from src/wip/exsheet.pysty
rename to src/wip/exsheet/exsheet.pysty
diff --git a/src/wip/figures.pysty b/src/wip/figures/figures.pysty
similarity index 100%
rename from src/wip/figures.pysty
rename to src/wip/figures/figures.pysty
diff --git a/src/wip/gag.pysty b/src/wip/gag/gag.pysty
similarity index 100%
rename from src/wip/gag.pysty
rename to src/wip/gag/gag.pysty
diff --git a/src/wip/lang-input.pysty b/src/wip/lang-input/lang-input.pysty
similarity index 100%
rename from src/wip/lang-input.pysty
rename to src/wip/lang-input/lang-input.pysty
diff --git a/src/wip/removed.pysty b/src/wip/removed/removed.pysty
similarity index 100%
rename from src/wip/removed.pysty
rename to src/wip/removed/removed.pysty
diff --git a/src/wip/restate.pysty b/src/wip/restate/restate.pysty
similarity index 100%
rename from src/wip/restate.pysty
rename to src/wip/restate/restate.pysty
diff --git a/src/wip/subproof.pysty b/src/wip/subproof/subproof.pysty
similarity index 100%
rename from src/wip/subproof.pysty
rename to src/wip/subproof/subproof.pysty
diff --git a/src/wip/enumerate.pysty b/src/wrappers/enumerate/enumerate.pysty
similarity index 100%
rename from src/wip/enumerate.pysty
rename to src/wrappers/enumerate/enumerate.pysty
diff --git a/src/misc/hypersetup.pysty b/src/wrappers/hypersetup/hypersetup.pysty
similarity index 100%
rename from src/misc/hypersetup.pysty
rename to src/wrappers/hypersetup/hypersetup.pysty
diff --git a/src/misc/incfig.pysty b/src/wrappers/incfig/incfig.pysty
similarity index 100%
rename from src/misc/incfig.pysty
rename to src/wrappers/incfig/incfig.pysty
diff --git a/src/math/math.pysty b/src/wrappers/math/math.pysty
similarity index 100%
rename from src/math/math.pysty
rename to src/wrappers/math/math.pysty
diff --git a/src/utils/todo.pysty b/src/wrappers/todo/todo.pysty
similarity index 100%
rename from src/utils/todo.pysty
rename to src/wrappers/todo/todo.pysty