diff --git a/docs/auth_actions.md b/docs/auth_actions.md
index d1ab92938..8ef25bc4e 100644
--- a/docs/auth_actions.md
+++ b/docs/auth_actions.md
@@ -49,8 +49,8 @@ Views for all of these pages are defined in the `Auth` config file, with the `$v
     public $views = [
         'action_email_2fa'            => '\CodeIgniter\Shield\Views\email_2fa_show',
         'action_email_2fa_verify'     => '\CodeIgniter\Shield\Views\email_2fa_verify',
-        'action_email_2fa_email'      => '\CodeIgniter\Shield\Views\email_2fa_email',
-        'action_email_activate_email' => '\CodeIgniter\Shield\Views\email_activate_email',
+        'action_email_2fa_email'      => '\CodeIgniter\Shield\Views\Email\email_2fa_email',
+        'action_email_activate_email' => '\CodeIgniter\Shield\Views\Email\email_activate_email',
         'action_email_activate_show'  => '\CodeIgniter\Shield\Views\email_activate_show',
     ];
 ```
diff --git a/src/Config/Auth.php b/src/Config/Auth.php
index d0452fa73..85a6d92c5 100644
--- a/src/Config/Auth.php
+++ b/src/Config/Auth.php
@@ -23,12 +23,12 @@ class Auth extends BaseConfig
         'layout'                      => '\CodeIgniter\Shield\Views\layout',
         'action_email_2fa'            => '\CodeIgniter\Shield\Views\email_2fa_show',
         'action_email_2fa_verify'     => '\CodeIgniter\Shield\Views\email_2fa_verify',
-        'action_email_2fa_email'      => '\CodeIgniter\Shield\Views\email_2fa_email',
-        'action_email_activate_email' => '\CodeIgniter\Shield\Views\email_activate_email',
+        'action_email_2fa_email'      => '\CodeIgniter\Shield\Views\Email\email_2fa_email',
+        'action_email_activate_email' => '\CodeIgniter\Shield\Views\Email\email_activate_email',
         'action_email_activate_show'  => '\CodeIgniter\Shield\Views\email_activate_show',
         'magic-link-login'            => '\CodeIgniter\Shield\Views\magic_link_form',
         'magic-link-message'          => '\CodeIgniter\Shield\Views\magic_link_message',
-        'magic-link-email'            => '\CodeIgniter\Shield\Views\magic_link_email',
+        'magic-link-email'            => '\CodeIgniter\Shield\Views\Email\magic_link_email',
     ];
 
     /**
diff --git a/src/Views/email_2fa_email.php b/src/Views/Email/email_2fa_email.php
similarity index 100%
rename from src/Views/email_2fa_email.php
rename to src/Views/Email/email_2fa_email.php
diff --git a/src/Views/email_activate_email.php b/src/Views/Email/email_activate_email.php
similarity index 100%
rename from src/Views/email_activate_email.php
rename to src/Views/Email/email_activate_email.php
diff --git a/src/Views/magic_link_email.php b/src/Views/Email/magic_link_email.php
similarity index 100%
rename from src/Views/magic_link_email.php
rename to src/Views/Email/magic_link_email.php