somehow missed all the builders for the file producers. also cleaned up the data classes so they read better.