Move data read functions to main.c
Combine headers.
Update Makefile for new fileset.