http_client: rearranged class declarations