clean up path, with targetfolder / fix