flow: rejig flow module hierarchy
flow: port across streams code from datum