diff --git a/src/http/handle_admin_index.rs b/src/http/handle_admin_index.rs
index ef901eb..aa07cd5 100644
--- a/src/http/handle_admin_index.rs
+++ b/src/http/handle_admin_index.rs
@@ -17,7 +17,7 @@ pub(crate) async fn handle_admin_index(
     );
 
     Ok(RenderHtml(
-        "admin.en-us.html",
+        "en-us/admin.html",
         admin_ctx.web_context.engine.clone(),
         template_context! {
             ..admin_template_context(&admin_ctx, &canonical_url),
diff --git a/src/http/handle_create_event.rs b/src/http/handle_create_event.rs
index e4074d3..19cb408 100644
--- a/src/http/handle_create_event.rs
+++ b/src/http/handle_create_event.rs
@@ -392,7 +392,7 @@ pub(crate) async fn handle_starts_at_builder(
     let is_development = cfg!(debug_assertions);
 
     let render_template = format!(
-        "create_event.{}.starts_form.html",
+        "{}/create_event.starts_form.html",
         language.to_string().to_lowercase()
     );
 
@@ -480,7 +480,7 @@ pub(crate) async fn handle_location_at_builder(
     let is_development = cfg!(debug_assertions);
 
     let render_template = format!(
-        "create_event.{}.location_form.html",
+        "{}/create_event.location_form.html",
         language.to_string().to_lowercase()
     );
 
@@ -554,7 +554,7 @@ pub(crate) async fn handle_link_at_builder(
     let is_development = cfg!(debug_assertions);
 
     let render_template = format!(
-        "create_event.{}.link_form.html",
+        "{}/create_event.link_form.html",
         language.to_string().to_lowercase()
     );
 
diff --git a/src/http/handle_settings.rs b/src/http/handle_settings.rs
index 15683f8..c8632bb 100644
--- a/src/http/handle_settings.rs
+++ b/src/http/handle_settings.rs
@@ -95,7 +95,7 @@ pub(crate) async fn handle_timezone_update(
     };
 
     let error_template = select_template!(false, true, language);
-    let render_template = format!("settings.{}.tz.html", language.to_string().to_lowercase());
+    let render_template = format!("{}/settings.tz.html", language.to_string().to_lowercase());
 
     let (_, timezones) = supported_timezones(Some(&current_handle));
 
@@ -161,7 +161,7 @@ pub(crate) async fn handle_language_update(
 
     let error_template = select_template!(false, true, language);
     let render_template = format!(
-        "settings.{}.language.html",
+        "{}/settings.language.html",
         language.to_string().to_lowercase()
     );
 
@@ -254,7 +254,7 @@ pub(crate) async fn handle_email_update(
 
     let error_template = select_template!(false, true, language);
     let render_template = format!(
-        "settings.{}.email.html",
+        "{}/settings.email.html",
         language.to_string().to_lowercase()
     );
 
diff --git a/src/http/handle_view_feed.rs b/src/http/handle_view_feed.rs
index db4e4a9..5ea187b 100644
--- a/src/http/handle_view_feed.rs
+++ b/src/http/handle_view_feed.rs
@@ -16,9 +16,9 @@ pub(crate) async fn handle_view_feed(
     Cached(auth): Cached<Auth>,
 ) -> Result<impl IntoResponse, WebError> {
     let render_template = if hx_boosted {
-        format!("index.{}.bare.html", language.to_string().to_lowercase())
+        format!("{}/index.bare.html", language.to_string().to_lowercase())
     } else {
-        format!("index.{}.html", language.to_string().to_lowercase())
+        format!("{}/index.html", language.to_string().to_lowercase())
     };
 
     Ok(RenderHtml(
diff --git a/src/http/macros.rs b/src/http/macros.rs
index 8aa62ad..c9f3b60 100644
--- a/src/http/macros.rs
+++ b/src/http/macros.rs
@@ -6,18 +6,21 @@ macro_rules! select_template {
     ($template_name:expr, $hxboosted:expr, $hxrequest:expr, $language:expr) => {{
         if $hxboosted {
             format!(
-                concat!($template_name, ".{}.bare.html"),
-                $language.to_string().to_lowercase()
+                "{}/{}.bare.html",
+                $language.to_string().to_lowercase(),
+                $template_name
             )
         } else if $hxrequest {
             format!(
-                concat!($template_name, ".{}.partial.html"),
-                $language.to_string().to_lowercase()
+                "{}/{}.partial.html",
+                $language.to_string().to_lowercase(),
+                $template_name
             )
         } else {
             format!(
-                concat!($template_name, ".{}.html"),
-                $language.to_string().to_lowercase()
+                "{}/{}.html",
+                $language.to_string().to_lowercase(),
+                $template_name
             )
         }
     }};
diff --git a/src/http/templates.rs b/src/http/templates.rs
index 5be32b0..30fbd21 100644
--- a/src/http/templates.rs
+++ b/src/http/templates.rs
@@ -9,7 +9,7 @@ pub(crate) fn render_alert<E: TemplateEngine, S: Into<String>>(
     default_context: minijinja::Value,
 ) -> impl IntoResponse {
     RenderHtml(
-        format!("prompt.{}.html", language),
+        format!("{}/prompt.html", language),
         engine,
         template_context! { ..default_context, ..template_context! {
             message => message.into(),
diff --git a/templates/acknowledgement.en-us.bare.html b/templates/acknowledgement.en-us.bare.html
deleted file mode 100644
index 6b94b91..0000000
--- a/templates/acknowledgement.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'acknowledgement.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/bare.en-us.html b/templates/bare.en-us.html
deleted file mode 100644
index ca1e96b..0000000
--- a/templates/bare.en-us.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% include 'nav.en-us.html' %}
-{% block content %}{% endblock %}
-{% include 'footer.en-us.html' %}
\ No newline at end of file
diff --git a/templates/cookie-policy.en-us.bare.html b/templates/cookie-policy.en-us.bare.html
deleted file mode 100644
index 27915d8..0000000
--- a/templates/cookie-policy.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'cookie-policy.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/create_event.en-us.bare.html b/templates/create_event.en-us.bare.html
deleted file mode 100644
index f1080b6..0000000
--- a/templates/create_event.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'create_event.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/create_rsvp.en-us.bare.html b/templates/create_rsvp.en-us.bare.html
deleted file mode 100644
index 03d051c..0000000
--- a/templates/create_rsvp.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'create_rsvp.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/edit_event.en-us.bare.html b/templates/edit_event.en-us.bare.html
deleted file mode 100644
index 3c9cfe3..0000000
--- a/templates/edit_event.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'edit_event.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/edit_event.en-us.partial.html b/templates/edit_event.en-us.partial.html
deleted file mode 100644
index 786a70f..0000000
--- a/templates/edit_event.en-us.partial.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include 'create_event.en-us.partial.html' %}
\ No newline at end of file
diff --git a/templates/en-us/acknowledgement.bare.html b/templates/en-us/acknowledgement.bare.html
new file mode 100644
index 0000000..9531072
--- /dev/null
+++ b/templates/en-us/acknowledgement.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/acknowledgement.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/acknowledgement.en-us.common.html b/templates/en-us/acknowledgement.common.html
similarity index 100%
rename from templates/acknowledgement.en-us.common.html
rename to templates/en-us/acknowledgement.common.html
diff --git a/templates/acknowledgement.en-us.html b/templates/en-us/acknowledgement.html
similarity index 60%
rename from templates/acknowledgement.en-us.html
rename to templates/en-us/acknowledgement.html
index e6b7b99..76dc1c9 100644
--- a/templates/acknowledgement.en-us.html
+++ b/templates/en-us/acknowledgement.html
@@ -1,6 +1,6 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Acknowledgement - Smoke Signal{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
-{% include 'acknowledgement.en-us.common.html' %}
+{% include 'en-us/acknowledgement.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/admin.en-us.html b/templates/en-us/admin.html
similarity index 96%
rename from templates/admin.en-us.html
rename to templates/en-us/admin.html
index bd96357..461c4cd 100644
--- a/templates/admin.en-us.html
+++ b/templates/en-us/admin.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal Admin{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
diff --git a/templates/admin_denylist.en-us.html b/templates/en-us/admin_denylist.html
similarity index 98%
rename from templates/admin_denylist.en-us.html
rename to templates/en-us/admin_denylist.html
index fc8ecf0..2f66081 100644
--- a/templates/admin_denylist.en-us.html
+++ b/templates/en-us/admin_denylist.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% include 'pagination.html' %}
 {% block title %}Manage Denylist - Smoke Signal Admin{% endblock %}
 {% block head %}{% endblock %}
diff --git a/templates/admin_event.en-us.html b/templates/en-us/admin_event.html
similarity index 96%
rename from templates/admin_event.en-us.html
rename to templates/en-us/admin_event.html
index c784fa1..ef24328 100644
--- a/templates/admin_event.en-us.html
+++ b/templates/en-us/admin_event.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Event Record - Smoke Signal Admin{% endblock %}
 {% block head %}
 <style>
diff --git a/templates/admin_events.en-us.html b/templates/en-us/admin_events.html
similarity index 98%
rename from templates/admin_events.en-us.html
rename to templates/en-us/admin_events.html
index f946074..80547d1 100644
--- a/templates/admin_events.en-us.html
+++ b/templates/en-us/admin_events.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% include 'pagination.html' %}
 {% block title %}Events - Smoke Signal Admin{% endblock %}
 {% block head %}{% endblock %}
diff --git a/templates/admin_handles.en-us.html b/templates/en-us/admin_handles.html
similarity index 98%
rename from templates/admin_handles.en-us.html
rename to templates/en-us/admin_handles.html
index 96852df..7dffec5 100644
--- a/templates/admin_handles.en-us.html
+++ b/templates/en-us/admin_handles.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% include 'pagination.html' %}
 {% block title %}Handles - Smoke Signal Admin{% endblock %}
 {% block head %}{% endblock %}
diff --git a/templates/admin_rsvp.en-us.html b/templates/en-us/admin_rsvp.html
similarity index 99%
rename from templates/admin_rsvp.en-us.html
rename to templates/en-us/admin_rsvp.html
index a3a48f9..fcfc889 100644
--- a/templates/admin_rsvp.en-us.html
+++ b/templates/en-us/admin_rsvp.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}RSVP Record - Smoke Signal Admin{% endblock %}
 {% block head %}
 <style>
diff --git a/templates/admin_rsvps.en-us.html b/templates/en-us/admin_rsvps.html
similarity index 99%
rename from templates/admin_rsvps.en-us.html
rename to templates/en-us/admin_rsvps.html
index b79e2cd..269c40f 100644
--- a/templates/admin_rsvps.en-us.html
+++ b/templates/en-us/admin_rsvps.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% include 'pagination.html' %}
 {% block title %}RSVPs - Smoke Signal Admin{% endblock %}
 {% block head %}{% endblock %}
diff --git a/templates/alert.en-us.bare.html b/templates/en-us/alert.bare.html
similarity index 57%
rename from templates/alert.en-us.bare.html
rename to templates/en-us/alert.bare.html
index 2bdf1e9..63438d5 100644
--- a/templates/alert.en-us.bare.html
+++ b/templates/en-us/alert.bare.html
@@ -1,8 +1,8 @@
-{% extends "bare.en-us.html" %}
+{% extends "en-us/bare.html" %}
 {% block content %}
 <section class="section">
     <div class="container">
-        {% include 'alert.en-us.partial.html' %}
+        {% include 'en-us/alert.partial.html' %}
     </div>
 </section>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/alert.en-us.html b/templates/en-us/alert.html
similarity index 69%
rename from templates/alert.en-us.html
rename to templates/en-us/alert.html
index ed15955..3e4cce2 100644
--- a/templates/alert.en-us.html
+++ b/templates/en-us/alert.html
@@ -1,10 +1,10 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
 <section class="section">
     <div class="container">
-        {% include 'alert.en-us.partial.html' %}
+        {% include 'en-us/alert.partial.html' %}
     </div>
 </section>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/alert.en-us.partial.html b/templates/en-us/alert.partial.html
similarity index 100%
rename from templates/alert.en-us.partial.html
rename to templates/en-us/alert.partial.html
diff --git a/templates/en-us/bare.html b/templates/en-us/bare.html
new file mode 100644
index 0000000..402aae0
--- /dev/null
+++ b/templates/en-us/bare.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en" class="has-navbar-fixed-top">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{% block title %}Smoke Signal{% endblock %}</title>
+    <link rel="stylesheet" href="/static/bulma.min.css">
+    <link rel="stylesheet" href="/static/fontawesome.min.css">
+    <meta name="htmx-config" content='{"globalViewTransitions":true}'>
+    <link rel="icon" type="image/x-icon" href="/favicon.ico">
+    <script src="/static/htmx.js"></script>
+    <script src="/static/loading-states.js"></script>
+    <script src="/static/sse.js"></script>
+    <script src="/static/site.js"></script>
+    {% block head %}
+    {% endblock %}
+    <meta name="theme-color" content="#00d1b2">
+</head>
+<body hx-ext="loading-states">
+    {% include 'en-us/nav.html' %}
+    {% block content %}{% endblock %}
+    {% include 'en-us/footer.html' %}
+</body>
+
+</html>
\ No newline at end of file
diff --git a/templates/base.en-us.html b/templates/en-us/base.html
similarity index 92%
rename from templates/base.en-us.html
rename to templates/en-us/base.html
index eb56c92..81e1ca4 100644
--- a/templates/base.en-us.html
+++ b/templates/en-us/base.html
@@ -19,9 +19,9 @@
     <meta name="theme-color" content="#00d1b2">
 </head>
 <body hx-ext="loading-states">
-    {% include 'nav.en-us.html' %}
+    {% include 'en-us/nav.html' %}
     {% block content %}{% endblock %}
-    {% include 'footer.en-us.html' %}
+    {% include 'en-us/footer.html' %}
 </body>
 
 </html>
\ No newline at end of file
diff --git a/templates/en-us/cookie-policy.bare.html b/templates/en-us/cookie-policy.bare.html
new file mode 100644
index 0000000..fd9816d
--- /dev/null
+++ b/templates/en-us/cookie-policy.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/cookie-policy.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/cookie-policy.en-us.common.html b/templates/en-us/cookie-policy.common.html
similarity index 100%
rename from templates/cookie-policy.en-us.common.html
rename to templates/en-us/cookie-policy.common.html
diff --git a/templates/cookie-policy.en-us.html b/templates/en-us/cookie-policy.html
similarity index 60%
rename from templates/cookie-policy.en-us.html
rename to templates/en-us/cookie-policy.html
index 3157a7d..6d03334 100644
--- a/templates/cookie-policy.en-us.html
+++ b/templates/en-us/cookie-policy.html
@@ -1,6 +1,6 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Cookie Policy - Smoke Signal{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
-{% include 'cookie-policy.en-us.common.html' %}
+{% include 'en-us/cookie-policy.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/en-us/create_event.bare.html b/templates/en-us/create_event.bare.html
new file mode 100644
index 0000000..63e28bb
--- /dev/null
+++ b/templates/en-us/create_event.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/create_event.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/create_event.en-us.common.html b/templates/en-us/create_event.common.html
similarity index 94%
rename from templates/create_event.en-us.common.html
rename to templates/en-us/create_event.common.html
index dff2eb4..3b14fe9 100644
--- a/templates/create_event.en-us.common.html
+++ b/templates/en-us/create_event.common.html
@@ -20,7 +20,7 @@
         </div>
       </article> 
 
-    {% include 'create_event.en-us.partial.html' %}
+    {% include 'en-us/create_event.partial.html' %}
 
   </div>
 </section>
diff --git a/templates/create_event.en-us.html b/templates/en-us/create_event.html
similarity index 61%
rename from templates/create_event.en-us.html
rename to templates/en-us/create_event.html
index 9ce1418..1205a92 100644
--- a/templates/create_event.en-us.html
+++ b/templates/en-us/create_event.html
@@ -1,6 +1,6 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal - Create Event{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
-{% include 'create_event.en-us.common.html' %}
+{% include 'en-us/create_event.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/create_event.en-us.link_form.html b/templates/en-us/create_event.link_form.html
similarity index 100%
rename from templates/create_event.en-us.link_form.html
rename to templates/en-us/create_event.link_form.html
diff --git a/templates/create_event.en-us.location_form.html b/templates/en-us/create_event.location_form.html
similarity index 100%
rename from templates/create_event.en-us.location_form.html
rename to templates/en-us/create_event.location_form.html
diff --git a/templates/create_event.en-us.partial.html b/templates/en-us/create_event.partial.html
similarity index 98%
rename from templates/create_event.en-us.partial.html
rename to templates/en-us/create_event.partial.html
index a577fcc..3db5959 100644
--- a/templates/create_event.en-us.partial.html
+++ b/templates/en-us/create_event.partial.html
@@ -125,12 +125,12 @@
     </div>
 
     <div class="box content pb-0">
-        {% include "create_event.en-us.starts_form.html" %}
+        {% include "en-us/create_event.starts_form.html" %}
     </div>
 
     <div class="box content">
         {% if locations_editable or create_event %}
-        {% include "create_event.en-us.location_form.html" %}
+        {% include "en-us/create_event.location_form.html" %}
         {% else %}
         <div class="field">
             <label class="label">Location</label>
@@ -172,7 +172,7 @@
     </div>
 
     <div class="box content">
-        {% include "create_event.en-us.link_form.html" %}
+        {% include "en-us/create_event.link_form.html" %}
     </div>
 
     <div class="field">
diff --git a/templates/create_event.en-us.starts_form.html b/templates/en-us/create_event.starts_form.html
similarity index 100%
rename from templates/create_event.en-us.starts_form.html
rename to templates/en-us/create_event.starts_form.html
diff --git a/templates/en-us/create_rsvp.bare.html b/templates/en-us/create_rsvp.bare.html
new file mode 100644
index 0000000..dd69c30
--- /dev/null
+++ b/templates/en-us/create_rsvp.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/create_rsvp.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/create_rsvp.en-us.common.html b/templates/en-us/create_rsvp.common.html
similarity index 92%
rename from templates/create_rsvp.en-us.common.html
rename to templates/en-us/create_rsvp.common.html
index ce91163..e71ec75 100644
--- a/templates/create_rsvp.en-us.common.html
+++ b/templates/en-us/create_rsvp.common.html
@@ -21,7 +21,7 @@
         </div>
       </article>
 
-      {% include 'create_rsvp.en-us.partial.html' %}
+      {% include 'en-us/create_rsvp.partial.html' %}
 
     </div>
 
diff --git a/templates/create_rsvp.en-us.html b/templates/en-us/create_rsvp.html
similarity index 61%
rename from templates/create_rsvp.en-us.html
rename to templates/en-us/create_rsvp.html
index cbd4f78..a41cc7d 100644
--- a/templates/create_rsvp.en-us.html
+++ b/templates/en-us/create_rsvp.html
@@ -1,6 +1,6 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal - Create RSVP{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
-{% include 'create_rsvp.en-us.common.html' %}
+{% include 'en-us/create_rsvp.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/create_rsvp.en-us.partial.html b/templates/en-us/create_rsvp.partial.html
similarity index 100%
rename from templates/create_rsvp.en-us.partial.html
rename to templates/en-us/create_rsvp.partial.html
diff --git a/templates/delete_event.en-us.html b/templates/en-us/delete_event.html
similarity index 75%
rename from templates/delete_event.en-us.html
rename to templates/en-us/delete_event.html
index d6b1e7e..1dd6fe8 100644
--- a/templates/delete_event.en-us.html
+++ b/templates/en-us/delete_event.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal - Delete Event{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
@@ -6,7 +6,7 @@
 {% from "form_include.html" import text_input %}
 <section class="section is-fullheight">
   <div class="container ">
-    {% include 'delete_event.en-us.partial.html' %}
+    {% include 'en-us/delete_event.partial.html' %}
   </div>
 </section>
 
diff --git a/templates/delete_event.en-us.partial.html b/templates/en-us/delete_event.partial.html
similarity index 100%
rename from templates/delete_event.en-us.partial.html
rename to templates/en-us/delete_event.partial.html
diff --git a/templates/en-us/edit_event.bare.html b/templates/en-us/edit_event.bare.html
new file mode 100644
index 0000000..cfe8027
--- /dev/null
+++ b/templates/en-us/edit_event.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/edit_event.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/edit_event.en-us.common.html b/templates/en-us/edit_event.common.html
similarity index 87%
rename from templates/edit_event.en-us.common.html
rename to templates/en-us/edit_event.common.html
index 687008a..a42ee4a 100644
--- a/templates/edit_event.en-us.common.html
+++ b/templates/en-us/edit_event.common.html
@@ -4,7 +4,7 @@
   <div class="container">
     <h1 class="title">Edit Event</h1>
 
-    {% include 'create_event.en-us.partial.html' %}
+    {% include 'en-us/create_event.partial.html' %}
 
     <div class="box has-background-primary-light">
       <h2 class="title is-4">Export RSVPs</h2>
@@ -18,7 +18,7 @@
     </div>
 
     {% if delete_event_url %}
-    {% include 'delete_event.en-us.partial.html' %}
+    {% include 'en-us/delete_event.partial.html' %}
     {% endif %}
   </div>
 </section>
diff --git a/templates/edit_event.en-us.html b/templates/en-us/edit_event.html
similarity index 61%
rename from templates/edit_event.en-us.html
rename to templates/en-us/edit_event.html
index 6fb7586..3d1de69 100644
--- a/templates/edit_event.en-us.html
+++ b/templates/en-us/edit_event.html
@@ -1,6 +1,6 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal - Edit Event{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
-{% include 'edit_event.en-us.common.html' %}
+{% include 'en-us/edit_event.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/en-us/edit_event.partial.html b/templates/en-us/edit_event.partial.html
new file mode 100644
index 0000000..ccfec76
--- /dev/null
+++ b/templates/en-us/edit_event.partial.html
@@ -0,0 +1 @@
+{% include 'en-us/create_event.partial.html' %}
\ No newline at end of file
diff --git a/templates/event_list.en-us.incl.html b/templates/en-us/event_list.incl.html
similarity index 100%
rename from templates/event_list.en-us.incl.html
rename to templates/en-us/event_list.incl.html
diff --git a/templates/footer.en-us.html b/templates/en-us/footer.html
similarity index 100%
rename from templates/footer.en-us.html
rename to templates/en-us/footer.html
diff --git a/templates/en-us/import.bare.html b/templates/en-us/import.bare.html
new file mode 100644
index 0000000..df02d3f
--- /dev/null
+++ b/templates/en-us/import.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/import.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/import.en-us.common.html b/templates/en-us/import.common.html
similarity index 79%
rename from templates/import.en-us.common.html
rename to templates/en-us/import.common.html
index 9173602..f8c329e 100644
--- a/templates/import.en-us.common.html
+++ b/templates/en-us/import.common.html
@@ -6,7 +6,7 @@
 
       <h1>Import</h1>
 
-      {% include 'import.en-us.partial.html' %}
+      {% include 'en-us/import.partial.html' %}
 
     </div>
 
diff --git a/templates/import.en-us.html b/templates/en-us/import.html
similarity index 61%
rename from templates/import.en-us.html
rename to templates/en-us/import.html
index cf7d747..b9bb4af 100644
--- a/templates/import.en-us.html
+++ b/templates/en-us/import.html
@@ -1,6 +1,6 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal - Import{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
-{% include 'import.en-us.common.html' %}
+{% include 'en-us/import.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/import.en-us.partial.html b/templates/en-us/import.partial.html
similarity index 100%
rename from templates/import.en-us.partial.html
rename to templates/en-us/import.partial.html
diff --git a/templates/en-us/index.bare.html b/templates/en-us/index.bare.html
new file mode 100644
index 0000000..8945544
--- /dev/null
+++ b/templates/en-us/index.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/index.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/index.en-us.common.html b/templates/en-us/index.common.html
similarity index 100%
rename from templates/index.en-us.common.html
rename to templates/en-us/index.common.html
diff --git a/templates/index.en-us.html b/templates/en-us/index.html
similarity index 90%
rename from templates/index.en-us.html
rename to templates/en-us/index.html
index 818d70a..381b0c9 100644
--- a/templates/index.en-us.html
+++ b/templates/en-us/index.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal{% endblock %}
 {% block head %}
 <meta name="description" content="Smoke Signal is an event and RSVP management system.">
@@ -12,5 +12,5 @@
 </script>
 {% endblock %}
 {% block content %}
-{% include 'index.en-us.common.html' %}
+{% include 'en-us/index.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/login.en-us.bare.html b/templates/en-us/login.bare.html
similarity index 89%
rename from templates/login.en-us.bare.html
rename to templates/en-us/login.bare.html
index 11b9e27..158cf99 100644
--- a/templates/login.en-us.bare.html
+++ b/templates/en-us/login.bare.html
@@ -1,4 +1,4 @@
-{% extends "bare.en-us.html" %}
+{% extends "en-us/bare.html" %}
 {% block content %}
 <section class="section is-fullheight">
     <div class="container is-max-tablet">
@@ -14,7 +14,7 @@
                 </div>
             </article>
 
-            {% include 'login.en-us.partial.html' %}
+            {% include 'en-us/login.partial.html' %}
 
             <p><a target="_blank" href="https://discourse.smokesignal.events/t/login-troubleshooting/82">Trouble signing in?</a></p>
 
diff --git a/templates/login.en-us.html b/templates/en-us/login.html
similarity index 90%
rename from templates/login.en-us.html
rename to templates/en-us/login.html
index cdad298..8608480 100644
--- a/templates/login.en-us.html
+++ b/templates/en-us/login.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal - Login{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
@@ -16,7 +16,7 @@
                 </div>
             </article>
 
-            {% include 'login.en-us.partial.html' %}
+            {% include 'en-us/login.partial.html' %}
 
             <p><a target="_blank" href="https://discourse.smokesignal.events/t/login-troubleshooting/82">Trouble signing in?</a></p>
 
diff --git a/templates/login.en-us.partial.html b/templates/en-us/login.partial.html
similarity index 100%
rename from templates/login.en-us.partial.html
rename to templates/en-us/login.partial.html
diff --git a/templates/en-us/migrate_event.bare.html b/templates/en-us/migrate_event.bare.html
new file mode 100644
index 0000000..2189696
--- /dev/null
+++ b/templates/en-us/migrate_event.bare.html
@@ -0,0 +1 @@
+{% include 'en-us/migrate_event.common.html' %}
\ No newline at end of file
diff --git a/templates/migrate_event.en-us.common.html b/templates/en-us/migrate_event.common.html
similarity index 100%
rename from templates/migrate_event.en-us.common.html
rename to templates/en-us/migrate_event.common.html
diff --git a/templates/migrate_event.en-us.html b/templates/en-us/migrate_event.html
similarity index 56%
rename from templates/migrate_event.en-us.html
rename to templates/en-us/migrate_event.html
index 5d57428..2d33c5c 100644
--- a/templates/migrate_event.en-us.html
+++ b/templates/en-us/migrate_event.html
@@ -1,5 +1,5 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Event Migration Complete - Smoke Signal{% endblock %}
 {% block content %}
-{% include 'migrate_event.en-us.common.html' %}
+{% include 'en-us/migrate_event.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/nav.en-us.html b/templates/en-us/nav.html
similarity index 100%
rename from templates/nav.en-us.html
rename to templates/en-us/nav.html
diff --git a/templates/en-us/privacy-policy.bare.html b/templates/en-us/privacy-policy.bare.html
new file mode 100644
index 0000000..b5bcabd
--- /dev/null
+++ b/templates/en-us/privacy-policy.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/privacy-policy.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/privacy-policy.en-us.common.html b/templates/en-us/privacy-policy.common.html
similarity index 100%
rename from templates/privacy-policy.en-us.common.html
rename to templates/en-us/privacy-policy.common.html
diff --git a/templates/privacy-policy.en-us.html b/templates/en-us/privacy-policy.html
similarity index 60%
rename from templates/privacy-policy.en-us.html
rename to templates/en-us/privacy-policy.html
index 4ffa37d..ea89736 100644
--- a/templates/privacy-policy.en-us.html
+++ b/templates/en-us/privacy-policy.html
@@ -1,6 +1,6 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Privacy Policy - Smoke Signal{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
-{% include 'privacy-policy.en-us.common.html' %}
+{% include 'en-us/privacy-policy.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/en-us/profile.bare.html b/templates/en-us/profile.bare.html
new file mode 100644
index 0000000..f958374
--- /dev/null
+++ b/templates/en-us/profile.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/profile.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/profile.en-us.common.html b/templates/en-us/profile.common.html
similarity index 98%
rename from templates/profile.en-us.common.html
rename to templates/en-us/profile.common.html
index 709a9f4..e85e8cb 100644
--- a/templates/profile.en-us.common.html
+++ b/templates/en-us/profile.common.html
@@ -79,7 +79,7 @@
         </div>
         {% elif tab == "events" %}
         <!-- Events Tab Content -->
-        {% include 'event_list.en-us.incl.html' %}
+        {% include 'en-us/event_list.incl.html' %}
         {% if pagination %}
         {{ view_pagination((canonical_url ~ "?"), pagination) }}
         {% endif %}
diff --git a/templates/profile.en-us.html b/templates/en-us/profile.html
similarity index 91%
rename from templates/profile.en-us.html
rename to templates/en-us/profile.html
index 4e95892..5200512 100644
--- a/templates/profile.en-us.html
+++ b/templates/en-us/profile.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal{% endblock %}
 {% block head %}
 <link rel="alternate" href="at://{{ profile.did }}" />
@@ -17,5 +17,5 @@
     }
 </script>{% endblock %}
 {% block content %}
-{% include 'profile.en-us.common.html' %}
+{% include 'en-us/profile.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/en-us/settings.bare.html b/templates/en-us/settings.bare.html
new file mode 100644
index 0000000..fd46f0f
--- /dev/null
+++ b/templates/en-us/settings.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/settings.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/settings.en-us.common.html b/templates/en-us/settings.common.html
similarity index 91%
rename from templates/settings.en-us.common.html
rename to templates/en-us/settings.common.html
index 3667e6f..2802b92 100644
--- a/templates/settings.en-us.common.html
+++ b/templates/en-us/settings.common.html
@@ -32,15 +32,15 @@
                             <h2 class="subtitle">Preferences</h2>
 
                             <div id="language-form">
-                                {% include "settings.en-us.language.html" %}
+                                {% include "en-us/settings.language.html" %}
                             </div>
 
                             <div id="timezone-form">
-                                {% include "settings.en-us.tz.html" %}
+                                {% include "en-us/settings.tz.html" %}
                             </div>
 
                             <div id="email-form" class="mt-4">
-                                {% include "settings.en-us.email.html" %}
+                                {% include "en-us/settings.email.html" %}
                             </div>
                         </div>
                     </div>
diff --git a/templates/settings.en-us.email.html b/templates/en-us/settings.email.html
similarity index 100%
rename from templates/settings.en-us.email.html
rename to templates/en-us/settings.email.html
diff --git a/templates/settings.en-us.html b/templates/en-us/settings.html
similarity index 83%
rename from templates/settings.en-us.html
rename to templates/en-us/settings.html
index 48a50fb..7fd8be7 100644
--- a/templates/settings.en-us.html
+++ b/templates/en-us/settings.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Settings - Smoke Signal{% endblock %}
 {% block content %}
 <section class="section">
@@ -12,7 +12,7 @@
         </div>
         {% endif %}
 
-        {% include "settings.en-us.common.html" %}
+        {% include "en-us/settings.common.html" %}
     </div>
 </section>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/settings.en-us.language.html b/templates/en-us/settings.language.html
similarity index 100%
rename from templates/settings.en-us.language.html
rename to templates/en-us/settings.language.html
diff --git a/templates/settings.en-us.tz.html b/templates/en-us/settings.tz.html
similarity index 100%
rename from templates/settings.en-us.tz.html
rename to templates/en-us/settings.tz.html
diff --git a/templates/en-us/terms-of-service.bare.html b/templates/en-us/terms-of-service.bare.html
new file mode 100644
index 0000000..54f5d38
--- /dev/null
+++ b/templates/en-us/terms-of-service.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/terms-of-service.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/terms-of-service.en-us.common.html b/templates/en-us/terms-of-service.common.html
similarity index 100%
rename from templates/terms-of-service.en-us.common.html
rename to templates/en-us/terms-of-service.common.html
diff --git a/templates/terms-of-service.en-us.html b/templates/en-us/terms-of-service.html
similarity index 60%
rename from templates/terms-of-service.en-us.html
rename to templates/en-us/terms-of-service.html
index 1105cfb..4d87931 100644
--- a/templates/terms-of-service.en-us.html
+++ b/templates/en-us/terms-of-service.html
@@ -1,6 +1,6 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Terms of Service - Smoke Signal{% endblock %}
 {% block head %}{% endblock %}
 {% block content %}
-{% include 'terms-of-service.en-us.common.html' %}
+{% include 'en-us/terms-of-service.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/en-us/view_event.bare.html b/templates/en-us/view_event.bare.html
new file mode 100644
index 0000000..6c1a586
--- /dev/null
+++ b/templates/en-us/view_event.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/view_event.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/view_event.en-us.common.html b/templates/en-us/view_event.common.html
similarity index 100%
rename from templates/view_event.en-us.common.html
rename to templates/en-us/view_event.common.html
diff --git a/templates/view_event.en-us.html b/templates/en-us/view_event.html
similarity index 91%
rename from templates/view_event.en-us.html
rename to templates/en-us/view_event.html
index b7ee25f..164b8d5 100644
--- a/templates/view_event.en-us.html
+++ b/templates/en-us/view_event.html
@@ -1,4 +1,4 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal{% endblock %}
 {% block head %}
 <meta name="description" content="{{ event.description_short }}">
@@ -19,5 +19,5 @@
 <link rel="alternate" href="{{ event.aturi }}" />
 {% endblock %}
 {% block content %}
-{% include 'view_event.en-us.common.html' %}
+{% include 'en-us/view_event.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/en-us/view_rsvp.bare.html b/templates/en-us/view_rsvp.bare.html
new file mode 100644
index 0000000..d9d93da
--- /dev/null
+++ b/templates/en-us/view_rsvp.bare.html
@@ -0,0 +1,4 @@
+{% extends "en-us/bare.html" %}
+{% block content %}
+{% include 'en-us/view_rsvp.common.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/view_rsvp.en-us.common.html b/templates/en-us/view_rsvp.common.html
similarity index 96%
rename from templates/view_rsvp.en-us.common.html
rename to templates/en-us/view_rsvp.common.html
index 3c40341..c3161a6 100644
--- a/templates/view_rsvp.en-us.common.html
+++ b/templates/en-us/view_rsvp.common.html
@@ -26,7 +26,7 @@
                 </form>
             </div>
             <div id="rsvp-result">
-    {% include 'view_rsvp.en-us.partial.html' %}
+    {% include 'en-us/view_rsvp.partial.html' %}
             </div>
         </div>
     </div>
diff --git a/templates/view_rsvp.en-us.html b/templates/en-us/view_rsvp.html
similarity index 73%
rename from templates/view_rsvp.en-us.html
rename to templates/en-us/view_rsvp.html
index ae97fa9..1f8b53c 100644
--- a/templates/view_rsvp.en-us.html
+++ b/templates/en-us/view_rsvp.html
@@ -1,9 +1,9 @@
-{% extends "base.en-us.html" %}
+{% extends "en-us/base.html" %}
 {% block title %}Smoke Signal{% endblock %}
 {% block head %}
 <meta property="og:site_name" content="Smoke Signal" />
 <meta property="og:type" content="website" />
 {% endblock %}
 {% block content %}
-{% include 'view_rsvp.en-us.common.html' %}
+{% include 'en-us/view_rsvp.common.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/view_rsvp.en-us.partial.html b/templates/en-us/view_rsvp.partial.html
similarity index 100%
rename from templates/view_rsvp.en-us.partial.html
rename to templates/en-us/view_rsvp.partial.html
diff --git a/templates/import.en-us.bare.html b/templates/import.en-us.bare.html
deleted file mode 100644
index e83bb9c..0000000
--- a/templates/import.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'import.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/index.en-us.bare.html b/templates/index.en-us.bare.html
deleted file mode 100644
index c45c923..0000000
--- a/templates/index.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'index.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/migrate_event.en-us.bare.html b/templates/migrate_event.en-us.bare.html
deleted file mode 100644
index 856c508..0000000
--- a/templates/migrate_event.en-us.bare.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include 'migrate_event.en-us.common.html' %}
\ No newline at end of file
diff --git a/templates/privacy-policy.en-us.bare.html b/templates/privacy-policy.en-us.bare.html
deleted file mode 100644
index edc2d25..0000000
--- a/templates/privacy-policy.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'privacy-policy.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/profile.en-us.bare.html b/templates/profile.en-us.bare.html
deleted file mode 100644
index fda57c1..0000000
--- a/templates/profile.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'profile.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/settings.en-us.bare.html b/templates/settings.en-us.bare.html
deleted file mode 100644
index 4d63467..0000000
--- a/templates/settings.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'settings.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/terms-of-service.en-us.bare.html b/templates/terms-of-service.en-us.bare.html
deleted file mode 100644
index 1a435b9..0000000
--- a/templates/terms-of-service.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'terms-of-service.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/view_event.en-us.bare.html b/templates/view_event.en-us.bare.html
deleted file mode 100644
index 64d039b..0000000
--- a/templates/view_event.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'view_event.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/view_rsvp.en-us.bare.html b/templates/view_rsvp.en-us.bare.html
deleted file mode 100644
index d2454ec..0000000
--- a/templates/view_rsvp.en-us.bare.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "bare.en-us.html" %}
-{% block content %}
-{% include 'view_rsvp.en-us.common.html' %}
-{% endblock %}
\ No newline at end of file