Updating scenario files to apply new step organization