Change structure to make available via go get