[services] Finish renaming and clean services
Merge pull request #17 from sbadia/rename

[services] Finish renaming and clean services