diff --git a/.vscode/settings.json b/.vscode/settings.json
index 352227e..5000573 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -26,5 +26,6 @@
     "**/.settings": true,
     "**/.exchange_modules_tmp": true,
     ".mule": true
-  }
+  },
+  "xml.preferences.showSchemaDocumentationType": "none"
 }
diff --git a/force-app/main/default/email/Unsubscribe.emailFolder-meta.xml b/force-app/main/default/email/Unsubscribe.emailFolder-meta.xml
new file mode 100644
index 0000000..bd36df5
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe.emailFolder-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailFolder xmlns="http://soap.sforce.com/2006/04/metadata">
+    <accessType>Shared</accessType>
+    <name>Unsubscribe</name>
+    <publicFolderAccess>ReadWrite</publicFolderAccess>
+    <sharedTo>
+        <allInternalUsers></allInternalUsers>
+    </sharedTo>
+</EmailFolder>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email b/force-app/main/default/email/Unsubscribe/Unsubscribe_Contact_Template_HTML_Format.email
similarity index 83%
rename from force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email
rename to force-app/main/default/email/Unsubscribe/Unsubscribe_Contact_Template_HTML_Format.email
index f86d2ca..d8d61b3 100644
--- a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email
+++ b/force-app/main/default/email/Unsubscribe/Unsubscribe_Contact_Template_HTML_Format.email
@@ -1,5 +1,5 @@
-<messaging:emailTemplate subject="Edit this subject" recipientType="Contact" >
-  <messaging:htmlEmailBody > <!--  When creating a new visualforce template, the default option is plainTextEmailBody.
+<messaging:emailTemplate subject="Edit this subject" recipientType="Contact" >  
+<messaging:htmlEmailBody > <!--  When creating a new visualforce template, the default option is plainTextEmailBody.
   the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
   adding the visualforce component -->
 <P>Dear Friend,</P>
@@ -10,7 +10,6 @@
 
 <P>Bob</P>
 
-
      <c:UnsubscribeLink recipientId="{!recipient.Id}"></c:UnsubscribeLink> <!-- This is the custom component
      which can be added to any visualforce email template.  It is compatible with both leads and contacts. -->
    </messaging:htmlEmailBody>
diff --git a/force-app/main/default/email/Unsubscribe/Unsubscribe_Contact_Template_HTML_Format.email-meta.xml b/force-app/main/default/email/Unsubscribe/Unsubscribe_Contact_Template_HTML_Format.email-meta.xml
new file mode 100644
index 0000000..dbeeadf
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe/Unsubscribe_Contact_Template_HTML_Format.email-meta.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Example Visualforce Contact email template.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Unsubscribe Contact Template HTML Format</name>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>23</minorNumber>
+        <namespace>npe01</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>26</minorNumber>
+        <namespace>npe03</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>16</minorNumber>
+        <namespace>npe4</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>14</minorNumber>
+        <namespace>npe5</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>19</minorNumber>
+        <namespace>npo02</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>235</minorNumber>
+        <namespace>npsp</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>1</majorNumber>
+        <minorNumber>24</minorNumber>
+        <namespace>sf_chttr_apps</namespace>
+    </packageVersions>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email b/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_HTML_Format.email
similarity index 99%
rename from force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email
rename to force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_HTML_Format.email
index fe5b9ac..25de694 100644
--- a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email
+++ b/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_HTML_Format.email
@@ -10,7 +10,6 @@
 
 <P>Bob</P>
 
-
      <c:UnsubscribeLink recipientId="{!recipient.Id}"></c:UnsubscribeLink> <!-- This is the custom component
      which can be added to any visualforce email template.  It is compatible with both leads and contacts. -->
    </messaging:htmlEmailBody>
