Move getStream() into the Stream class directly. Remove unused imports in Factory.
Fixing merge conflict
Change usage of Factory::getStream() to Stream::getStream()
Merge pull request #231 from dongilbert/FactoryGetStream

Move getStream() into the Stream class directly