Reorganised module assembly