Refactoring, renaming client/get_client with api/get_api