update output file names, org in folders