Updating in line with Jesse's comments, to retrieve files in relative
paths correctly
More consistent approach to relative paths