restructed the templates for zinnia