[api] reorganize per RFD 619#996

sunshowers wants to merge 3 commits intomasteroxidecomputer/propolis:masterfrom

sunshowers/spr/api-reorganize-per-rfd-619oxidecomputer/propolis:sunshowers/spr/api-reorganize-per-rfd-619Copy head branch name to clipboard