Reformat and file locations