Add doxygen grouping

Change-Id: I8b826a2aad5999f32a4cf54374a608d78a50dccb