Merge pull request #23 from inspiran/master

Moving refactor to master
Adjusted service names