consolidated packages; golang-styled code