From 2765b5d217054ef33901a4e4e35f76076c696f1c Mon Sep 17 00:00:00 2001
From: Rebecca Cremona <rcremona@law.harvard.edu>
Date: Wed, 2 Oct 2024 11:07:22 -0400
Subject: [PATCH] Split "settings" views into a separate module.

---
 .../perma/templates/docs/developer/index.html |   4 +-
 perma_web/perma/templates/docs/index.html     |   2 +-
 .../templates/docs/perma-link-creation.html   |   2 +-
 .../templates/includes/upper_right_menu.html  |  10 +-
 .../perma/templates/settings-layout.html      |  10 +-
 .../settings-affiliations.html                |   0
 ...settings-organizations-change-privacy.html |   4 +-
 .../settings-password.html                    |   0
 .../settings-profile.html                     |   2 +-
 .../settings-subscription-cancel-confirm.html |   0
 .../settings-subscription-update.html         |   0
 .../settings-tools.html                       |   0
 .../settings-usage-plan-unavailable.html      |   0
 .../settings-usage-plan.html                  |   0
 .../user_management/create-link.html          |  12 +-
 .../manage_single_organization.html           |   4 +-
 .../user_management/user_leave_confirm.html   |   2 +-
 perma_web/perma/tests/test_permissions.py     |   6 +-
 .../perma/tests/test_views_user_management.py | 114 ++++----
 perma_web/perma/urls.py                       |  24 +-
 perma_web/perma/views/user_management.py      | 247 +-----------------
 perma_web/perma/views/user_settings.py        | 234 +++++++++++++++++
 22 files changed, 343 insertions(+), 334 deletions(-)
 rename perma_web/perma/templates/{user_management => settings}/settings-affiliations.html (100%)
 rename perma_web/perma/templates/{user_management => settings}/settings-organizations-change-privacy.html (78%)
 rename perma_web/perma/templates/{user_management => settings}/settings-password.html (100%)
 rename perma_web/perma/templates/{user_management => settings}/settings-profile.html (96%)
 rename perma_web/perma/templates/{user_management => settings}/settings-subscription-cancel-confirm.html (100%)
 rename perma_web/perma/templates/{user_management => settings}/settings-subscription-update.html (100%)
 rename perma_web/perma/templates/{user_management => settings}/settings-tools.html (100%)
 rename perma_web/perma/templates/{user_management => settings}/settings-usage-plan-unavailable.html (100%)
 rename perma_web/perma/templates/{user_management => settings}/settings-usage-plan.html (100%)
 create mode 100644 perma_web/perma/views/user_settings.py

diff --git a/perma_web/perma/templates/docs/developer/index.html b/perma_web/perma/templates/docs/developer/index.html
index bbd6509e7..31f4068fb 100644
--- a/perma_web/perma/templates/docs/developer/index.html
+++ b/perma_web/perma/templates/docs/developer/index.html
@@ -34,10 +34,10 @@ <h2 class="body-ah">API Overview</h2>
       <h3 id="authentication" class="body-bh">Authentication</h3>
       <p class="body-text">Many of the endpoints require you to authenticate with an API key.</p>
       {% if request.user.get_api_key %}
-        <p class="body-text">Your <a href="{% url 'user_management_settings_tools' %}">API Key</a> is <code>{{ request.user.get_api_key }}</code>.</p>
+        <p class="body-text">Your <a href="{% url 'settings_tools' %}">API Key</a> is <code>{{ request.user.get_api_key }}</code>.</p>
       {% else %}
         <p class="body-text">
-          Find your API key in <a href="{% url 'user_management_settings_tools' %}">Settings > Tools</a>. Click the <i>Generate an API key</i> button to create a new key.
+          Find your API key in <a href="{% url 'settings_tools' %}">Settings > Tools</a>. Click the <i>Generate an API key</i> button to create a new key.
         </p>
         <img src="{{ STATIC_URL }}img/docs/create-api-key.png" class="img-responsive screen-shot" alt="Screenshot of Settings > Tools page. A button labeled 'Generate an API key' appears near the bottom of the page."/>
       {% endif %}
diff --git a/perma_web/perma/templates/docs/index.html b/perma_web/perma/templates/docs/index.html
index eedde4f81..02919063f 100644
--- a/perma_web/perma/templates/docs/index.html
+++ b/perma_web/perma/templates/docs/index.html
@@ -90,7 +90,7 @@ <h3 id="usage-plans" class="body-bh">Usage Plans</h3>
       <p class="body-text">We also offer a variety of paid usage plans for other groups and for individuals. To learn more about paid usage plans, please visit the <a href="{% url 'docs_accounts' %}#usage-plans">Accounts and Usage Plans</a> portion of our user guide.</p>
 
       <h3 id="creating-links" class="body-bh">Preserving records</h3>
-      <p class="body-text">To preserve a web page, log in to your account, enter the URL of the page you want to preserve and click the "Create Perma Link" button, or try one of our <a href="{% url 'user_management_settings_tools' %}">Browser Tools</a>. Perma will visit the web page at your direction and create a record of the contents of that page.</p>
+      <p class="body-text">To preserve a web page, log in to your account, enter the URL of the page you want to preserve and click the "Create Perma Link" button, or try one of our <a href="{% url 'settings_tools' %}">Browser Tools</a>. Perma will visit the web page at your direction and create a record of the contents of that page.</p>
 
       <img src="{{ STATIC_URL }}img/docs/create_link.png" class="img-responsive screen-shot" alt="A screenshot of the Create a Perma Link page. A large input field for the target URL and a 'Create Perma Link' button appear prominently at the top of the page." />
 
diff --git a/perma_web/perma/templates/docs/perma-link-creation.html b/perma_web/perma/templates/docs/perma-link-creation.html
index 7f728a8b6..5277b0aad 100644
--- a/perma_web/perma/templates/docs/perma-link-creation.html
+++ b/perma_web/perma/templates/docs/perma-link-creation.html
@@ -71,7 +71,7 @@ <h2 class="body-ah" id="creating-records">Creating Perma Records and Links</h2>
       <p class="body-test">For example, this Perma Link - <a href="http://perma.cc/9265-T4NB" target="blank">http://perma.cc/9265-T4NB</a> - points to a Perma Record of the White House homepage on November 18, 2015.</p>
 
       <h3 class="body-bh" id="web-page-preservation">Preservation Methods</h3>
-      <p class="body-text">To preserve a web page, login to your account, enter the URL of the page you want to preserve and click the "Create Perma Link" button, or try one of our <a href="{% url 'user_management_settings_tools' %}">Browser Tools</a>.</p>
+      <p class="body-text">To preserve a web page, login to your account, enter the URL of the page you want to preserve and click the "Create Perma Link" button, or try one of our <a href="{% url 'settings_tools' %}">Browser Tools</a>.</p>
       <img src="{{ STATIC_URL }}img/docs/create_link.png" class="img-responsive screen-shot" alt="A screenshot of the Create a Perma Link page. A large input field for the target URL and a 'Create Perma Link' button appear prominently at the top of the page." />
       <p class="body-text">Perma visits the URL, fetches the contents of the page, makes a record of those contents - a Perma Record - and deposits that record into the permanent collection. Perma also gives you a unique URL - a Perma Link - that's associated with the new Perma Record. </p>
       <p class="body-text">When the capture process is done, Perma shows you the Perma Record so you can verify it. </p>
diff --git a/perma_web/perma/templates/includes/upper_right_menu.html b/perma_web/perma/templates/includes/upper_right_menu.html
index 4e34d533a..9c8a2b84f 100644
--- a/perma_web/perma/templates/includes/upper_right_menu.html
+++ b/perma_web/perma/templates/includes/upper_right_menu.html
@@ -53,14 +53,14 @@ <h2 class="sr-only" id="upper_right_menu_name">Main Menu</h2>
           {% endif %}
           <li><h3 class="dropdown-header">Settings</h3>
             <ul class="dropdown-inner-list">
-              <li><a href="{% url 'user_management_settings_profile' %}">Profile</a></li>
-              <li><a href="{% url 'user_management_settings_password' %}">Password</a></li>
+              <li><a href="{% url 'settings_profile' %}">Profile</a></li>
+              <li><a href="{% url 'settings_password' %}">Password</a></li>
               {% if request.user.can_view_usage_plan %}
