Move client to its own package