inlined the group swapping method into the one place where it is called
renamed the tile swapping methods