Merge "Rearrange keypairs response schema into one file"