This still needs a bit of decoupling from Application, but finished the rewrite of the Routing logic and got it mostly removed from the Controller package.