Fixed the file paths in the project
Merge
Merge remote-tracking branch 'origin/master'
Fixed paths of the files