switch to new flow-based design
adjust README