Adjust API grouping; Fix format