Fixing more file locations and merging files.