[Streams] Redo entire package