Make OAuth2 classes proper services