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