changes to router file based on re-thinking the url organization
reorganizing the template files based on the router changes