Merge "Rearrange aggregates response schema into one file"