Revert "Path/Routes corrections"

This reverts commit b8b5215cf52087bdb78a3569ff5f071e2468f9d5.