Reorganized the templates to a more logical system.