fixed import paths, gofmt'ed