API-54 Move BaseServiceProxy to client and update all his references