Client_EIO split from Client, code more modular