Renamed/moved a bunch of templates and wrote directive tests for attachments.