Refactored collectors
streamcollector manager refactor1
streamcollector refactor