Reorganized template file tree