Clean up and updates to Controller, Services and UrlMapping