diff --git a/edivorce/apps/core/templates/dashboard/final_filing.html b/edivorce/apps/core/templates/dashboard/final_filing.html
index 042fbed1..3d11ef96 100644
--- a/edivorce/apps/core/templates/dashboard/final_filing.html
+++ b/edivorce/apps/core/templates/dashboard/final_filing.html
@@ -104,10 +104,10 @@
                     </p>
                     <ul>
                         <li>
-                            {% include "partials/tooltips/requisition_form_35.html" %}
+                            {% include "partials/tooltips/forms/requisition_form_35.html" %}
                         </li>
                         <li>
-                            {% include "partials/tooltips/certificate_of_pleading_36.html" %}
+                            {% include "partials/tooltips/forms/certificate_of_pleading_36.html" %}
                         </li>
                     </ul>
                 {% endif %}
@@ -127,12 +127,12 @@
                         in the following order:
                     </p>
                     <ul>
-                        <li>{% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}
+                        <li>{% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}
                             signed by both you and your spouse
                         </li>
                         {% if original_marriage_certificate == 'YES' %}
-                            <li>{% include "partials/tooltips/proof_of_marriage.html" %}</li>
-                            <li>{% include "partials/tooltips/affidavit_of_translation.html" %} sworn/affirmed by a translator
+                            <li>{% include "partials/tooltips/forms/proof_of_marriage.html" %}</li>
+                            <li>{% include "partials/tooltips/forms/affidavit_of_translation.html" %} sworn/affirmed by a translator
                                 <ul class="no-margin-bottom">
                                     <li>
                                         Required only if your marriage certificate is NOT in English
@@ -140,24 +140,24 @@
                                 </ul>
                             </li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/joint_divorce_proceedings.html" %}</li>
-                        <li>{% include "partials/tooltips/requisition_form_35.html" %} signed by both you and your spouse</li>
-                        <li>{% include "partials/tooltips/draft_final_order_52.html" %} signed by both you and your spouse</li>
-                        <li>{% include "partials/tooltips/certificate_of_pleading_36.html" %}</li>
+                        <li>{% include "partials/tooltips/forms/joint_divorce_proceedings.html" %}</li>
+                        <li>{% include "partials/tooltips/forms/requisition_form_35.html" %} signed by both you and your spouse</li>
+                        <li>{% include "partials/tooltips/forms/draft_final_order_52.html" %} signed by both you and your spouse</li>
+                        <li>{% include "partials/tooltips/forms/certificate_of_pleading_36.html" %}</li>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/form_child_support_37.html" %} sworn/affirmed by both you and your spouse</li>
+                            <li>{% include "partials/tooltips/forms/child_support_37.html" %} sworn/affirmed by both you and your spouse</li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/form_desk_order_38.html" with text="Affidavit Desk Order Divorce (F38)" %} sworn/affirmed by
+                        <li>{% include "partials/tooltips/forms/desk_order_38.html" with text="Affidavit Desk Order Divorce (F38)" %} sworn/affirmed by
                             both you and your spouse
                         </li>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/agreement_to_annual_income_9.html" %}</li>
+                            <li>{% include "partials/tooltips/forms/agreement_to_annual_income_9.html" %}</li>
                         {% endif %}
                         {% if derived.wants_other_orders and name_change_you == 'YES' %}
-                            <li>{% include "partials/tooltips/identification_of_applicant.html" %} for you</li>
+                            <li>{% include "partials/tooltips/forms/identification_of_applicant.html" %} for you</li>
                         {% endif %}
                         {% if derived.wants_other_orders and name_change_spouse == 'YES' %}
-                            <li>{% include "partials/tooltips/identification_of_applicant.html" %} for your spouse</li>
+                            <li>{% include "partials/tooltips/forms/identification_of_applicant.html" %} for your spouse</li>
                         {% endif %}
                     </ul>
                     <p>
@@ -195,12 +195,12 @@
                         in the following order:
                     </p>
                     <ul>
-                        <li>{% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}
+                        <li>{% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}
                             signed by both you and your spouse
                         </li>
                         {% if original_marriage_certificate == 'YES' %}
