more accounts/providers/contacts refactoring and baconizing