Rearrange to be a proper go package