Putting some in ABC order

Hoping to satisfy Chad's OCD needs

Change-Id: I9afd20b4738824e83ea92d57c1cfe7cf34b5661c