Reworking final locations of all files.