This reverts commit fcd791d002.
fcd791d002
Organise modules in a significantly better way with categories.