Further split Makefiles. Cleaned up data management.