Made changes to relative paths according to David's requests.