More refactoring of stuff to use the new fs