Reorganizing the code to improve go get-ability (sp?).