Move everything back into one package.
gofmt