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