fixing file names and locations