Updated template files and directory hierarchy