More refactoring of file/block interface