Rearranged how file refs are manged, improved file naming for subtraction.
Resolves #5 probably.