Restructure templates

Description

Re-structures the templates, following the docs introduced in !85 (merged).

Checklist

Please confirm that this pull request has done the following:

- [ ] Tests added

• Documentation added (where applicable)
• Changelog item added to changelog/