Reorging the github org so we can get nicer builders

Original message was deleted