More refactoring on the route manager.
More routing refact.
Final routing refact.
Final routing refact.