Reorganize for new workflow