use new import paths as of Go 1.4