Refactoring stream into seperate module
Autocommit Wed Dec 03 11:23:15 EST 2014