Massively reworked module organization