updated template organization