Tried making some generic nested data classes.
Replaced scons build system with ant.
Refactoring in progress. DataSources and ControlledData now central to design.
Rearranged things to facilitate input, output and data split.