structure update
Template and Appcontroller update