diff --git a/DysonNetwork.Pass/Account/AccountService.cs b/DysonNetwork.Pass/Account/AccountService.cs
index d9c7f12..112ebe8 100644
--- a/DysonNetwork.Pass/Account/AccountService.cs
+++ b/DysonNetwork.Pass/Account/AccountService.cs
@@ -2,6 +2,7 @@ using System.Globalization;
 using DysonNetwork.Pass.Auth.OpenId;
 using DysonNetwork.Pass.Localization;
 using DysonNetwork.Pass.Mailer;
+using DysonNetwork.Pass.Resources.Emails;
 using DysonNetwork.Shared.Cache;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
@@ -447,7 +448,7 @@ public class AccountService(
                 }
 
                 await mailer
-                    .SendTemplatedEmailAsync<Emails.FactorCodeEmail, VerificationEmailModel>(
+                    .SendTemplatedEmailAsync<FactorCodeEmail, VerificationEmailModel>(
                         account.Nick,
                         contact.Content,
                         emailLocalizer["CodeEmailTitle"],
diff --git a/DysonNetwork.Pass/Account/MagicSpellService.cs b/DysonNetwork.Pass/Account/MagicSpellService.cs
index 4b007c2..916269d 100644
--- a/DysonNetwork.Pass/Account/MagicSpellService.cs
+++ b/DysonNetwork.Pass/Account/MagicSpellService.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Text.Json;
-using DysonNetwork.Pass.Emails;
 using DysonNetwork.Pass.Mailer;
+using DysonNetwork.Pass.Resources.Emails;
 using DysonNetwork.Shared.Cache;
 using DysonNetwork.Shared.Models;
 using Microsoft.EntityFrameworkCore;
diff --git a/DysonNetwork.Pass/DysonNetwork.Pass.csproj b/DysonNetwork.Pass/DysonNetwork.Pass.csproj
index 8f8e47e..6f59e43 100644
--- a/DysonNetwork.Pass/DysonNetwork.Pass.csproj
+++ b/DysonNetwork.Pass/DysonNetwork.Pass.csproj
@@ -131,4 +131,21 @@
             <LastGenOutput>SharedResource.Designer.cs</LastGenOutput>
         </EmbeddedResource>
     </ItemGroup>
+
+    <ItemGroup>
+      <_ContentIncludedByDefault Remove="Emails\AccountDeletionEmail.razor" />
+      <_ContentIncludedByDefault Remove="Emails\ContactVerificationEmail.razor" />
+      <_ContentIncludedByDefault Remove="Emails\EmailLayout.razor" />
+      <_ContentIncludedByDefault Remove="Emails\FactorCodeEmail.razor" />
+      <_ContentIncludedByDefault Remove="Emails\PasswordResetEmail.razor" />
+      <_ContentIncludedByDefault Remove="Emails\RegistrationConfirmEmail.razor" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <AdditionalFiles Include="Resources\Emails\AccountDeletionEmail.razor" />
+      <AdditionalFiles Include="Resources\Emails\ContactVerificationEmail.razor" />
+      <AdditionalFiles Include="Resources\Emails\EmailLayout.razor" />
+      <AdditionalFiles Include="Resources\Emails\PasswordResetEmail.razor" />
+      <AdditionalFiles Include="Resources\Emails\RegistrationConfirmEmail.razor" />
+    </ItemGroup>
 </Project>
diff --git a/DysonNetwork.Pass/Emails/AccountDeletionEmail.razor b/DysonNetwork.Pass/Resources/Emails/AccountDeletionEmail.razor
similarity index 100%
rename from DysonNetwork.Pass/Emails/AccountDeletionEmail.razor
rename to DysonNetwork.Pass/Resources/Emails/AccountDeletionEmail.razor
diff --git a/DysonNetwork.Pass/Emails/ContactVerificationEmail.razor b/DysonNetwork.Pass/Resources/Emails/ContactVerificationEmail.razor
similarity index 100%
rename from DysonNetwork.Pass/Emails/ContactVerificationEmail.razor
rename to DysonNetwork.Pass/Resources/Emails/ContactVerificationEmail.razor
diff --git a/DysonNetwork.Pass/Emails/EmailLayout.razor b/DysonNetwork.Pass/Resources/Emails/EmailLayout.razor
similarity index 100%
rename from DysonNetwork.Pass/Emails/EmailLayout.razor
rename to DysonNetwork.Pass/Resources/Emails/EmailLayout.razor
diff --git a/DysonNetwork.Pass/Emails/FactorCodeEmail.razor b/DysonNetwork.Pass/Resources/Emails/FactorCodeEmail.razor
similarity index 100%
rename from DysonNetwork.Pass/Emails/FactorCodeEmail.razor
rename to DysonNetwork.Pass/Resources/Emails/FactorCodeEmail.razor
diff --git a/DysonNetwork.Pass/Emails/PasswordResetEmail.razor b/DysonNetwork.Pass/Resources/Emails/PasswordResetEmail.razor
similarity index 100%
rename from DysonNetwork.Pass/Emails/PasswordResetEmail.razor
rename to DysonNetwork.Pass/Resources/Emails/PasswordResetEmail.razor
diff --git a/DysonNetwork.Pass/Emails/RegistrationConfirmEmail.razor b/DysonNetwork.Pass/Resources/Emails/RegistrationConfirmEmail.razor
similarity index 100%
rename from DysonNetwork.Pass/Emails/RegistrationConfirmEmail.razor
rename to DysonNetwork.Pass/Resources/Emails/RegistrationConfirmEmail.razor