-                <li><a href="{% url 'user_management_settings_usage_plan' %}">Usage Plan</a></li>
+                <li><a href="{% url 'settings_usage_plan' %}">Usage Plan</a></li>
               {% endif %}
-              <li><a href="{% url 'user_management_settings_tools' %}">Tools</a></li>
+              <li><a href="{% url 'settings_tools' %}">Tools</a></li>
               {% if request.user.is_organization_user or request.user.is_registrar_user or request.user.has_registrar_pending %}
-                <li><a href="{% url 'user_management_settings_affiliations' %}">Your affiliations</a></li>
+                <li><a href="{% url 'settings_affiliations' %}">Your affiliations</a></li>
               {% endif %}
             </ul>
           </li>
diff --git a/perma_web/perma/templates/settings-layout.html b/perma_web/perma/templates/settings-layout.html
index f8a036cf1..761f78fc2 100644
--- a/perma_web/perma/templates/settings-layout.html
+++ b/perma_web/perma/templates/settings-layout.html
@@ -18,18 +18,18 @@ <h1 class="page-title">Settings</h1>
           <nav aria-label="Settings">
             <ul class="nav nav-pills nav-stacked">
 
-              <li{% if this_page == 'settings_profile' %} class="active" aria-current="page"{% endif %}><a href="{% url 'user_management_settings_profile' %}"><span>Profile</span></a></li>
+              <li{% if this_page == 'settings_profile' %} class="active" aria-current="page"{% endif %}><a href="{% url 'settings_profile' %}"><span>Profile</span></a></li>
 
-              <li{% if this_page == 'settings_password' %} class="active" aria-current="page"{% endif %}><a href="{% url 'user_management_settings_password' %}"><span>Password</span></a></li>
+              <li{% if this_page == 'settings_password' %} class="active" aria-current="page"{% endif %}><a href="{% url 'settings_password' %}"><span>Password</span></a></li>
 
               {% if request.user.can_view_usage_plan %}
-              <li{% if this_page == 'settings_usage_plan' %} class="active" aria-current="page"{% endif %}><a href="{% url 'user_management_settings_usage_plan' %}" id="dashboard-settings"><span>Usage Plan</span></a></li>
+              <li{% if this_page == 'settings_usage_plan' %} class="active" aria-current="page"{% endif %}><a href="{% url 'settings_usage_plan' %}" id="dashboard-settings"><span>Usage Plan</span></a></li>
               {% endif %}
 
-              <li{% if this_page == 'settings_tools' %} class="active" aria-current="page"{% endif %}><a href="{% url 'user_management_settings_tools' %}"><span>Tools</span></a></li>
+              <li{% if this_page == 'settings_tools' %} class="active" aria-current="page"{% endif %}><a href="{% url 'settings_tools' %}"><span>Tools</span></a></li>
 
               {% if request.user.is_organization_user or request.user.is_registrar_user or request.user.has_registrar_pending %}
-              <li{% if this_page == 'settings_affiliations' %} class="active" aria-current="page"{% endif %}><a href="{% url 'user_management_settings_affiliations' %}" id="dashboard-settings"><span>Your Affiliations</span></a></li>
+              <li{% if this_page == 'settings_affiliations' %} class="active" aria-current="page"{% endif %}><a href="{% url 'settings_affiliations' %}" id="dashboard-settings"><span>Your Affiliations</span></a></li>
               {% endif %}
 
             </ul><!--/#dashboard-tabs-->
