Split out Credentials and CredentialsProvider.
Freshen clients.