Minor refactoring.
  - move ConnectionManager out of the provider - remains package private.