Cleanup to remove logic from the routes and to their own class.

Cleanup to remove logic from the routes and to their own class. #54