Reorganised scene management