edited to output to more sensical file/directories