File Specificity Overhaul

I think removing it eventually would be the right move, but this is just a deeply embedded thing that it might be several releases before enough code is updated that we are comfortable. Should be played by ear :-)