Rearranged template files