changed routes to new structure