Fixed files and file locations
Fixed files and file locations