Structure things to be more go build friendly