Change data analysis to use separate header file

Data collects a single header then just binary data now.