Reorganise somewhat