Move services into own package. Split tests into separate files, but still part of one suite
Merge pull request #8 from hashtock/chore/move-services-into-own-package

Move services into own package