rearrange files to avoid godoc bad formatting