Preparing package.go for further modification

The next step will probably be to split package.go out into a
new package.