move Client to server/types