Rearrange godoc comments
Add doc.go
Improve docs