diff --git a/app/create.rb b/app/create.rb
index 3506d43c..80c38269 100644
--- a/app/create.rb
+++ b/app/create.rb
@@ -103,7 +103,7 @@ post '/create' do
   unless education_whitelisted?
     @site.send_email(
       subject: "[Neocities] Welcome to Neocities!",
-      body: Tilt.new('./views/templates/email_welcome.erb', pretty: true).render(self)
+      body: Tilt.new('./views/templates/email/welcome.erb', pretty: true).render(self)
     )
 
     send_confirmation_email @site
diff --git a/app/supporter.rb b/app/supporter.rb
index 53b5e32a..11af2e64 100644
--- a/app/supporter.rb
+++ b/app/supporter.rb
@@ -74,7 +74,7 @@ post '/supporter/update' do
 
     site.send_email(
       subject: "[Neocities] You've become a supporter!",
-      body: Tilt.new('./views/templates/email_subscription.erb', pretty: true).render(
+      body: Tilt.new('./views/templates/email/subscription.erb', pretty: true).render(
         self, {
           username:   site.username,
           plan_name:  Site::PLAN_FEATURES[params[:plan_type].to_sym][:name],
diff --git a/views/templates/email_subscription.erb b/views/templates/email/subscription.erb
similarity index 100%
rename from views/templates/email_subscription.erb
rename to views/templates/email/subscription.erb
diff --git a/views/templates/email_welcome.erb b/views/templates/email/welcome.erb
similarity index 100%
rename from views/templates/email_welcome.erb
rename to views/templates/email/welcome.erb