-                            <li>{% include "partials/tooltips/proof_of_marriage.html" %}</li>
-                            <li>{% include "partials/tooltips/affidavit_of_translation.html" %} sworn/affirmed by a translator
+                            <li>{% include "partials/tooltips/forms/proof_of_marriage.html" %}</li>
+                            <li>{% include "partials/tooltips/forms/affidavit_of_translation.html" %} sworn/affirmed by a translator
                                 <ul class="no-margin-bottom">
                                     <li>
                                         Required only if your marriage certificate is NOT in English
@@ -208,21 +208,21 @@
                                 </ul>
                             </li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/joint_divorce_proceedings.html" %}</li>
-                        <li>{% include "partials/tooltips/requisition_form_35.html" %} signed by both you and your spouse</li>
-                        <li>{% include "partials/tooltips/draft_final_order_52.html" %} signed by both you and your spouse</li>
-                        <li>{% include "partials/tooltips/certificate_of_pleading_36.html" %}</li>
+                        <li>{% include "partials/tooltips/forms/joint_divorce_proceedings.html" %}</li>
+                        <li>{% include "partials/tooltips/forms/requisition_form_35.html" %} signed by both you and your spouse</li>
+                        <li>{% include "partials/tooltips/forms/draft_final_order_52.html" %} signed by both you and your spouse</li>
+                        <li>{% include "partials/tooltips/forms/certificate_of_pleading_36.html" %}</li>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/form_child_support_37.html" %} sworn/affirmed by you</li>
+                            <li>{% include "partials/tooltips/forms/child_support_37.html" %} sworn/affirmed by you</li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/form_desk_order_38.html" with text="Affidavit Desk Order Divorce (F38)" %}
+                        <li>{% include "partials/tooltips/forms/desk_order_38.html" with text="Affidavit Desk Order Divorce (F38)" %}
                             sworn/affirmed by you
                         </li>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/agreement_to_annual_income_9.html" %}</li>
+                            <li>{% include "partials/tooltips/forms/agreement_to_annual_income_9.html" %}</li>
                         {% endif %}
                         {% if derived.wants_other_orders and name_change_you == 'YES' %}
-                            <li>{% include "partials/tooltips/identification_of_applicant.html" %} for you</li>
+                            <li>{% include "partials/tooltips/forms/identification_of_applicant.html" %} for you</li>
                         {% endif %}
                     </ul>
                     <p>
@@ -265,11 +265,11 @@
                     </p>
                     <ul>
                         {% if derived.has_children_of_marriage %}
-                            <li>{% include "partials/tooltips/form_child_support_37.html" %} - sworn/affirmed by your spouse</li>
+                            <li>{% include "partials/tooltips/forms/child_support_37.html" %} - sworn/affirmed by your spouse</li>
                         {% endif %}
-                        <li>{% include "partials/tooltips/form_desk_order_38.html" %} - sworn/affirmed by your spouse</li>
+                        <li>{% include "partials/tooltips/forms/desk_order_38.html" %} - sworn/affirmed by your spouse</li>
                         {% if derived.wants_other_orders and name_change_spouse == 'YES' %}
-                            <li>{% include "partials/tooltips/identification_of_applicant.html" %} - for your spouse</li>
+                            <li>{% include "partials/tooltips/forms/identification_of_applicant.html" %} - for your spouse</li>
                         {% endif %}
                     </ul>
                     <p>
diff --git a/edivorce/apps/core/templates/dashboard/initial_filing.html b/edivorce/apps/core/templates/dashboard/initial_filing.html
index ef2bbb6e..1c39c398 100644
--- a/edivorce/apps/core/templates/dashboard/initial_filing.html
+++ b/edivorce/apps/core/templates/dashboard/initial_filing.html
@@ -59,20 +59,20 @@
         <div class="upload-area">
             {% if how_to_sign == 'Together' and signing_location == 'In-person' %}
                 <div>
