Output to seperate dirs/files improved.