Also fixes the incorrect JSON keys in API responses
Everything is in the router folder in different file