More logical class structure for route handling.