Refactor routes with Jamis Buck fix. Change all path helpers accordingly