Fixes #7772 Closes #7773
Renamed MetadataExtractor to MetadataCollector Reorganized to split src from tests Closes #7492