Reorganised asset setup