Edits to template

Finished template and made some changes in existing files to reflect
the template.