refactor endpoints per https://docs.google.com/a/conjur.net/document/d/1...

...7L3AdTl8YQ2HGGWqij9zIrChuVVOqf4_hgi51b1aApU/edit