Move payload to structs
Move payload to structs

[#97265950]

simonleung8/cli,evanfarrar/cli,mcintyred/cli,evanfarrar/cli,hyenaspots/cli,hyenaspots/cli,fujitsu-cf/cli,cf-routing/cli,markstgodard/cli,simonleung8/cli,hyenaspots/cli,markstgodard/cli,evanfarrar/cli,cf-routing/cli,mcintyred/cli,cf-routing/cli,mcintyred/cli,evanfarrar/cli,markstgodard/cli,hyenaspots/cli,simonleung8/cli,markstgodard/cli,fujitsu-cf/cli,cf-routing/cli,fujitsu-cf/cli,mcintyred/cli