Restructured for go install friendliness per suggestion from Daniel YC Lin