Cleanup API routes

This update is internal and just moves some routes around, making it easier to understand what they are used for.