Simplify directories, remove discovery API support (for now?)
Expunge some bad Go style
More style fixes
gofmt