Rearranging some docs so they show up on godoc [ci skip]