Reorganization, again, and sorting properly by routes.