remove old service classes
create new service class
rename service configuration key for factory and alias.
update tests.