A few preliminary changes to preparing FileService to use new backend

Some structural changes to come, so getting review of these changes out of the way so they don't add complexity to that review.