more logical arrangement of templates