Revert "Service entity"
Merge pull request #2 from iamchairs/revert-1-service-entity

Revert "Service entity"