Routes and Controllers updated