modify file paths to name them as relative paths
Merge origin/master