new Services refactoring
Update tests accordingly
Apply new Service to the Infinispan module
Renames Services