diff --git a/templates/zerver/dev_login.html b/templates/zerver/development/dev_login.html
similarity index 100%
rename from templates/zerver/dev_login.html
rename to templates/zerver/development/dev_login.html
diff --git a/templates/zerver/integrations/development/dev_panel.html b/templates/zerver/development/dev_panel.html
similarity index 100%
rename from templates/zerver/integrations/development/dev_panel.html
rename to templates/zerver/development/dev_panel.html
diff --git a/templates/zerver/dev_tools.html b/templates/zerver/development/dev_tools.html
similarity index 100%
rename from templates/zerver/dev_tools.html
rename to templates/zerver/development/dev_tools.html
diff --git a/templates/zerver/email_log.html b/templates/zerver/development/email_log.html
similarity index 100%
rename from templates/zerver/email_log.html
rename to templates/zerver/development/email_log.html
diff --git a/tools/linter_lib/custom_check.py b/tools/linter_lib/custom_check.py
index ae2d3de20d..c9b14b8499 100644
--- a/tools/linter_lib/custom_check.py
+++ b/tools/linter_lib/custom_check.py
@@ -635,7 +635,10 @@ html_rules: List["Rule"] = [
         "description": "Don't use inline event handlers (onclick=, etc. attributes) in HTML. Instead,"
         "attach a jQuery event handler ($('#foo').on('click', function () {...})) when "
         "the DOM is ready (inside a $(function () {...}) block).",
-        "exclude": {"templates/zerver/dev_login.html", "templates/corporate/upgrade.html"},
+        "exclude": {
+            "templates/zerver/development/dev_login.html",
+            "templates/corporate/upgrade.html",
+        },
         "good_lines": ["($('#foo').on('click', function () {}"],
         "bad_lines": [
             "<button id='foo' onclick='myFunction()'>Foo</button>",
@@ -661,7 +664,7 @@ html_rules: List["Rule"] = [
             "templates/zerver/emails/email_base_messages.html",
             # Email log templates; should clean up.
             "templates/zerver/email.html",
-            "templates/zerver/email_log.html",
+            "templates/zerver/development/email_log.html",
             # Social backend logos are dynamically loaded
             "templates/zerver/accounts_home.html",
             "templates/zerver/login.html",
diff --git a/zerver/views/auth.py b/zerver/views/auth.py
index 5713979548..c6d35ca8fa 100644
--- a/zerver/views/auth.py
+++ b/zerver/views/auth.py
@@ -757,7 +757,7 @@ def login_page(
 
     extra_context = kwargs.pop("extra_context", {})
     extra_context["next"] = next
-    if dev_auth_enabled() and kwargs.get("template_name") == "zerver/dev_login.html":
+    if dev_auth_enabled() and kwargs.get("template_name") == "zerver/development/dev_login.html":
         if "new_realm" in request.POST:
             try:
                 realm = get_realm(request.POST["new_realm"])
diff --git a/zerver/views/development/email_log.py b/zerver/views/development/email_log.py
index c871b89ac6..a02f4ad30d 100755
--- a/zerver/views/development/email_log.py
+++ b/zerver/views/development/email_log.py
@@ -32,7 +32,9 @@ def email_page(request: HttpRequest) -> HttpResponse:
     except FileNotFoundError:
         content = ""
     return render(
-        request, "zerver/email_log.html", {"log": content, "forward_address": get_forward_address()}
+        request,
+        "zerver/development/email_log.html",
+        {"log": content, "forward_address": get_forward_address()},
     )
 
 
diff --git a/zerver/views/development/integrations.py b/zerver/views/development/integrations.py
index 4c18d6d24a..759fa95d7a 100644
--- a/zerver/views/development/integrations.py
+++ b/zerver/views/development/integrations.py
@@ -36,7 +36,7 @@ def dev_panel(request: HttpRequest) -> HttpResponse:
         # We set isolated_page to avoid clutter from footer/header.
         "isolated_page": True,
     }
-    return render(request, "zerver/integrations/development/dev_panel.html", context)
+    return render(request, "zerver/development/dev_panel.html", context)
 
 
 def send_webhook_fixture_message(
diff --git a/zproject/dev_urls.py b/zproject/dev_urls.py
index 7ed850a878..bdafbc0d20 100644
--- a/zproject/dev_urls.py
+++ b/zproject/dev_urls.py
@@ -49,13 +49,18 @@ urls = [
         {"document_root": os.path.join(settings.DEPLOY_ROOT, "docs/_build/html")},
     ),
     # The special no-password login endpoint for development
-    path("devlogin/", login_page, {"template_name": "zerver/dev_login.html"}, name="login_page"),
+    path(
+        "devlogin/",
+        login_page,
+        {"template_name": "zerver/development/dev_login.html"},
+        name="login_page",
+    ),
     # Page for testing email templates
     path("emails/", email_page),
     path("emails/generate/", generate_all_emails),
     path("emails/clear/", clear_emails),
     # Listing of useful URLs and various tools for development
-    path("devtools/", TemplateView.as_view(template_name="zerver/dev_tools.html")),
+    path("devtools/", TemplateView.as_view(template_name="zerver/development/dev_tools.html")),
     # Register New User and Realm
     path("devtools/register_user/", register_development_user, name="register_dev_user"),
     path("devtools/register_realm/", register_development_realm, name="register_dev_realm"),