Refactored routing for covention and better RESTful decription and adherence