try to shuffle stuff to make godoc happier