Merge "Revert "Split ClassCollector class into own file""