Adjustments merging the template and router classes to work closely together, with the templates (and any custom templates added later) to be able to automatically set up their own routes.

Unlikely custom routes will be needed that aren't link to templates, however custom routes can still be added if some duplication is needed to help redirect.