Move some current contractors to the correct group

Brian Wolff, Hooman, Kunal. Also sort groups alphabetically.

Change-Id: I51a23be513fbcd945a7c520cd7c4764c2d81a5be