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