Start to reorganize around new file format

Change how we parse and output files, now that we know when one file
ends and another one starts. This hasn’t even been tested yet. Toward
#114.