Reorg

massively simplified the stream setup