MINOR moved template files into includes folder