More re-organization of the Relying Party code in order to support new configuration...