Revert "Create a custom router mapper so we have more control over the routes"

This reverts commit b8d7e9ba27ae00aa3bdd49289bcddd6a2bb355b1.