Split collector class
Merge pull request #17 from hitode909/split-collector

Split collector class