Move client to separate pkg