Refactor Nesting for Routes