Refactoring ResultCollector package