Service, Views, Templates, URLs added and refined