Reorganize package structure.
Pass CredentialsEncryptor to CredentialsContainer