Restructured routes