more template organization