Move ClassCollector to its own file