Service refactoring
Merge pull request #5 from GoldRenard/service-refactoring

Service refactoring