Make api more straightforward, replace auto-404ing with NotFound route, reorganize