lib/streams: Refined stream hierarchy

Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>