Renamed filepaths to be server agnostic