rearranged motor gangs

yeah!
Merge branch 'John'