Find files in the correct directory name
Merge remote-tracking branch 'origin'