second fixing of file locations