Moved stream to its own library