Simplify Router, Resolver and Dispatcher. Rebase debug tools.