-                    <p>The {% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be
+                    <p>The {% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be
                         automatically filed for you.</p>
                 </div>
             {% elif how_to_sign == 'Separately' and signing_location_you == 'In-person' %}
                 <div>
-                    <p>The {% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be
+                    <p>The {% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %} will be
                         automatically filed for you.</p>
                 </div>
             {% else %}
                 <p>The following forms will be automatically filed for you:</p>
                 <ul>
-                    <li>{% include "partials/tooltips/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}</li>
-                    <li>{% include "partials/tooltips/requisition_form_35.html" %}</li>
-                    <li>{% include "partials/tooltips/certificate_of_pleading_36.html" %}</li>
+                    <li>{% include "partials/tooltips/forms/joint_family_claim_1.html" with text="Notice of Joint Family Claim Form (F1)" %}</li>
+                    <li>{% include "partials/tooltips/forms/requisition_form_35.html" %}</li>
+                    <li>{% include "partials/tooltips/forms/certificate_of_pleading_36.html" %}</li>
                 </ul>
                 <p>
                     The following forms will be submitted for you but
@@ -80,8 +80,8 @@
                     before filing (see next step for details)
                 </p>
                 <ul>
-                    <li>{% include "partials/tooltips/form_child_support_37.html" %}</li>
-                    <li>{% include "partials/tooltips/form_desk_order_38.html" %}</li>
+                    <li>{% include "partials/tooltips/forms/child_support_37.html" %}</li>
+                    <li>{% include "partials/tooltips/forms/desk_order_38.html" %}</li>
                 </ul>
             {% endif %}
             <div id="vue-app">
diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index b5612cbe..dbc42508 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -455,53 +455,19 @@
         <ul>
             {% if original_marriage_certificate == 'YES' %}
                 <li>
-                <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                      data-html="true"
-                      title="
-                <b>Proof of marriage</b>
-                <br /><br />
-                To get a divorce, you need an original marriage certificate or certified true copy of your registration of marriage to prove you are married.
-                There are other options described in this tool if you can't get a copy of your marriage certificate or registration of marriage.
-                <br /><br />
-                - Does not require signatures.
-                ">Proof of marriage<i class="fa fa-question-circle" aria-hidden="true"></i></span>.
+                {% include "partials/tooltips/forms/proof_of_marriage.html" %}
                     Original or certified Marriage Certificate or Registration of Divorce. If not in English, also provide
-                    <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                          data-html="true"
-                          title="
-                <b>Affidavit of Translation</b>
-                <br /><br />
-                The Affidavit of Translation is an affidavit which is sworn by a translator before a notary, lawyer or commissioner for taking Affidavits.
-                The original certificate of marriage should be exhibited to the Affidavit of Translation together with the translation of the translator.
-                ">Affidavit of Translation<i class="fa fa-question-circle" aria-hidden="true"></i></span>
-                    and English translation.
+                    {% include "partials/tooltips/forms/affidavit_of_translation.html" with text="Affidavit of Translation"%}
+                    and the English translation.
                 </li>
             {% endif %}
             <li>
-                <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                      data-html="true"
-                      title="
-                <b>Registration of Divorce form</b>
-                <br /><br />
-                This form is for a central divorce registry in Ottawa.
-                They use the form to check to make sure there is no other divorce proceeding pending in Canada.
-                They also keep track of all divorces in Canada.
-                <br /><br />
-                - Does not require signatures.
-                ">Completed Registration of Divorce form (Federal)<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+                {% include "partials/tooltips/forms/registration_of_divorce.html" %}
             </li>
             {% if derived.wants_other_orders %}
                 {% if name_change_you == 'YES' or name_change_spouse == 'YES' %}
                     <li>
-                    <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                          data-html="true"
-                          title="
-                    <b>Identification of Applicant (VSA 512)</b>
-                    <br /><br />
-                    This form is used by the Court to notify Vital Statistics of court-ordered legal changes of name.
-                    <br /><br />
-                    - Does not require signatures.
-                    ">Completed Identification of Applicant (VSA 512)<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+                        {% include "partials/tooltips/forms/identification_of_applicant.html" with text="Completed Identification of Applicant (VSA 512)" %}
                         for anyone requesting a name change
                         <ul>
                             {% if name_change_you == 'YES' %}
@@ -514,16 +480,7 @@
             {% endif %}
             {% if derived.has_children_of_marriage %}
                 <li>
-                <span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                      data-html="true"
-                      title="
-                <b>Agreement as to Annual Income (F9)</b>
-                <br /><br />
-                This form is used if both you and your spouse agree on the income of the person who will be paying child support.
-                It is used instead of a Financial Statement (F8) if you need to provide the court with proof of income.
-                <br /><br />
-                - Does not require signatures.
-                ">Completed Agreement as to Annual Income (F9)<i class="fa fa-question-circle" aria-hidden="true"></i></span>
+                {% include "partials/tooltips/forms/agreement_to_annual_income_9.html" with text="Completed Agreement as to Annual Income (F9)" %}
                 </li>
             {% endif %}
         </ul>
diff --git a/edivorce/apps/core/templates/dashboard/sign_file_options.html b/edivorce/apps/core/templates/dashboard/sign_file_options.html
index 515c0b7a..86a40a64 100644
--- a/edivorce/apps/core/templates/dashboard/sign_file_options.html
+++ b/edivorce/apps/core/templates/dashboard/sign_file_options.html
@@ -30,15 +30,15 @@
         <div class="list-item-description">
             <p>You must both go together to the registry or to a commissioner for taking affidavits to swear/affirm and sign the affidavit(s).
                 This option costs less (less filing fees) and is typically faster and easier for both of you.</p>
-            <p>There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/form_desk_order_38.html" %}.
+            <p>There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/forms/desk_order_38.html" %}.
                 You must do it:</p>
             <ul>
-                <li>At the same time as you are filing your {% include "partials/tooltips/joint_family_claim_1.html" %}
+                <li>At the same time as you are filing your {% include "partials/tooltips/forms/joint_family_claim_1.html" %}
                     (You can file the Notice and swear/affirm and sign your affidavit at
                     the registry (or virtually with the registry) at the same time.)
                 </li>
                 <p style="margin-top: 20px">OR</p>
-                <li>After you've filed your {% include "partials/tooltips/joint_family_claim_1.html" %}.
+                <li>After you've filed your {% include "partials/tooltips/forms/joint_family_claim_1.html" %}.
                     (You can file the Notice first, and then come back into this tool or go to the registry to file your affidavit(s).)
                 </li>
             </ul>
@@ -53,17 +53,17 @@
         <div class="list-item-description">
             <p>You can each swear/affirm and sign your own version of the affidavit (you can go separately to the registry or a commissioner for
                 taking affidavits to swear/affirm and sign the affidavit(s)).</p>
-            <p>There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/form_desk_order_38.html" %}.
+            <p>There are strict rules for when you can swear/affirm and sign your {% include "partials/tooltips/forms/desk_order_38.html" %}.
                 You must:</p>
             <ul>
                 <li>Swear/affirm and sign one person’s affidavit(s) at the same time as you are filing
-                    your {% include "partials/tooltips/joint_family_claim_1.html" %} (You can file the
+                    your {% include "partials/tooltips/forms/joint_family_claim_1.html" %} (You can file the
                     Notice and swear your affidavit at the registry (or virtually with the registry) at the same time.)
                     This would allow one party to swear/affirm and sign their affidavit(s) before the Notice has been filed.
                 </li>
                 <p style="margin-top: 20px">OR</p>
                 <li>Swear/affirm and sign both parties’ affidavit(s) after you've filed
-                    your {% include "partials/tooltips/joint_family_claim_1.html" %}. (You can file the Notice first,
+                    your {% include "partials/tooltips/forms/joint_family_claim_1.html" %}. (You can file the Notice first,
                     and then come back into this tool or go to the registry to file your affidavit(s).)
                 </li>
             </ul>
@@ -79,15 +79,7 @@
         <li>a printer (or a print service)</li>
         <li>payment for filing fees (see More Information sidebar for more information)</li>
         <li>a copy of your marriage certificate (from any jurisdiction)</li>
-        <li><span class="tooltip-link" data-toggle="tooltip" data-placement="right"
-                  data-html="true"
-                  title="
-                <b>Registration of Joint Divorce Proceedings (JUS280)</b>
-                <br /><br />
-                This form is for a central divorce registry in Ottawa. They use the form to check to make sure there is no other divorce proceeding pending in Canada. They also keep track of all divorces in Canada.
-                <br />- Does not require signatures.">
-          Registration of Divorce Proceedings<i class="fa fa-question-circle" aria-hidden="true"></i></span> form
-        </li>
+        <li>{% include "partials/tooltips/forms/joint_divorce_proceedings.html" with text="Registration of Divorce Proceedings" %} form</li>
         <li>Both you and your spouse to sign some of the same documents</li>
         <li>You will need to have your affidavit(s) sworn/affirmed (see above)</li>
         <li>Photo ID</li>
diff --git a/edivorce/apps/core/templates/dashboard/swear_forms.html b/edivorce/apps/core/templates/dashboard/swear_forms.html
index a1bc5e55..6617b4a1 100644
--- a/edivorce/apps/core/templates/dashboard/swear_forms.html
+++ b/edivorce/apps/core/templates/dashboard/swear_forms.html
@@ -30,9 +30,9 @@
     </p>
     <ul>
         {% if derived.has_children_of_marriage %}
-            <li>{% include "partials/tooltips/form_child_support_37.html" %}</li>
+            <li>{% include "partials/tooltips/forms/child_support_37.html" %}</li>
         {% endif %}
-        <li>{% include "partials/tooltips/form_desk_order_38.html" %}</li>
+        <li>{% include "partials/tooltips/forms/desk_order_38.html" %}</li>
     </ul>
     {% if how_to_sign == 'Together' and signing_location == 'Virtual' %}
         <div>
diff --git a/edivorce/apps/core/templates/partials/tooltips/affidavit_of_translation.html b/edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/affidavit_of_translation.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/affidavit_of_translation.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/agreement_to_annual_income_9.html b/edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/agreement_to_annual_income_9.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/agreement_to_annual_income_9.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/certificate_of_pleading_36.html b/edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/certificate_of_pleading_36.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/certificate_of_pleading_36.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/form_child_support_37.html b/edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/form_child_support_37.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/child_support_37.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/form_desk_order_38.html b/edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/form_desk_order_38.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/desk_order_38.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/draft_final_order_52.html b/edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/draft_final_order_52.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/draft_final_order_52.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/identification_of_applicant.html b/edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/identification_of_applicant.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/identification_of_applicant.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/joint_divorce_proceedings.html b/edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/joint_divorce_proceedings.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/joint_divorce_proceedings.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/joint_family_claim_1.html b/edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html
similarity index 83%
rename from edivorce/apps/core/templates/partials/tooltips/joint_family_claim_1.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html
index 765b6344..5b62ad87 100644
--- a/edivorce/apps/core/templates/partials/tooltips/joint_family_claim_1.html
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/joint_family_claim_1.html
@@ -6,7 +6,7 @@
 
 {% block inner %}
     This form starts your divorce proceeding.
-    It gives the court details about you and your spouse, your marriage and separation, and what you'reasking the court for.
+    It gives the court details about you and your spouse, your marriage and separation, and what you're asking the court for.
     <br/><br/>
     - Does not require signatures when filed online.
 {% endblock %}
diff --git a/edivorce/apps/core/templates/partials/tooltips/proof_of_marriage.html b/edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/proof_of_marriage.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/proof_of_marriage.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html b/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html
new file mode 100644
index 00000000..3ec42a2f
--- /dev/null
+++ b/edivorce/apps/core/templates/partials/tooltips/forms/registration_of_divorce.html
@@ -0,0 +1,17 @@
+{% extends "partials/tooltips/base.html" %}
+
+{% block title %}
+    Registration of Divorce form
+{% endblock %}
+
+{% block inner %}
+    This form is for a central divorce registry in Ottawa.
+    They use the form to check to make sure there is no other divorce proceeding pending in Canada.
+    They also keep track of all divorces in Canada.
+    <br/><br/>
+    - Does not require signatures.
+{% endblock %}
+
+{% block label %}
+    Completed Registration of Divorce form (Federal)
+{% endblock %}
\ No newline at end of file
diff --git a/edivorce/apps/core/templates/partials/tooltips/requisition_form_35.html b/edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/requisition_form_35.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/requisition_form_35.html
diff --git a/edivorce/apps/core/templates/partials/tooltips/separation_agreement.html b/edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html
similarity index 100%
rename from edivorce/apps/core/templates/partials/tooltips/separation_agreement.html
rename to edivorce/apps/core/templates/partials/tooltips/forms/separation_agreement.html
diff --git a/edivorce/apps/core/templates/success.html b/edivorce/apps/core/templates/success.html
index b7561053..19dfe1da 100644
--- a/edivorce/apps/core/templates/success.html
+++ b/edivorce/apps/core/templates/success.html
@@ -11,7 +11,7 @@
     <p>You will need the following documents to move forward with the divorce request:</p>
     <ul>
         <li>Marriage certificate</li>
-        <li>{% include "partials/tooltips/separation_agreement.html" %} (if applicable)</li>
+        <li>{% include "partials/tooltips/forms/separation_agreement.html" %} (if applicable)</li>
         <li>{% include "partials/tooltips/court_order.html" %} (if applicable)</li>
     </ul>
 </div>