Moving streams into their own module.