Reorganise lots of stuff into a model