Move the API client to the Library