Simplify the go package stuff