Update so that jobs are organized into subfolders