Use correct go package imports

That should allow "go get"...