Major refactor of template folder.