The logic behind it, though, is we do only have two criteria types (in either XF1 or XF2) user criteria and page criteria so it makes sense to logically group them by type.
User fields is a bit more of a special case but primarily the reason for that being separate is that there could be a significant number of fields there, so it did make sense to separate those.