Move ClientService to better location