Client Logic moved out of services