Modifying to factor out NSString-based paths in favor of NSURL's