Moving streams to its own package