More adjustments to where output is saved, adding the adir prefix