Moved template files into their own