Filing out data structures.  Moved into proper project away from tests.