Decompose AbstractServicesAwareProvider to class ServicesAware and interface Provider