Move things around so the commands are grouped together.