Hi Alison,
We used Email Groups that tie to Security Groups (permissions-wise) to keep the various templates separate, so for example the Government Sales team has a folder full of their various templates (and sub folders, etc) but by setting them up in their own Email Group we can manage the security and access to limit it to just that sales team.