Minor reorganization, plus adding shutdown/spinup for multiple workflows