Updated routes so there are no longer so many nested ones