Restructuring of routes to make them easier to manage