Restructure joint groups

To avoid specifying joints more than once

Fix error in rebase

Restructure joint groups

To avoid specifying joints more than once