simplify output file/directory logic