Refactoring stream into seperate module
Autocommit Wed Dec 03 10:49:14 EST 2014