Reorganise modules by removing the linear progression in the module names. Instead, categorise them in the module name.