Move services into own package

Move services into own package.
Split test into separate files, but still part of one suite.