Refactored services module
Merge pull request #42 from devynspencer/services

Refactored services module