Get rid of Location in favor of familiar FilePath