<<<<<<< HEAD ======= >>>>>>> 3d514fb... Moved generic templates/page files to sub folders for re-organization.