Update file paths
Merge branch 'dev'