Changed output to output dir, added output file.