Api cleanup

Refactors the mock API to be a bit more organized. This should help as we register more and more endpoints, and create a more complex fake API.