Updated routes in line with the model changes (see Wiki REST). Updated Controllers accordingly