Revert "move groups around"

This reverts commit 08f0423b50dfa3610d9e558f2ba438622d2c4e11.