diff --git a/perma_web/perma/templates/user_management/settings-affiliations.html b/perma_web/perma/templates/settings/settings-affiliations.html
similarity index 100%
rename from perma_web/perma/templates/user_management/settings-affiliations.html
rename to perma_web/perma/templates/settings/settings-affiliations.html
diff --git a/perma_web/perma/templates/user_management/settings-organizations-change-privacy.html b/perma_web/perma/templates/settings/settings-organizations-change-privacy.html
similarity index 78%
rename from perma_web/perma/templates/user_management/settings-organizations-change-privacy.html
rename to perma_web/perma/templates/settings/settings-organizations-change-privacy.html
index 2fd8ca285..50c1c72e3 100644
--- a/perma_web/perma/templates/user_management/settings-organizations-change-privacy.html
+++ b/perma_web/perma/templates/settings/settings-organizations-change-privacy.html
@@ -9,11 +9,11 @@ <h3 class="body-bh">Change default privacy settings for all links in <strong>{{
     {% csrf_token %}
     {% if org.default_to_private %}
       <p class="page-dek">Your Perma Links are currently <strong>Private</strong> by default.</p>
-      <a class="btn cancel" href="{% url 'user_management_settings_affiliations' %}">Cancel</a>
+      <a class="btn cancel" href="{% url 'settings_affiliations' %}">Cancel</a>
       <button type="submit" class="btn">Set to Public</button>
     {% else %}
       <p class="page-dek">Your Perma Links are currently <strong>Public</strong> by default.</p>
-      <a class="btn cancel" href="{% url 'user_management_settings_affiliations' %}">Cancel</a>
+      <a class="btn cancel" href="{% url 'settings_affiliations' %}">Cancel</a>
       <button type="submit" class="btn">Set to Private</button>
     {% endif %}
   </form>
diff --git a/perma_web/perma/templates/user_management/settings-password.html b/perma_web/perma/templates/settings/settings-password.html
similarity index 100%
rename from perma_web/perma/templates/user_management/settings-password.html
rename to perma_web/perma/templates/settings/settings-password.html
diff --git a/perma_web/perma/templates/user_management/settings-profile.html b/perma_web/perma/templates/settings/settings-profile.html
similarity index 96%
rename from perma_web/perma/templates/user_management/settings-profile.html
rename to perma_web/perma/templates/settings/settings-profile.html
index 7bd0d3db8..84f043adc 100644
--- a/perma_web/perma/templates/user_management/settings-profile.html
+++ b/perma_web/perma/templates/settings/settings-profile.html
@@ -33,7 +33,7 @@ <h2 class="body-ah">Deletion Request Received</h2>
     <h2 class="body-ah">Request Account Deletion</h2>
     <p>On request, a team member will delete your Perma.cc account. It may take up to one full business day for us to process your request. Please note that the deletion of your account will not affect the visibility of any Perma Links you have created.</p>
     <p>If you have any questions, please <a href="{% url 'contact' %}?subject=Question%20About%20Account%20Deletion">contact us</a>.</p>
-    <form method="post" action="{% url 'user_management_delete_account' %}">
+    <form method="post" action="{% url 'settings_delete_account' %}">
       {% csrf_token %}
       <button class="btn cancel" type="submit">
         Please delete my account.
diff --git a/perma_web/perma/templates/user_management/settings-subscription-cancel-confirm.html b/perma_web/perma/templates/settings/settings-subscription-cancel-confirm.html
similarity index 100%
rename from perma_web/perma/templates/user_management/settings-subscription-cancel-confirm.html
rename to perma_web/perma/templates/settings/settings-subscription-cancel-confirm.html
diff --git a/perma_web/perma/templates/user_management/settings-subscription-update.html b/perma_web/perma/templates/settings/settings-subscription-update.html
similarity index 100%
rename from perma_web/perma/templates/user_management/settings-subscription-update.html
rename to perma_web/perma/templates/settings/settings-subscription-update.html
diff --git a/perma_web/perma/templates/user_management/settings-tools.html b/perma_web/perma/templates/settings/settings-tools.html
similarity index 100%
rename from perma_web/perma/templates/user_management/settings-tools.html
rename to perma_web/perma/templates/settings/settings-tools.html
diff --git a/perma_web/perma/templates/user_management/settings-usage-plan-unavailable.html b/perma_web/perma/templates/settings/settings-usage-plan-unavailable.html
similarity index 100%
rename from perma_web/perma/templates/user_management/settings-usage-plan-unavailable.html
rename to perma_web/perma/templates/settings/settings-usage-plan-unavailable.html
diff --git a/perma_web/perma/templates/user_management/settings-usage-plan.html b/perma_web/perma/templates/settings/settings-usage-plan.html
similarity index 100%
rename from perma_web/perma/templates/user_management/settings-usage-plan.html
rename to perma_web/perma/templates/settings/settings-usage-plan.html
diff --git a/perma_web/perma/templates/user_management/create-link.html b/perma_web/perma/templates/user_management/create-link.html
index fac0d3f54..53f3ce810 100644
--- a/perma_web/perma/templates/user_management/create-link.html
+++ b/perma_web/perma/templates/user_management/create-link.html
@@ -50,18 +50,18 @@ <h1 class="create-title">Create a new <span class="nobreak">Perma Link</span></h
           {% if request.user.is_individual %}
             <p class="links-remaining-message">
               {% if subscription_status == 'problem' %}
-                Your subscription is on hold due to a <a href="{% url 'user_management_settings_usage_plan' %}">problem with your credit card</a>.<br>
+                Your subscription is on hold due to a <a href="{% url 'settings_usage_plan' %}">problem with your credit card</a>.<br>
               {% endif %}
               {% if links_remaining == 'Infinity' %}
                 {% if request.user.nonpaying %}
                   Your account has been upgraded to unlimited personal Perma Links.
                 {% else %}
-                  Your <a href="{% url 'user_management_settings_usage_plan' %}">subscription</a> includes the creation of unlimited Perma Links.
+                  Your <a href="{% url 'settings_usage_plan' %}">subscription</a> includes the creation of unlimited Perma Links.
                 {% endif %}
               {% else %}
                   You have <span class="links-remaining">{{ links_remaining }}</span> remaining Perma Links{% if links_remaining_period == "monthly" %} this month{% elif links_remaining_period == "annually" %} this year{% endif %}.
                   {% if not request.user.nonpaying and not subscription_status == 'problem' %}
-                    <br><a href="{% url 'user_management_settings_usage_plan' %}">View your subscription details or get more Perma Links</a>
+                    <br><a href="{% url 'settings_usage_plan' %}">View your subscription details or get more Perma Links</a>
                   {% endif %}
               {% endif %}
             </p>
@@ -77,16 +77,16 @@ <h1 class="create-title">Create a new <span class="nobreak">Perma Link</span></h
             </div>
             <p id="personal-links-banner" class="hide">
               {% if subscription_status == 'problem' %}
-                <a href="{% url 'user_management_settings_usage_plan' %}">Your account is on hold</a>.<br>
+                <a href="{% url 'settings_usage_plan' %}">Your account is on hold</a>.<br>
               {% elif links_remaining != 'Infinity' and not request.user.nonpaying %}
-                get <a href="{% url 'user_management_settings_usage_plan' %}">more personal links</a>
+                get <a href="{% url 'settings_usage_plan' %}">more personal links</a>
                {% endif %}
             </p>
           {% endif %}
         </fieldset>
         {% if suppress_reminder != 'true' %}
           <p id="browser-tools-message" class="limit-{% if request.user.is_individual %}true{% else %}false{% endif %}">
-            To make Perma links more quickly, try our <a href="{% url 'user_management_settings_tools' %}">browser tools</a>.
+            To make Perma links more quickly, try our <a href="{% url 'settings_tools' %}">browser tools</a>.
             <button type="button" class="close-browser-tools btn-link">
               <span aria-hidden="true">&times;</span>
               <span class="sr-only">Close</span>
diff --git a/perma_web/perma/templates/user_management/manage_single_organization.html b/perma_web/perma/templates/user_management/manage_single_organization.html
index e6338aeeb..9056e4534 100644
--- a/perma_web/perma/templates/user_management/manage_single_organization.html
+++ b/perma_web/perma/templates/user_management/manage_single_organization.html
@@ -10,10 +10,10 @@ <h3 class="body-bh">Edit organization</h3>
       <div class="settings-block">
         {% if target_org.default_to_private %}
           <p>Links are <strong>Private</strong> by default</p>
-          <a href="{% url 'user_management_settings_organizations_change_privacy' target_org.id %}" class="btn btn-default btn-xs leave-org-btn" role="button">Set to public</a>
+          <a href="{% url 'settings_organizations_change_privacy' target_org.id %}" class="btn btn-default btn-xs leave-org-btn" role="button">Set to public</a>
         {% else %}
           <p>Links are <strong>Public</strong> by default</p>
-          <a href="{% url 'user_management_settings_organizations_change_privacy' target_org.id %}" class="btn btn-default btn-xs leave-org-btn" role="button">Set to private</a>
+          <a href="{% url 'settings_organizations_change_privacy' target_org.id %}" class="btn btn-default btn-xs leave-org-btn" role="button">Set to private</a>
         {% endif %}
       </div>
       <form method="post" action="">
diff --git a/perma_web/perma/templates/user_management/user_leave_confirm.html b/perma_web/perma/templates/user_management/user_leave_confirm.html
index 2e1ca5a72..470518f4e 100644
--- a/perma_web/perma/templates/user_management/user_leave_confirm.html
+++ b/perma_web/perma/templates/user_management/user_leave_confirm.html
@@ -8,7 +8,7 @@ <h3 class="body-bh">Leave {{ org.name }}</h3>
   <div class="alert alert-danger">You will lose your sharing privileges <strong>{{ org.name }}</strong>.</div>
   <form action="" method="POST">
     {% csrf_token %}
-    <a class="btn cancel" href="{% url 'user_management_settings_affiliations' %}">Cancel</a>
+    <a class="btn cancel" href="{% url 'settings_affiliations' %}">Cancel</a>
     <button type="submit" class="btn delete-confirm">Leave {{ org.name }} forever</button>
   </form>
 
diff --git a/perma_web/perma/tests/test_permissions.py b/perma_web/perma/tests/test_permissions.py
index 3e1e7af63..f1d5b7c75 100644
--- a/perma_web/perma/tests/test_permissions.py
+++ b/perma_web/perma/tests/test_permissions.py
@@ -123,9 +123,9 @@ def test_permissions(client, admin_user, registrar_user, org_user, link_user_fac
 
         {
             'urls': [
-                ['user_management_settings_profile'],
-                ['user_management_settings_password'],
-                ['user_management_settings_tools'],
+                ['settings_profile'],
+                ['settings_password'],
+                ['settings_tools'],
                 ['create_link'],
                 ['user_delete_link', {'kwargs':{'guid':'1234-1234'},'success_status':404}],
             ],
diff --git a/perma_web/perma/tests/test_views_user_management.py b/perma_web/perma/tests/test_views_user_management.py
index f0e625faa..8a8adcad7 100644
--- a/perma_web/perma/tests/test_views_user_management.py
+++ b/perma_web/perma/tests/test_views_user_management.py
@@ -220,7 +220,7 @@ def test_registrar_can_update_registrar(self):
                              'a-name': 'new_name',
                              'a-email': 'test@test.com2',
                              'a-website': 'http://test.com'},
-                         success_url=reverse('user_management_settings_affiliations'),
+                         success_url=reverse('settings_affiliations'),
                          success_query=Registrar.objects.filter(name='new_name'))
 
     def test_registrar_cannot_update_unrelated_registrar(self):
@@ -804,7 +804,7 @@ def test_org_user_can_leave_org(self):
                           user=u,
                           data={},
                           reverse_kwargs={'args': [orgs[0].pk]},
-                          success_url=reverse('user_management_settings_affiliations'))
+                          success_url=reverse('settings_affiliations'))
 
         # returns to create/manage page if no longer a member of any orgs
         self.submit_form('user_management_organization_user_leave_organization',
@@ -1260,7 +1260,7 @@ def test_can_remove_self_from_admin(self):
     ### SETTINGS ###
 
     def test_user_can_change_own_settings(self):
-        response = self.submit_form('user_management_settings_profile',
+        response = self.submit_form('settings_profile',
                                      user=self.admin_user,
                                      data={
                                          'a-first_name': 'Newfirst',
@@ -1272,12 +1272,12 @@ def test_user_can_change_own_settings(self):
         self.assertIn(bytes('Profile saved!', 'utf-8'), response.content)
 
     def test_user_can_request_deletion_once(self):
-        deletion_url = reverse('user_management_delete_account')
+        deletion_url = reverse('settings_delete_account')
         self.assertNotIn('Requested account deletion', self.regular_user.notes)
-        response1 = self.get('user_management_settings_profile',
+        response1 = self.get('settings_profile',
                              user=self.regular_user).content
         self.assertIn(bytes('<form method="post" action="{}"'.format(deletion_url), 'utf-8'), response1)
-        response2 = self.post('user_management_delete_account',
+        response2 = self.post('settings_delete_account',
                              user=self.regular_user,
                              request_kwargs={"follow": True}).content
         self.assertNotIn(bytes('<form method="post" action="{}"'.format(deletion_url), 'utf-8'), response2)
@@ -1294,37 +1294,37 @@ def test_edit_org_privacy(self):
         '''
 
         # Toggle as an org user
-        response = self.get('user_management_settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
+        response = self.get('settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
                              user='test_org_user@example.com').content
         self.assertIn(b"Your Perma Links are currently <strong>Public</strong> by default.", response)
-        self.submit_form('user_management_settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
+        self.submit_form('settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
                           user='test_org_user@example.com',
                           data={},
-                          success_url=reverse('user_management_settings_affiliations'))
-        response = self.get('user_management_settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
+                          success_url=reverse('settings_affiliations'))
+        response = self.get('settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
                              user='test_org_user@example.com').content
         self.assertIn(b"Your Perma Links are currently <strong>Private</strong> by default.", response)
 
         # Toggle as a registrar user
-        self.submit_form('user_management_settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
+        self.submit_form('settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
                   user='test_registrar_user@example.com',
                   data={},
                   success_url=reverse('user_management_manage_organization'))
-        response = self.get('user_management_settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
+        response = self.get('settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
                              user='test_registrar_user@example.com').content
         self.assertIn(b"Your Perma Links are currently <strong>Public</strong> by default.", response)
 
         # Toggle as a staff user
-        self.submit_form('user_management_settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
+        self.submit_form('settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
                   user='test_admin_user@example.com',
                   data={},
                   success_url=reverse('user_management_manage_organization'))
-        response = self.get('user_management_settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
+        response = self.get('settings_organizations_change_privacy', reverse_kwargs={'args':[1]},
                              user='test_admin_user@example.com').content
         self.assertIn(b"Your Perma Links are currently <strong>Private</strong> by default.", response)
 
         # As staff, try to access non-existent org
-        self.get('user_management_settings_organizations_change_privacy', reverse_kwargs={'args':[99999]},
+        self.get('settings_organizations_change_privacy', reverse_kwargs={'args':[99999]},
                   user='test_admin_user@example.com',
                   require_status_code=404)
 
@@ -1334,14 +1334,14 @@ def test_edit_org_privacy(self):
     def test_nonpaying_user_cannot_see_usage_plan_page(self):
         u = LinkUser.objects.get(email='test_nonpaying_user@example.com')
         assert not u.can_view_usage_plan()
-        self.get('user_management_settings_usage_plan',
+        self.get('settings_usage_plan',
                   user=u,
                   require_status_code=403)
 
     def test_regular_user_can_see_usage_plan_page(self):
         u = LinkUser.objects.get(email='test_user@example.com')
         assert u.can_view_usage_plan()
-        self.get('user_management_settings_usage_plan',
+        self.get('settings_usage_plan',
                   user=u,
                   require_status_code=200)
 
@@ -1355,7 +1355,7 @@ def test_no_purchase_history_section_if_no_one_time_purchases(self, get_purchase
         get_purchase_history.return_value = {'purchases': [], 'total_links': 0}
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         self.assertNotIn(b'Purchase History', r.content)
@@ -1378,7 +1378,7 @@ def test_purchase_history_present_if_one_time_purchases(self, get_purchase_histo
         }
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         self.assertIn(b'Purchase History', r.content)
@@ -1399,7 +1399,7 @@ def test_subscribe_form_if_no_standing_subscription(self, get_purchase_history,
         get_purchase_history.return_value = {'purchases': [], 'total_links': 0}
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         individual_tier_count = len(settings.TIERS['Individual'])
@@ -1423,7 +1423,7 @@ def test_update_button_cancel_button_and_subscription_info_present_if_standing_s
         get_purchase_history.return_value = {'purchases': [], 'total_links': 0}
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         self.assertIn(b'Rate', r.content)
@@ -1443,7 +1443,7 @@ def test_help_present_if_subscription_on_hold(self, get_purchase_history, get_su
         get_subscription.return_value = subscription
         get_purchase_history.return_value = {'purchases': [], 'total_links': 0}
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         self.assertIn(b'problem with your credit card', r.content)
@@ -1458,7 +1458,7 @@ def test_cancellation_info_present_if_cancellation_requested(self, get_purchase_
         get_subscription.return_value = subscription
         get_purchase_history.return_value = {'purchases': [], 'total_links': 0}
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         bonus_package_count = len(settings.BONUS_PACKAGES)
@@ -1473,7 +1473,7 @@ def test_apology_page_displayed_if_perma_payments_is_down(self, get_subscription
         u = LinkUser.objects.get(email='test_user@example.com')
         get_subscription.side_effect = PermaPaymentsCommunicationException
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         self.assertNotIn(b'<input type="hidden" name="encrypted_data"', r.content)
@@ -1483,7 +1483,7 @@ def test_apology_page_displayed_if_perma_payments_is_down(self, get_subscription
     def test_unauthorized_user_cannot_see_cancellation_page(self):
         u = LinkUser.objects.get(email='test_nonpaying_user@example.com')
         assert not u.can_view_usage_plan()
-        self.post('user_management_settings_subscription_cancel',
+        self.post('settings_subscription_cancel',
                   user=u,
                   require_status_code=403)
 
@@ -1491,12 +1491,12 @@ def test_unauthorized_user_cannot_see_cancellation_page(self):
     def test_authorized_user_cant_use_get_for_cancellation_page(self):
         u = LinkUser.objects.get(email='test_user@example.com')
         assert u.can_view_usage_plan()
-        self.get('user_management_settings_subscription_cancel',
+        self.get('settings_subscription_cancel',
                   user=u,
                   require_status_code=405)
 
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.LinkUser.get_subscription', autospec=True)
     def test_authorized_user_cancellation_confirm_form(self, get_subscription, prepped):
         u = LinkUser.objects.get(email='test_user@example.com')
@@ -1505,7 +1505,7 @@ def test_authorized_user_cancellation_confirm_form(self, get_subscription, prepp
         get_subscription.return_value = subscription
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.post('user_management_settings_subscription_cancel',
+        r = self.post('settings_subscription_cancel',
                       user=u,
                       data={'account_type':'Individual'})
 
@@ -1521,13 +1521,13 @@ def test_update_page_if_no_standing_subscription(self, get_subscription):
         u = LinkUser.objects.get(email='test_user@example.com')
         get_subscription.return_value = None
 
-        self.post('user_management_settings_subscription_update',
+        self.post('settings_subscription_update',
                   user=u,
                   data={'account_type':'Individual'},
                   require_status_code=403)
 
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.prep_for_perma_payments', autospec=True)
     @patch('perma.models.LinkUser.get_subscription', autospec=True)
     def test_update_page_if_standing_subscription(self, get_subscription, prepped, prepped_v):
@@ -1537,7 +1537,7 @@ def test_update_page_if_standing_subscription(self, get_subscription, prepped, p
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
         prepped_v.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.post('user_management_settings_subscription_update',
+        r = self.post('settings_subscription_update',
                       user=u,
                       data={'account_type':'Individual'})
 
@@ -1553,7 +1553,7 @@ def test_update_page_if_standing_subscription(self, get_subscription, prepped, p
         get_subscription.assert_called_once_with(u)
 
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.prep_for_perma_payments', autospec=True)
     @patch('perma.models.LinkUser.get_subscription', autospec=True)
     def test_update_page_if_downgrade_scheduled(self, get_subscription, prepped, prepped_v):
@@ -1563,7 +1563,7 @@ def test_update_page_if_downgrade_scheduled(self, get_subscription, prepped, pre
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
         prepped_v.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.post('user_management_settings_subscription_update',
+        r = self.post('settings_subscription_update',
                       user=u,
                       data={'account_type':'Individual'})
 
@@ -1575,7 +1575,7 @@ def test_update_page_if_downgrade_scheduled(self, get_subscription, prepped, pre
         get_subscription.assert_called_once_with(u)
 
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.LinkUser.get_subscription', autospec=True)
     def test_update_page_if_subscription_on_hold(self, get_subscription, prepped):
         u = LinkUser.objects.get(email='test_user@example.com')
@@ -1583,7 +1583,7 @@ def test_update_page_if_subscription_on_hold(self, get_subscription, prepped):
         get_subscription.return_value = subscription
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.post('user_management_settings_subscription_update',
+        r = self.post('settings_subscription_update',
                       user=u,
                       data={'account_type':'Individual'})
 
@@ -1594,7 +1594,7 @@ def test_update_page_if_subscription_on_hold(self, get_subscription, prepped):
         get_subscription.assert_called_once_with(u)
 
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.LinkUser.get_subscription', autospec=True)
     def test_update_page_if_cancellation_requested(self, get_subscription, prepped):
         u = LinkUser.objects.get(email='test_user@example.com')
@@ -1602,7 +1602,7 @@ def test_update_page_if_cancellation_requested(self, get_subscription, prepped):
         get_subscription.return_value = subscription
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.post('user_management_settings_subscription_update',
+        r = self.post('settings_subscription_update',
                       user=u,
                       data={'account_type':'Individual'})
 
@@ -1625,7 +1625,7 @@ def test_registrar_user_nonpaying_registrar(self, get_purchase_history, get_subs
         get_purchase_history.return_value = {'purchases': [], 'total_links': 0}
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         # Individual tiers should be available; no registrar section should be present
@@ -1655,7 +1655,7 @@ def test_allpaying_registrar_user_sees_both_subscribe_forms(self, get_purchase_h
         get_purchase_history.return_value = {'purchases': [], 'total_links': 0}
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         # all tiers should be offered, both individual and registrar-level
@@ -1684,7 +1684,7 @@ def test_allpaying_registrar_user_sees_subscriptions_independently(self, get_pur
         get_purchase_history.return_value = {'purchases': [], 'total_links': 0}
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.get('user_management_settings_usage_plan',
+        r = self.get('settings_usage_plan',
                       user=u)
 
         # Individual tiers should be available; the registrar's subscription should be present
@@ -1710,7 +1710,7 @@ def test_allpaying_registrar_user_sees_subscriptions_independently(self, get_pur
         get_subscription_r.assert_called_once_with(u.registrar)
         get_purchase_history.assert_called_once_with(u)
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.Registrar.get_subscription', autospec=True)
     @patch('perma.models.LinkUser.get_subscription', autospec=True)
     def test_allpaying_registrar_user_personal_cancellation_confirm_form(self, get_subscription_u, get_subscription_r, prepped):
@@ -1720,7 +1720,7 @@ def test_allpaying_registrar_user_personal_cancellation_confirm_form(self, get_s
         get_subscription_u.return_value = subscription
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.post('user_management_settings_subscription_cancel',
+        r = self.post('settings_subscription_cancel',
                       user=u,
                       data={'account_type':'Individual'})
 
@@ -1733,7 +1733,7 @@ def test_allpaying_registrar_user_personal_cancellation_confirm_form(self, get_s
         get_subscription_u.assert_called_once_with(u)
 
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.Registrar.get_subscription', autospec=True)
     @patch('perma.models.LinkUser.get_subscription', autospec=True)
     def test_allpaying_registrar_user_institutional_cancellation_confirm_form(self, get_subscription_u, get_subscription_r, prepped):
@@ -1743,7 +1743,7 @@ def test_allpaying_registrar_user_institutional_cancellation_confirm_form(self,
         get_subscription_r.return_value = subscription
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.post('user_management_settings_subscription_cancel',
+        r = self.post('settings_subscription_cancel',
                       user=u,
                       data={'account_type':'Registrar'})
 
@@ -1756,7 +1756,7 @@ def test_allpaying_registrar_user_institutional_cancellation_confirm_form(self,
         get_subscription_r.assert_called_once_with(u.registrar)
 
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.LinkUser.get_subscription', autospec=True)
     def test_allpaying_registrar_user_personal_update_form(self, get_subscription, prepped):
         u = LinkUser.objects.get(email='registrar_user@firm.com')
@@ -1765,7 +1765,7 @@ def test_allpaying_registrar_user_personal_update_form(self, get_subscription, p
         get_subscription.return_value = subscription
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
-        r = self.post('user_management_settings_subscription_update',
+        r = self.post('settings_subscription_update',
                       user=u,
                       data={'account_type':'Individual'})
 
@@ -1774,7 +1774,7 @@ def test_allpaying_registrar_user_personal_update_form(self, get_subscription, p
         get_subscription.assert_called_once_with(u)
 
 
-    @patch('perma.views.user_management.prep_for_perma_payments', autospec=True)
+    @patch('perma.views.user_settings.prep_for_perma_payments', autospec=True)
     @patch('perma.models.Registrar.get_subscription', autospec=True)
     def test_allpaying_registrar_user_institutional_update_form(self, get_subscription, prepped):
         u = LinkUser.objects.get(email='registrar_user@firm.com')
@@ -1784,7 +1784,7 @@ def test_allpaying_registrar_user_institutional_update_form(self, get_subscripti
         prepped.return_value = bytes(str(sentinel.prepped), 'utf-8')
 
 
-        r = self.post('user_management_settings_subscription_update',
+        r = self.post('settings_subscription_update',
                       user=u,
                       data={'account_type':'Registrar'})
 
@@ -1796,14 +1796,14 @@ def test_allpaying_registrar_user_institutional_update_form(self, get_subscripti
     # Tools
 
     def test_api_key(self):
-        response = self.get('user_management_settings_tools',
+        response = self.get('settings_tools',
                              user='test_another_library_org_user@example.com').content
         self.assertNotIn(b'id="id_api_key"', response)
         self.submit_form('api_key_create',
                           user='test_another_library_org_user@example.com',
                           data={},
-                          success_url=reverse('user_management_settings_tools'))
-        response = self.get('user_management_settings_tools',
+                          success_url=reverse('settings_tools'))
+        response = self.get('settings_tools',
                              user='test_another_library_org_user@example.com').content
         soup = BeautifulSoup(response, 'html.parser')
         key = soup.find('input', {'id': 'id_api_key'})
@@ -1813,8 +1813,8 @@ def test_api_key(self):
         self.submit_form('api_key_create',
                           user='test_another_library_org_user@example.com',
                           data={},
-                          success_url=reverse('user_management_settings_tools'))
-        response = self.get('user_management_settings_tools',
+                          success_url=reverse('settings_tools'))
+        response = self.get('settings_tools',
                              user='test_another_library_org_user@example.com').content
         soup = BeautifulSoup(response, 'html.parser')
         key = soup.find('input', {'id': 'id_api_key'})
@@ -1829,7 +1829,7 @@ def test_affiliations(self):
             (Tries not to be overly picky about the page design and markup.)
         '''
         # As an org user
-        response = self.get('user_management_settings_affiliations',
+        response = self.get('settings_affiliations',
                              user='multi_registrar_org_user@example.com').content
         soup = BeautifulSoup(response, 'html.parser')
         registrars = soup.select('h4 a')
@@ -1842,7 +1842,7 @@ def test_affiliations(self):
             self.assertTrue(org.text.strip())
 
         # As a registrar user
-        response = self.get('user_management_settings_affiliations',
+        response = self.get('settings_affiliations',
                              user='test_registrar_user@example.com').content
         soup = BeautifulSoup(response, 'html.parser')
         registrars = soup.select('h4')
@@ -1855,7 +1855,7 @@ def test_affiliations(self):
             self.assertTrue(org.text.strip())
 
         # As a pending registrar user
-        response = self.get('user_management_settings_affiliations',
+        response = self.get('settings_affiliations',
                              user='test_requested_registrar_account@example.com').content
         self.assertIn(b'Pending Registrar', response)
         self.assertIn(b'Thank you for requesting an account for your library. Perma.cc will review your request as soon as possible.', response)
@@ -2038,7 +2038,7 @@ def test_new_library_submit_success(self):
                           data = { 'b-email': new_lib['email'],
                                    'b-website': new_lib['website'],
                                    'b-name': new_lib['name'] },
-                          success_url=reverse('user_management_settings_affiliations'),
+                          success_url=reverse('settings_affiliations'),
                           user=existing_lib_user['raw_email'])
         expected_emails_sent += 1
         self.assertEqual(len(mail.outbox), expected_emails_sent)
diff --git a/perma_web/perma/urls.py b/perma_web/perma/urls.py
index 3dc9c3b58..f0e53d8cd 100755
--- a/perma_web/perma/urls.py
+++ b/perma_web/perma/urls.py
@@ -9,7 +9,7 @@
 
 from perma.views.user_management import AddUserToOrganization, AddUserToRegistrar, AddSponsoredUserToRegistrar, AddUserToAdmin, AddRegularUser
 from .views.common import DirectTemplateView
-from .views import admin_stats, common, contact, link_management, memento, playback, service, user_management
+from .views import (admin_stats, common, contact, link_management, memento, playback, user_settings, service, user_management)
 from .forms import SetPasswordForm
 
 # between 9/5/2013 and 11/13/2014,
@@ -75,19 +75,19 @@
     ),
     re_path(r'^password/reset/complete/?$', auth_views.PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'), name='password_reset_complete'),
     re_path(r'^password/reset/done/?$', auth_views.PasswordResetDoneView.as_view(template_name='registration/password_reset_done.html'), name='password_reset_done'),
-    re_path(r'^api_key/create/?$', user_management.api_key_create, name='api_key_create'),
+    re_path(r'^api_key/create/?$', user_settings.api_key_create, name='api_key_create'),
 
     # Settings
-    re_path(r'^settings/profile/?$', user_management.settings_profile, name='user_management_settings_profile'),
-    re_path(r'^settings/profile/delete/?$', user_management.delete_account, name='user_management_delete_account'),
-    re_path(r'^settings/password/?$', user_management.settings_password, name='user_management_settings_password'),
-    re_path(r'^settings/affiliations/?$', user_management.settings_affiliations, name='user_management_settings_affiliations'),
-    re_path(r'^settings/organizations-change-privacy/(?P<org_id>\d+)/?$', user_management.settings_organizations_change_privacy, name='user_management_settings_organizations_change_privacy'),
-    re_path(r'^settings/tools/?$', user_management.settings_tools, name='user_management_settings_tools'),
-    re_path(r'^settings/usage-plan/?$', user_management.settings_usage_plan, name='user_management_settings_usage_plan'),
-    re_path(r'^settings/subscription/?$', RedirectView.as_view(url='/settings/usage-plan/', permanent=True), name='user_management_settings_subscription'),
-    re_path(r'^settings/subscription/cancel/?$', user_management.settings_subscription_cancel, name='user_management_settings_subscription_cancel'),
-    re_path(r'^settings/subscription/update/?$', user_management.settings_subscription_update, name='user_management_settings_subscription_update'),
+    re_path(r'^settings/profile/?$', user_settings.settings_profile, name='settings_profile'),
+    re_path(r'^settings/profile/delete/?$', user_settings.delete_account, name='settings_delete_account'),
+    re_path(r'^settings/password/?$', user_settings.settings_password, name='settings_password'),
+    re_path(r'^settings/affiliations/?$', user_settings.settings_affiliations, name='settings_affiliations'),
+    re_path(r'^settings/organizations-change-privacy/(?P<org_id>\d+)/?$', user_settings.settings_organizations_change_privacy, name='settings_organizations_change_privacy'),
+    re_path(r'^settings/tools/?$', user_settings.settings_tools, name='settings_tools'),
+    re_path(r'^settings/usage-plan/?$', user_settings.settings_usage_plan, name='settings_usage_plan'),
+    re_path(r'^settings/subscription/?$', RedirectView.as_view(url='/settings/usage-plan/', permanent=True), name='settings_subscription'),
+    re_path(r'^settings/subscription/cancel/?$', user_settings.settings_subscription_cancel, name='settings_subscription_cancel'),
+    re_path(r'^settings/subscription/update/?$', user_settings.settings_subscription_update, name='settings_subscription_update'),
 
     # Link management
     re_path(r'^manage/?$', RedirectView.as_view(url='/manage/create/', permanent=False)),
diff --git a/perma_web/perma/views/user_management.py b/perma_web/perma/views/user_management.py
index 0a8dd9dc6..32ab9786d 100755
--- a/perma_web/perma/views/user_management.py
+++ b/perma_web/perma/views/user_management.py
@@ -1,28 +1,25 @@
 import csv
-import itertools
 import logging
 import re
 from typing import Literal
 
 from django.core.exceptions import PermissionDenied
 from django.views.decorators.cache import never_cache
-from django.views.decorators.debug import sensitive_post_parameters, sensitive_variables
-from django.views.decorators.http import require_http_methods
+from django.views.decorators.debug import sensitive_post_parameters
+
 
 from ratelimit.decorators import ratelimit
 
 from django.views.generic import UpdateView
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm, PasswordChangeForm
+from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.tokens import default_token_generator
 from django.db import transaction
 from django.db.models import Count, F, Max, Sum
 from django.db.models.functions import Coalesce, Greatest
 from django.db.models.manager import BaseManager
-from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
@@ -60,13 +57,12 @@
     UserAddOrganizationForm,
     UserFormWithAdmin,
     UserAddAdminForm,
-    UserUpdateProfileForm,
 )
-from perma.models import Registrar, LinkUser, Organization, Link, ApiKey, Sponsorship, Folder, UserOrganizationAffiliation
+from perma.models import Registrar, LinkUser, Organization, Link, Sponsorship, Folder, UserOrganizationAffiliation
 from perma.utils import (apply_search_query, apply_pagination, apply_sort_order, get_form_data,
-    ratelimit_ip_key, user_passes_test_or_403, prep_for_perma_payments)
+    ratelimit_ip_key, user_passes_test_or_403)
 from perma.email import send_admin_email, send_user_email
-from perma.exceptions import PermaPaymentsCommunicationException
+
 
 logger = logging.getLogger(__name__)
 valid_member_sorts = ['last_name', '-last_name', 'date_joined', '-date_joined', 'last_login', '-last_login', 'link_count', '-link_count']
@@ -170,7 +166,7 @@ def manage_single_registrar(request, registrar_id):
             if request.user.is_staff:
                 return HttpResponseRedirect(reverse('user_management_manage_registrar'))
             else:
-                return HttpResponseRedirect(reverse('user_management_settings_affiliations'))
+                return HttpResponseRedirect(reverse('settings_affiliations'))
 
     return render(request, 'user_management/manage_single_registrar.html', {
         'target_registrar': target_registrar,
@@ -802,7 +798,7 @@ def form_valid(self, form):
             send_user_email(
                 self.object.raw_email,
                 self.confirmation_email_template,
-                { 'account_settings_page': f"https://{self.request.get_host()}{reverse('user_management_settings_profile')}",
+                { 'account_settings_page': f"https://{self.request.get_host()}{reverse('settings_profile')}",
                   'form': form }
             )
             messages.add_message(self.request, messages.SUCCESS,
@@ -936,7 +932,7 @@ def organization_user_leave_organization(request, org_id):
         messages.add_message(request, messages.SUCCESS, f'<h4>Success.</h4> You are no longer a member of <strong>{org.name}</strong>.', extra_tags='safe')
 
         if request.user.organizations.exists():
-            return HttpResponseRedirect(reverse('user_management_settings_affiliations'))
+            return HttpResponseRedirect(reverse('settings_affiliations'))
         else:
             return HttpResponseRedirect(reverse('create_link'))
 
@@ -1123,212 +1119,6 @@ def reactive_user_in_group(request, user_id, group_name):
     return render(request, 'user_management/user_reactivate_confirm.html', context)
 
 
-@login_required
-def settings_profile(request):
-    """
-    Settings profile, change name, change email, ...
-    """
-    if request.method == 'GET':
-        # We want the user to see their raw email address
-        request.user.email = request.user.raw_email
-
-    form = UserUpdateProfileForm(get_form_data(request), prefix = "a", instance=request.user)
-
-    if request.method == 'POST':
-        if form.is_valid():
-            form.save()
-            messages.add_message(request, messages.SUCCESS, 'Profile saved!', extra_tags='safe')
-            return HttpResponseRedirect(reverse('user_management_settings_profile'))
-
-    return render(request, 'user_management/settings-profile.html', {
-        'this_page': 'settings_profile',
-        'form': form,
-    })
-
-
-@login_required
-def delete_account(request):
-    """
-    Generate or regenerate an API key for the user
-    """
-    if request.method == "POST":
-        request.user.notes = f"Requested account deletion {timezone.now()}\n" + request.user.notes
-        request.user.save()
-        email_deletion_request(request)
-    return HttpResponseRedirect(reverse('user_management_settings_profile'))
-
-
-@login_required
-def settings_password(request):
-    """
-    Settings change password ...
-    """
-    form = PasswordChangeForm(get_form_data(request))
-    context = {
-        'this_page': 'settings_password',
-        'form': form,
-    }
-    return render(request, 'user_management/settings-password.html', context)
-
-
-@user_passes_test_or_403(lambda user: user.is_registrar_user() or user.is_organization_user or user.has_registrar_pending())
-def settings_affiliations(request):
-    """
-    Settings view organizations, leave organizations ...
-    """
-
-    pending_registrar = request.user.pending_registrar
-    if pending_registrar:
-        messages.add_message(request, messages.INFO, "Thank you for requesting an account for your library. Perma.cc will review your request as soon as possible.")
-
-    organizations = request.user.organizations.all().order_by('registrar')
-    affiliations = UserOrganizationAffiliation.objects.filter(user=request.user)
-    expires_lookup = {affiliation.organization_id: affiliation.expires_at for affiliation in affiliations}
-
-    orgs_by_registrar = {
-        registrar: [
-            {'organization': org, 'expires_at': expires_lookup.get(org.id)}
-            for org in orgs
-        ]
-        for registrar, orgs in itertools.groupby(organizations, lambda x: x.registrar)
-    }
-
-    return render(request, 'user_management/settings-affiliations.html', {
-        'this_page': 'settings_affiliations',
-        'pending_registrar': pending_registrar,
-        'orgs_by_registrar': orgs_by_registrar})
-
-
-@user_passes_test_or_403(lambda user: user.is_staff or user.is_registrar_user() or user.is_organization_user)
-def settings_organizations_change_privacy(request, org_id):
-    try:
-        org = Organization.objects.accessible_to(request.user).get(pk=org_id)
-    except Organization.DoesNotExist:
-        raise Http404
-    context = {'this_page': 'settings', 'user': request.user, 'org': org}
-
-    if request.method == 'POST':
-        org.default_to_private = not org.default_to_private
-        org.save()
-
-        if request.user.is_registrar_user() or request.user.is_staff:
-            return HttpResponseRedirect(reverse('user_management_manage_organization'))
-        else:
-            return HttpResponseRedirect(reverse('user_management_settings_affiliations'))
-
-    return render(request, 'user_management/settings-organizations-change-privacy.html', context)
-
-
-@login_required
-def settings_tools(request):
-    """
-    Settings tools ...
-    """
-    return render(request, 'user_management/settings-tools.html', {'this_page': 'settings_tools'})
-
-
-@sensitive_variables()
-@user_passes_test_or_403(lambda user: user.can_view_usage_plan())
-def settings_usage_plan(request):
-    accounts = []
-    purchase_history = {}
-    try:
-        if request.user.is_registrar_user() and not request.user.registrar.nonpaying:
-            accounts.append(request.user.registrar.get_subscription_info(timezone.now()))
-        if not request.user.nonpaying:
-            accounts.append(request.user.get_subscription_info(timezone.now()))
-            purchase_history = request.user.get_purchase_history()
-    except PermaPaymentsCommunicationException:
-        context = {
-            'this_page': 'settings_usage_plan',
-        }
-        return render(request, 'user_management/settings-usage-plan-unavailable.html', context)
-
-    context = {
-        'this_page': 'settings_usage_plan',
-        'purchase_url': settings.PURCHASE_URL,
-        'subscribe_url': settings.SUBSCRIBE_URL,
-        'cancel_confirm_url': reverse('user_management_settings_subscription_cancel'),
-        'update_url': reverse('user_management_settings_subscription_update'),
-        'accounts': accounts,
-        'purchase_history': purchase_history,
-        'bonus_packages': request.user.get_bonus_packages()
-
-    }
-    return render(request, 'user_management/settings-usage-plan.html', context)
-
-
-@sensitive_variables()
-@require_http_methods(["POST"])
-@user_passes_test_or_403(lambda user: user.can_view_usage_plan())
-def settings_subscription_cancel(request):
-    account_type = request.POST.get('account_type', '')
-    if account_type == 'Registrar':
-        customer = request.user.registrar
-    elif account_type == 'Individual':
-        customer = request.user
-    account = customer.get_subscription_info(timezone.now())
-    if not account['subscription']:
-        return HttpResponseForbidden()
-    context = {
-        'this_page': 'settings_subscription',
-        'cancel_url': settings.CANCEL_URL,
-        'customer': customer,
-        'customer_type': account_type,
-        'account': account,
-        'data': prep_for_perma_payments({
-            'customer_pk': customer.id,
-            'customer_type': account_type,
-            'timestamp': timezone.now().timestamp()
-        }).decode('utf-8')
-    }
-    return render(request, 'user_management/settings-subscription-cancel-confirm.html', context)
-
-
-@sensitive_variables()
-@require_http_methods(["POST"])
-@user_passes_test_or_403(lambda user: user.can_view_usage_plan())
-def settings_subscription_update(request):
-    account_type = request.POST.get('account_type', '')
-    if account_type == 'Registrar':
-        customer = request.user.registrar
-    elif account_type == 'Individual':
-        customer = request.user
-    account = customer.get_subscription_info(timezone.now())
-    if not account['subscription']:
-        return HttpResponseForbidden()
-    context = {
-        'this_page': 'settings_subscription',
-        'update_url': settings.UPDATE_URL,
-        'change_url': settings.CHANGE_URL,
-        'customer': customer,
-        'customer_type': account_type,
-        'account': account,
-        'update_encrypted_data': prep_for_perma_payments({
-            'customer_pk': customer.id,
-            'customer_type': account_type,
-            'timestamp': timezone.now().timestamp()
-        }).decode('utf-8')
-    }
-    return render(request, 'user_management/settings-subscription-update.html', context)
-
-
-@login_required
-def api_key_create(request):
-    """
-    Generate or regenerate an API key for the user
-    """
-
-    if request.method == "POST":
-        try:
-            # Clear key so a new one is generated on save()
-            request.user.api_key.key = None
-            request.user.api_key.save()
-        except ApiKey.DoesNotExist:
-            ApiKey.objects.create(user=request.user)
-        return HttpResponseRedirect(reverse('user_management_settings_tools'))
-
-
 def not_active(request):
     """
     Informing a user that their account is not active.
@@ -1500,7 +1290,7 @@ def libraries(request):
             else:
                 request.user.pending_registrar = new_registrar
                 request.user.save()
-                return HttpResponseRedirect(reverse('user_management_settings_affiliations'))
+                return HttpResponseRedirect(reverse('settings_affiliations'))
     else:
         request_data = request.session.get('request_data','')
         user_form = None
@@ -1843,19 +1633,4 @@ def email_premium_request(request, user):
         }
     )
 
-def email_deletion_request(request):
-    """
-    Send email to Perma.cc admins when a user requests their account be deleted
-    """
-    send_admin_email(
-        "Perma.cc account deletion request",
-        request.user.raw_email,
-        request,
-        "email/admin/deletion_request.txt",
-        {
-            "first_name": request.user.first_name,
-            "last_name": request.user.last_name,
-            "email": request.user.raw_email,
-            "admin_url": request.build_absolute_uri(reverse('admin:perma_linkuser_change', args=(request.user.id,)))
-        }
-    )
+
diff --git a/perma_web/perma/views/user_settings.py b/perma_web/perma/views/user_settings.py
new file mode 100644
index 000000000..89264b46c
--- /dev/null
+++ b/perma_web/perma/views/user_settings.py
@@ -0,0 +1,234 @@
+import itertools
+
+from django.conf import settings
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.forms import PasswordChangeForm
+from django.http import HttpResponseRedirect, Http404, HttpResponseForbidden
+from django.urls import reverse
+from django.utils import timezone
+from django.shortcuts import render
+from django.views.decorators.debug import sensitive_variables
+from django.views.decorators.http import require_http_methods
+
+from perma.email import send_admin_email
+from perma.exceptions import PermaPaymentsCommunicationException
+from perma.forms import UserUpdateProfileForm
+from perma.models import ApiKey, Organization, UserOrganizationAffiliation
+from perma.utils import get_form_data, prep_for_perma_payments, user_passes_test_or_403
+
+
+@login_required
+def settings_profile(request):
+    """
+    Settings profile, change name, change email, ...
+    """
+    if request.method == 'GET':
+        # We want the user to see their raw email address
+        request.user.email = request.user.raw_email
+
+    form = UserUpdateProfileForm(get_form_data(request), prefix = "a", instance=request.user)
+
+    if request.method == 'POST':
+        if form.is_valid():
+            form.save()
+            messages.add_message(request, messages.SUCCESS, 'Profile saved!', extra_tags='safe')
+            return HttpResponseRedirect(reverse('settings_profile'))
+
+    return render(request, 'settings/settings-profile.html', {
+        'this_page': 'settings_profile',
+        'form': form,
+    })
+
+@login_required
+def delete_account(request):
+    """
+    Generate or regenerate an API key for the user
+    """
+    if request.method == "POST":
+        request.user.notes = f"Requested account deletion {timezone.now()}\n" + request.user.notes
+        request.user.save()
+        send_admin_email(
+            "Perma.cc account deletion request",
+            request.user.raw_email,
+            request,
+            "email/admin/deletion_request.txt",
+            {
+                "first_name": request.user.first_name,
+                "last_name": request.user.last_name,
+                "email": request.user.raw_email,
+                "admin_url": request.build_absolute_uri(reverse('admin:perma_linkuser_change', args=(request.user.id,)))
+            }
+        )
+    return HttpResponseRedirect(reverse('settings_profile'))
+
+
+@login_required
+def settings_password(request):
+    """
+    Settings change password ...
+    """
+    form = PasswordChangeForm(get_form_data(request))
+    context = {
+        'this_page': 'settings_password',
+        'form': form,
+    }
+    return render(request, 'settings/settings-password.html', context)
+
+
+@user_passes_test_or_403(lambda user: user.is_registrar_user() or user.is_organization_user or user.has_registrar_pending())
+def settings_affiliations(request):
+    """
+    Settings view organizations, leave organizations ...
+    """
+
+    pending_registrar = request.user.pending_registrar
+    if pending_registrar:
+        messages.add_message(request, messages.INFO, "Thank you for requesting an account for your library. Perma.cc will review your request as soon as possible.")
+
+    organizations = request.user.organizations.all().order_by('registrar')
+    affiliations = UserOrganizationAffiliation.objects.filter(user=request.user)
+    expires_lookup = {affiliation.organization_id: affiliation.expires_at for affiliation in affiliations}
+
+    orgs_by_registrar = {
+        registrar: [
+            {'organization': org, 'expires_at': expires_lookup.get(org.id)}
+            for org in orgs
+        ]
+        for registrar, orgs in itertools.groupby(organizations, lambda x: x.registrar)
+    }
+
+    return render(request, 'settings/settings-affiliations.html', {
+        'this_page': 'settings_affiliations',
+        'pending_registrar': pending_registrar,
+        'orgs_by_registrar': orgs_by_registrar})
+
+
+@user_passes_test_or_403(lambda user: user.is_staff or user.is_registrar_user() or user.is_organization_user)
+def settings_organizations_change_privacy(request, org_id):
+    try:
+        org = Organization.objects.accessible_to(request.user).get(pk=org_id)
+    except Organization.DoesNotExist:
+        raise Http404
+    context = {'this_page': 'settings', 'user': request.user, 'org': org}
+
+    if request.method == 'POST':
+        org.default_to_private = not org.default_to_private
+        org.save()
+
+        if request.user.is_registrar_user() or request.user.is_staff:
+            return HttpResponseRedirect(reverse('user_management_manage_organization'))
+        else:
+            return HttpResponseRedirect(reverse('settings_affiliations'))
+
+    return render(request, 'settings/settings-organizations-change-privacy.html', context)
+
+
+@login_required
+def settings_tools(request):
+    """
+    Settings tools ...
+    """
+    return render(request, 'settings/settings-tools.html', {'this_page': 'settings_tools'})
+
+
+@sensitive_variables()
+@user_passes_test_or_403(lambda user: user.can_view_usage_plan())
+def settings_usage_plan(request):
+    accounts = []
+    purchase_history = {}
+    try:
+        if request.user.is_registrar_user() and not request.user.registrar.nonpaying:
+            accounts.append(request.user.registrar.get_subscription_info(timezone.now()))
+        if not request.user.nonpaying:
+            accounts.append(request.user.get_subscription_info(timezone.now()))
+            purchase_history = request.user.get_purchase_history()
+    except PermaPaymentsCommunicationException:
+        context = {
+            'this_page': 'settings_usage_plan',
+        }
+        return render(request, 'settings/settings-usage-plan-unavailable.html', context)
+
+    context = {
+        'this_page': 'settings_usage_plan',
+        'purchase_url': settings.PURCHASE_URL,
+        'subscribe_url': settings.SUBSCRIBE_URL,
+        'cancel_confirm_url': reverse('settings_subscription_cancel'),
+        'update_url': reverse('settings_subscription_update'),
+        'accounts': accounts,
+        'purchase_history': purchase_history,
+        'bonus_packages': request.user.get_bonus_packages()
+
+    }
+    return render(request, 'settings/settings-usage-plan.html', context)
+
+
+@sensitive_variables()
+@require_http_methods(["POST"])
+@user_passes_test_or_403(lambda user: user.can_view_usage_plan())
+def settings_subscription_cancel(request):
+    account_type = request.POST.get('account_type', '')
+    if account_type == 'Registrar':
+        customer = request.user.registrar
+    elif account_type == 'Individual':
+        customer = request.user
+    account = customer.get_subscription_info(timezone.now())
+    if not account['subscription']:
+        return HttpResponseForbidden()
+    context = {
+        'this_page': 'settings_subscription',
+        'cancel_url': settings.CANCEL_URL,
+        'customer': customer,
+        'customer_type': account_type,
+        'account': account,
+        'data': prep_for_perma_payments({
+            'customer_pk': customer.id,
+            'customer_type': account_type,
+            'timestamp': timezone.now().timestamp()
+        }).decode('utf-8')
+    }
+    return render(request, 'settings/settings-subscription-cancel-confirm.html', context)
+
+
+@sensitive_variables()
+@require_http_methods(["POST"])
+@user_passes_test_or_403(lambda user: user.can_view_usage_plan())
+def settings_subscription_update(request):
+    account_type = request.POST.get('account_type', '')
+    if account_type == 'Registrar':
+        customer = request.user.registrar
+    elif account_type == 'Individual':
+        customer = request.user
+    account = customer.get_subscription_info(timezone.now())
+    if not account['subscription']:
+        return HttpResponseForbidden()
+    context = {
+        'this_page': 'settings_subscription',
+        'update_url': settings.UPDATE_URL,
+        'change_url': settings.CHANGE_URL,
+        'customer': customer,
+        'customer_type': account_type,
+        'account': account,
+        'update_encrypted_data': prep_for_perma_payments({
+            'customer_pk': customer.id,
+            'customer_type': account_type,
+            'timestamp': timezone.now().timestamp()
+        }).decode('utf-8')
+    }
+    return render(request, 'settings/settings-subscription-update.html', context)
+
+
+@login_required
+def api_key_create(request):
+    """
+    Generate or regenerate an API key for the user
+    """
+
+    if request.method == "POST":
+        try:
+            # Clear key so a new one is generated on save()
+            request.user.api_key.key = None
+            request.user.api_key.save()
+        except ApiKey.DoesNotExist:
+            ApiKey.objects.create(user=request.user)
+        return HttpResponseRedirect(reverse('settings_tools'))