Major refactoring in the daq data handling.