[ExternalSources] Minor cleanup
[ExternalSources] One file per class