Move shifts and masks outside groups to clarify docs from a user point of view. fix missing or broken groupings