restructure package contents
reorder some class defs
tweak historical data test