Refactored each template to its .html.