Restructured routes and templates