refactored services
Merge pull request #49 from Hendrixer/services

refactored services