Moved all service providers to services.yml