Now replaces names and adds target folder with new files
Lots of modifications