Resolve file paths (15/15)

Resolve file paths