Move client and payload functionality from thor to strategy