reorganized template files