Reworked configuration to allow for reuse of sources.
Added fqn-matching.