cleaned up services

server-services and client-services are now 1-to-1 (and could be
generated from the server, same as the entities)