Reorganized template files