Switch to golang.org import paths

is this included now?