Refactoring stream and putting non-ui logic into dedicated library
Autocommit Wed Dec 03 08:02:14 EST 2014