Change the way data files are copied, remove temp files on success