FileCollector refactoring.