reorganized template files.