Refactor services
Merge pull request #1 from lloydmeta/refactor/services

Refactor services