Change import paths for master so it will 'go get' correctly.