Reorganize the code so disk parsing is in a separate library.