Moved the routes into their classes