diff --git a/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_HTML_Format.email-meta.xml b/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_HTML_Format.email-meta.xml
new file mode 100644
index 0000000..2f21f48
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_HTML_Format.email-meta.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Example Visualforce Lead email template.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Unsubscribe Lead Template HTML Format</name>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>23</minorNumber>
+        <namespace>npe01</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>26</minorNumber>
+        <namespace>npe03</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>16</minorNumber>
+        <namespace>npe4</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>14</minorNumber>
+        <namespace>npe5</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>19</minorNumber>
+        <namespace>npo02</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>235</minorNumber>
+        <namespace>npsp</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>1</majorNumber>
+        <minorNumber>24</minorNumber>
+        <namespace>sf_chttr_apps</namespace>
+    </packageVersions>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_Text_Format.email b/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_Text_Format.email
new file mode 100644
index 0000000..4350418
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_Text_Format.email
@@ -0,0 +1,14 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
+<messaging:plainTextEmailBody >
+Dear Friend,
+
+It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!
+
+Your friend,
+
+Bob
+
+Copy and paste this in your browser to unsubscribe: 
+{!Recipient.Unsubscribe_Url_Plain_Text__c}  <!-- This field can be added to any plain text contact or lead email to display the url-->
+</messaging:plainTextEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_Text_Format.email-meta.xml b/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_Text_Format.email-meta.xml
new file mode 100644
index 0000000..e7c19ef
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe/Unsubscribe_Lead_Template_Text_Format.email-meta.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>65.0</apiVersion>
+    <available>true</available>
+    <description>Example Visualforce Lead email template using plain text formatting.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Unsubscribe Lead Template Plain Text Format</name>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>23</minorNumber>
+        <namespace>npe01</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>26</minorNumber>
+        <namespace>npe03</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>16</minorNumber>
+        <namespace>npe4</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>14</minorNumber>
+        <namespace>npe5</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>19</minorNumber>
+        <namespace>npo02</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>3</majorNumber>
+        <minorNumber>235</minorNumber>
+        <namespace>npsp</namespace>
+    </packageVersions>
+    <packageVersions>
+        <majorNumber>1</majorNumber>
+        <minorNumber>24</minorNumber>
+        <namespace>sf_chttr_apps</namespace>
+    </packageVersions>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml b/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
deleted file mode 100644
index 307b43b..0000000
--- a/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EmailFolder xmlns="http://soap.sforce.com/2006/04/metadata">
-    <accessType>Public</accessType>
-    <name>UnsubscribeLink</name>
-    <publicFolderAccess>ReadOnly</publicFolderAccess>
-</EmailFolder>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml
deleted file mode 100644
index 30fb7aa..0000000
--- a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>64.0</apiVersion>
-    <available>true</available>
-    <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object. </description>
-    <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Contact Template</name>
-    <style>none</style>
-    <subject>Edit this subject</subject>
-    <type>visualforce</type>
-    <uiType>Aloha</uiType>
-</EmailTemplate>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml
deleted file mode 100644
index 3f23bc9..0000000
--- a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>64.0</apiVersion>
-    <available>true</available>
-    <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object. </description>
-    <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Lead Template</name>
-    <style>none</style>
-    <subject>Edit this subject</subject>
-    <type>visualforce</type>
-    <uiType>Aloha</uiType>
-</EmailTemplate>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email
deleted file mode 100644
index 4b47148..0000000
--- a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email
+++ /dev/null
@@ -1,17 +0,0 @@
-<messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
-  <messaging:plainTextEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody. 
-  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
-  adding the visualforce component -->
-Dear Friend,
-
-It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!
-
-Your friend,
-
-Bob
-
-Copy and paste this in your browser to unsubscribe: 
-{!Recipient.Unsubscribe_Url_Plain_Text__c}  <!-- This field can be 
-added to any plain text contact or lead email to display the url-->
-   </messaging:plainTextEmailBody>
-</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml
deleted file mode 100644
index 9b44272..0000000
--- a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>64.0</apiVersion>
-    <available>true</available>
-    <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email </description>
-    <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Lead Template-Plain Text</name>
-    <style>none</style>
-    <subject>Edit this subject</subject>
-    <type>visualforce</type>
-    <uiType>Aloha</uiType>
-</EmailTemplate>