Some cleanup to our routes
Used more consisten naming for controllers in the view