Reorganised architecture