Update routes; Make it more RESTful (and probably break a lot of links in the process)