Rearranging the template files