Cleanup and relocation of CSV output