move services into Client