Revert "api refactoring"

This reverts commit 28a74bfce49b5bea38212c6173363262c3bf21ce.
Revert "initial round of changes to http api"

This reverts commit f87e0f048052e7cbff64d703a1e498806b4b5963.