Revert "Use BuxtonClient instead of struct BuxtonClient"

This reverts commit 8fa1fe6444e99e5946f80bbfc8a7c82bffcaaffe.