diff --git a/src/ProjectTemplates/README-BASELINES.md b/src/ProjectTemplates/README-BASELINES.md
new file mode 100644
index 000000000000..7268cd5eee1f
--- /dev/null
+++ b/src/ProjectTemplates/README-BASELINES.md
@@ -0,0 +1,19 @@
+# Generating template-baselines.json
+
+For small project template changes, you may be able to edit the `template-baselines.json` file manually. This is a good way to ensure you have correct expectations about the effects of your changes.
+
+For larger changes such as adding entirely new templates, it may be impractical to type out the changes to `template-baselines.json` manually. In those cases you can follow a procedure like the following.
+
+  1. Ensure you've configured the necessary environment variables:
+        - `set PATH=c:\git\dotnet\aspnetcore\.dotnet\;%PATH%` (update path as needed)
+        - `set DOTNET_ROOT=c:\git\dotnet\aspnetcore\.dotnet` (update path as needed)
+  2. Get to a position where you can execute the modified template(s) locally, i.e.:
+        - Use `dotnet pack ProjectTemplatesNoDeps.slnf` (possibly with `--no-restore --no-dependencies`) to regenerate `Microsoft.DotNet.Web.ProjectTemplates.*.nupkg`
+        - Run one of the `scripts/*.ps1` scripts to install your template pack and execute your chosen template. For example, run `powershell .\scripts\Run-BlazorWeb-Locally.ps1`
+        - Once that has run, you should see your updated template listed when you execute `dotnet new list` or `dotnet new YourTemplateName --help`. At the point you can run `dotnet new YourTemplateName -o SomePath` directly if you want. However each time you edit template sources further, you will need to run `dotnet new uninstall Microsoft.DotNet.Web.ProjectTemplates.8.0` and then go back to the start of this whole step.
+        - Tip: the following command combines the above steps, to go directly from editing template sources to an updated local project output: `dotnet pack ProjectTemplatesNoDeps.slnf --no-restore --no-dependencies && dotnet new uninstall Microsoft.DotNet.Web.ProjectTemplates.8.0 && rm -rf scripts\MyBlazorApp && powershell .\scripts\Run-BlazorWeb-Locally.ps1`
+  3. After generating a particular project's output, the following can be run in a Bash prompt (e.g., using WSL):
+        - `cd src/ProjectTemplates/scripts`
+        - `export PROJECT_NAME=MyBlazorApp` (update as necessary - note this is the name of the directly under `scripts` containing your project output)
+        - `find $PROJECT_NAME -type f -not -path "*/obj/*" -not -path "*/bin/*" -not -path "*/.publish/*" | sed -e "s/^$PROJECT_NAME\///" | sed -e "s/$PROJECT_NAME/{ProjectName}/g" | sed 's/.*/        "&",/' | sort -f`
+        - This will emit the JSON-formatted lines you can manually insert into the relevant place inside `template-baselines.json`
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index 9356b1e5a7a1..46c01aa43014 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -67,7 +67,12 @@
           "condition": "(UseWebAssembly && InteractiveAtRoot)",
           "rename": {
             "BlazorWeb-CSharp/Components/Layout/": "./BlazorWeb-CSharp.Client/Layout/",
-            "BlazorWeb-CSharp/Components/Pages/": "./BlazorWeb-CSharp.Client/Pages/",
+            "BlazorWeb-CSharp/Components/Pages/Home.razor": "./BlazorWeb-CSharp.Client/Pages/Home.razor",
+            "BlazorWeb-CSharp/Components/Pages/Home.razor.css": "./BlazorWeb-CSharp.Client/Pages/Home.razor.css",
+            "BlazorWeb-CSharp/Components/Pages/Weather.razor": "./BlazorWeb-CSharp.Client/Pages/Weather.razor",
+            "BlazorWeb-CSharp/Components/Pages/Weather.razor.css": "./BlazorWeb-CSharp.Client/Pages/Weather.razor.css",
+            "BlazorWeb-CSharp/Components/Pages/Counter.razor": "./BlazorWeb-CSharp.Client/Pages/Counter.razor",
+            "BlazorWeb-CSharp/Components/Pages/Counter.razor.css": "./BlazorWeb-CSharp.Client/Pages/Counter.razor.css",
             "BlazorWeb-CSharp/Components/Routes.razor": "./BlazorWeb-CSharp.Client/Routes.razor"
           }
         },
@@ -113,12 +118,8 @@
         {
           "condition": "(!IndividualLocalAuth)",
           "exclude": [
-            "BlazorWeb-CSharp/Components/Identity/**",
-            "BlazorWeb-CSharp/Components/Layout/ManageLayout.razor",
-            "BlazorWeb-CSharp/Components/Layout/ManageNavMenu.razor",
-            "BlazorWeb-CSharp/Components/Pages/Account/**",
+            "BlazorWeb-CSharp/Components/Account/**",
             "BlazorWeb-CSharp/Data/**",
-            "BlazorWeb-CSharp/Identity/**",
             "BlazorWeb-CSharp.Client/PersistentAuthenticationStateProvider.cs",
             "BlazorWeb-CSharp.Client/UserInfo.cs",
             "BlazorWeb-CSharp.Client/Pages/Auth.razor"
@@ -127,7 +128,7 @@
         {
           "condition": "(!(IndividualLocalAuth && !UseLocalDB))",
           "exclude": [
-            "BlazorWeb-CSharp/app.db"
+            "BlazorWeb-CSharp/Data/app.db"
           ]
         },
         {
@@ -139,19 +140,19 @@
         {
           "condition": "(!(IndividualLocalAuth && UseServer && UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Identity/PersistingRevalidatingAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && UseServer && !UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Identity/IdentityRevalidatingAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs"
           ]
         },
         {
           "condition": "(!(IndividualLocalAuth && !UseServer && UseWebAssembly))",
           "exclude": [
-            "BlazorWeb-CSharp/Identity/PersistingServerAuthenticationStateProvider.cs"
+            "BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs"
           ]
         },
         {
@@ -189,6 +190,12 @@
           "exclude": [
             "BlazorWeb-CSharp/Data/SqlServer/**"
           ]
+        },
+        {
+          "condition": "(IndividualLocalAuth && UseWebAssembly)",
+          "rename": {
+            "BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor": "BlazorWeb-CSharp.Client/RedirectToLogin.razor"
+          }
         }
       ]
     }
@@ -349,7 +356,7 @@
       "defaultValue": "InteractivePerPage",
       "displayName": "_Interactivity location",
       "description": "Chooses which components will have interactive rendering enabled",
-      "isEnabled": "(InteractivityPlatform != \"None\" && auth == \"None\")",
+      "isEnabled": "(InteractivityPlatform != \"None\")",
       "choices": [
         {
           "choice": "InteractivePerPage",
@@ -413,7 +420,7 @@
     "AllInteractive": {
       "type": "parameter",
       "datatype": "bool",
-      "isEnabled": "(InteractivityPlatform != \"None\" && auth == \"None\")",
+      "isEnabled": "(InteractivityPlatform != \"None\")",
       "defaultValue": "false",
       "displayName": "_Enable interactive rendering globally throughout the site",
       "description": "Configures whether to make every page interactive by applying an interactive render mode at the top level. If false, pages will use static server rendering by default, and can be marked interactive on a per-page or per-component basis."
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
index ea968cb71f5e..d9c00eac61aa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -3,8 +3,8 @@
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using BlazorWeb_CSharp.Components.Pages.Account;
-using BlazorWeb_CSharp.Components.Pages.Account.Manage;
+using BlazorWeb_CSharp.Components.Account.Pages;
+using BlazorWeb_CSharp.Components.Account.Pages.Manage;
 using BlazorWeb_CSharp.Data;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Primitives;
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRedirectManager.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRedirectManager.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
index 2a1cccde8fc4..d3a78a281ae3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRedirectManager.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRedirectManager.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Components;
 
-namespace BlazorWeb_CSharp.Identity;
+namespace BlazorWeb_CSharp.Components.Account;
 
 internal sealed class IdentityRedirectManager(
     NavigationManager navigationManager,
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRevalidatingAuthenticationStateProvider.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
index 237200d2cae0..c1bc3cee89b7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/IdentityRevalidatingAuthenticationStateProvider.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Options;
 using BlazorWeb_CSharp.Data;
 
-namespace BlazorWeb_CSharp.Identity;
+namespace BlazorWeb_CSharp.Components.Account;
 
 public class IdentityRevalidatingAuthenticationStateProvider : RevalidatingServerAuthenticationStateProvider
 {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmail.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmail.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
index 992c6c59694f..6a17bbb8950a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmail.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmail.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IdentityRedirectManager RedirectManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmailChange.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmailChange.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
index 510fb2d0e93f..f44ce3d24d8f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ConfirmEmailChange.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ConfirmEmailChange.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ExternalLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
similarity index 99%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ExternalLogin.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
index 51bfa81fc116..41e1a6f9d2fe 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ExternalLogin.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor
@@ -8,7 +8,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
index 605a676daad5..58ba43220a6d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPassword.razor
@@ -7,7 +7,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject NavigationManager NavigationManager
 @inject IdentityRedirectManager RedirectManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPasswordConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPasswordConfirmation.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ForgotPasswordConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ForgotPasswordConfirmation.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/InvalidPasswordReset.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidPasswordReset.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/InvalidPasswordReset.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidPasswordReset.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/InvalidUser.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidUser.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/InvalidUser.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/InvalidUser.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Lockout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Lockout.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Lockout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Lockout.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Login.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
similarity index 99%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Login.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
index f49edad1beb7..c250906f07ad 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Login.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Login.razor
@@ -6,7 +6,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject ILogger<Login> Logger
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWith2fa.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWith2fa.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
index b1a650544608..09884de25baa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWith2fa.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWith2fa.razor
@@ -3,7 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWithRecoveryCode.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWithRecoveryCode.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
index 41d5d3660810..778fec071161 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/LoginWithRecoveryCode.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/LoginWithRecoveryCode.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.Mvc
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ChangePassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ChangePassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
index aabf71983a62..b9a44982d993 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ChangePassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ChangePassword.razor
@@ -3,7 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/DeletePersonalData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/DeletePersonalData.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
index c3ed9c38635a..938c595ec098 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/DeletePersonalData.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/DeletePersonalData.razor
@@ -3,7 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Disable2fa.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Disable2fa.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
index 562b5ca26577..060b8355294c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Disable2fa.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Disable2fa.razor
@@ -2,7 +2,7 @@
 
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject UserAccessor UserAccessor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Email.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
similarity index 99%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Email.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
index c629d0a8ee8e..8f1df8e60f68 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Email.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Email.razor
@@ -7,7 +7,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject UserAccessor UserAccessor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/EnableAuthenticator.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
similarity index 99%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/EnableAuthenticator.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
index 52b3f0d68c5a..f5c0fa6dee15 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/EnableAuthenticator.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/EnableAuthenticator.razor
@@ -6,7 +6,7 @@
 @using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject UserAccessor UserAccessor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ExternalLogins.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
similarity index 99%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ExternalLogins.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
index 4ff1ec38044a..53bd316ca9ec 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ExternalLogins.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.Mvc.ViewFeatures
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
index 3de6f69e9c40..4b298e0116f0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
@@ -2,7 +2,7 @@
 
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject UserAccessor UserAccessor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Index.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Index.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
index 7e59b2732987..a39a411be2cb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/Index.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor
@@ -4,7 +4,7 @@
 @using System.Security.Claims
 @using Microsoft.AspNetCore.Identity;
 @using BlazorWeb_CSharp.Data;
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/PersonalData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/PersonalData.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/PersonalData.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/PersonalData.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ResetAuthenticator.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ResetAuthenticator.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
index dd951c7d2410..e0fceda2d469 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/ResetAuthenticator.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
@@ -2,7 +2,7 @@
 
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/SetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/SetPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
index 5f1aff4403ad..563de59e7a25 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/SetPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/SetPassword.razor
@@ -3,7 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/TwoFactorAuthentication.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/TwoFactorAuthentication.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
index fbb2f32eddbd..2e36945f569c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/TwoFactorAuthentication.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
@@ -3,7 +3,7 @@
 @using Microsoft.AspNetCore.Http.Features
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/_Imports.razor
new file mode 100644
index 000000000000..ada5bb010a89
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/_Imports.razor
@@ -0,0 +1,2 @@
+@layout ManageLayout
+@attribute [Microsoft.AspNetCore.Authorization.Authorize]
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Register.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
similarity index 99%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Register.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
index 822a95b69460..f1fa5a777ce0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Register.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Register.razor
@@ -8,7 +8,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IUserStore<ApplicationUser> UserStore
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/RegisterConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/RegisterConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
index 5f54beb59e9a..b911ed1dcffa 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/RegisterConfirmation.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/RegisterConfirmation.razor
@@ -5,7 +5,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IEmailSender EmailSender
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResendEmailConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResendEmailConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
index fa5f9d1dbafe..11eda5ab5df0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResendEmailConfirmation.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResendEmailConfirmation.razor
@@ -7,7 +7,7 @@
 @using Microsoft.AspNetCore.Identity.UI.Services
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject UserManager<ApplicationUser> UserManager
 @inject IEmailSender EmailSender
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPassword.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
index 214c42643eb4..9428e05cd967 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPassword.razor
@@ -6,7 +6,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.AspNetCore.WebUtilities
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject IdentityRedirectManager RedirectManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPasswordConfirmation.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPasswordConfirmation.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/ResetPasswordConfirmation.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ResetPasswordConfirmation.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
new file mode 100644
index 000000000000..74e55cf461f3
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/_Imports.razor
@@ -0,0 +1,3 @@
+@using BlazorWeb_CSharp.Components.Account.Pages
+@using BlazorWeb_CSharp.Components.Account.Shared
+@layout AccountLayout
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingRevalidatingAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs
similarity index 98%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingRevalidatingAuthenticationStateProvider.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs
index 4bcaeb392093..8bc1eac3761d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingRevalidatingAuthenticationStateProvider.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs
@@ -9,7 +9,7 @@
 using BlazorWeb_CSharp.Client;
 using BlazorWeb_CSharp.Data;
 
-namespace BlazorWeb_CSharp.Identity;
+namespace BlazorWeb_CSharp.Components.Account;
 
 public class PersistingRevalidatingAuthenticationStateProvider : RevalidatingServerAuthenticationStateProvider
 {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingServerAuthenticationStateProvider.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs
similarity index 97%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingServerAuthenticationStateProvider.cs
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs
index 6149f109e221..951b87c685a9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Identity/PersistingServerAuthenticationStateProvider.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/PersistingServerAuthenticationStateProvider.cs
@@ -7,7 +7,7 @@
 using Microsoft.Extensions.Options;
 using BlazorWeb_CSharp.Client;
 
-namespace BlazorWeb_CSharp.Identity;
+namespace BlazorWeb_CSharp.Components.Account;
 
 public class PersistingServerAuthenticationStateProvider : ServerAuthenticationStateProvider, IDisposable
 {
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
new file mode 100644
index 000000000000..9177fc08a416
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/AccountLayout.razor
@@ -0,0 +1,31 @@
+@inherits LayoutComponentBase
+@*#if (UseWebAssembly && InteractiveAtRoot)
+@layout BlazorWeb_CSharp.Client.Layout.MainLayout
+##else
+@layout BlazorWeb_CSharp.Components.Layout.MainLayout
+##endif*@
+@inject NavigationManager Nav
+
+@if (HttpContext is null)
+{
+    <p>Loading...</p>
+}
+else
+{
+    @Body
+}
+
+@code {
+    [CascadingParameter] HttpContext? HttpContext { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        if (HttpContext is null)
+        {
+            // If this code runs, we're currently rendering in interactive mode, so there is no HttpContext.
+            // The identity pages need to set cookies, so they require an HttpContext. To achieve this we
+            // must transition back from interactive mode to a server-rendered page.
+            Nav.Refresh(forceReload: true);
+        }
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ExternalLoginPicker.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
similarity index 94%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ExternalLoginPicker.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
index 5c33681f7021..bb9b65702de1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ExternalLoginPicker.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ExternalLoginPicker.razor
@@ -1,8 +1,8 @@
 @using Microsoft.AspNetCore.Authentication
 @using Microsoft.AspNetCore.Identity
-@using BlazorWeb_CSharp.Components.Pages.Account
+@using BlazorWeb_CSharp.Components.Account.Pages
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject IdentityRedirectManager RedirectManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/LogoutForm.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor
similarity index 95%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/LogoutForm.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor
index a08c78fc4cdc..02626deca8d6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/LogoutForm.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/LogoutForm.razor
@@ -1,6 +1,6 @@
 @using Microsoft.AspNetCore.Identity
 @using BlazorWeb_CSharp.Data
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @inject SignInManager<ApplicationUser> SignInManager
 @inject NavigationManager NavigationManager
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageLayout.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageLayout.razor
similarity index 93%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageLayout.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageLayout.razor
index e4a7871bbc75..949bc92215cb 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageLayout.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageLayout.razor
@@ -1,5 +1,5 @@
 @inherits LayoutComponentBase
-@layout MainLayout
+@layout AccountLayout
 
 <h1>Manage your account</h1>
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageNavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageNavMenu.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/ManageNavMenu.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ManageNavMenu.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
new file mode 100644
index 000000000000..def633565ee2
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/RedirectToLogin.razor
@@ -0,0 +1,7 @@
+@inject NavigationManager Navigation
+@code {
+    protected override void OnInitialized()
+    {
+        Navigation.NavigateTo($"Account/Login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}", forceLoad: true);
+    }
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ShowRecoveryCodes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ShowRecoveryCodes.razor
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/ShowRecoveryCodes.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/ShowRecoveryCodes.razor
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/StatusMessage.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
similarity index 94%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/StatusMessage.razor
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
index 43bcdc0478b6..4d3de9e4e5f3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Identity/StatusMessage.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Shared/StatusMessage.razor
@@ -1,4 +1,4 @@
-@using BlazorWeb_CSharp.Identity
+@using BlazorWeb_CSharp.Components.Account
 
 @{
     var message = Message ?? MessageFromCookie;
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
index 6559a81a3231..55eeaf377e4e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/App.razor
@@ -1,4 +1,7 @@
-<!DOCTYPE html>
+@*#if (IndividualLocalAuth)
+@using BlazorWeb_CSharp.Components.Account.Shared
+##endif*@
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -15,6 +18,8 @@
     ##endif*@
     @*#if (!InteractiveAtRoot)
     <HeadOutlet />
+    ##elseif (IndividualLocalAuth)
+    <HeadOutlet @rendermode="@RenderModeForPage" />
     ##elseif (UseServer && UseWebAssembly)
     <HeadOutlet @rendermode="@RenderMode.InteractiveAuto" />
     ##elseif (UseServer)
@@ -27,14 +32,48 @@
 <body>
     @*#if (!InteractiveAtRoot)
     <Routes />
-    ##elseif (UseServer && UseWebAssembly) -->
+    ##elseif (IndividualLocalAuth)
+    <Routes @rendermode="@RenderModeForPage" />
+    ##elseif (UseServer && UseWebAssembly)
     <Routes @rendermode="@RenderMode.InteractiveAuto" />
     ##elseif (UseServer)
     <Routes @rendermode="@RenderMode.InteractiveServer" />
     ##else
     <Routes @rendermode="@RenderMode.InteractiveWebAssembly" />
     ##endif*@
+    @*#if (IndividualLocalAuth)
+    <LogoutForm id="logout-form" />
+    ##endif*@
     <script src="_framework/blazor.web.js"></script>
 </body>
 
 </html>
+@*#if (!InteractiveAtRoot || !IndividualLocalAuth)
+#elseif (UseServer && UseWebAssembly)
+
+@code {
+    [CascadingParameter] HttpContext HttpContext { get; set; } = default!;
+
+    IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account")
+        ? null
+        : RenderMode.InteractiveAuto;
+}
+#elseif (UseServer)
+
+@code {
+    [CascadingParameter] HttpContext HttpContext { get; set; } = default!;
+
+    IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account")
+        ? null
+        : RenderMode.InteractiveServer;
+}
+#else
+
+@code {
+    [CascadingParameter] HttpContext HttpContext { get; set; } = default!;
+
+    IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account")
+        ? null
+        : RenderMode.InteractiveWebAssembly;
+}
+#endif*@
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor
index 5b38b21d63a7..1cea17303955 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor
@@ -1,8 +1,4 @@
-@*#if (IndividualLocalAuth)
-@using BlazorWeb_CSharp.Components.Identity
-
-##endif*@
-<div class="top-row ps-3 navbar navbar-dark">
+<div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
         <a class="navbar-brand" href="">BlazorWeb-CSharp</a>
     </div>
@@ -47,7 +43,6 @@
                     </NavLink>
                 </div>
                 <div class="nav-item px-3">
-                    <LogoutForm id="logout-form" />
                     <NavLink class="nav-link" href="#" onclick="document.getElementById('logout-form').submit(); return false;">
                         <span class="bi bi-arrow-bar-left" aria-hidden="true"></span> Logout
                     </NavLink>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor
deleted file mode 100644
index d605aec1f504..000000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/Manage/_Imports.razor
+++ /dev/null
@@ -1,2 +0,0 @@
-@layout BlazorWeb_CSharp.Components.Layout.ManageLayout
-@attribute [Microsoft.AspNetCore.Authorization.Authorize]
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor
deleted file mode 100644
index dfb627bc86ad..000000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Pages/Account/_Imports.razor
+++ /dev/null
@@ -1 +0,0 @@
-@using BlazorWeb_CSharp.Components.Identity
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
index 1426521804d1..ee69ff447329 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Routes.razor
@@ -1,11 +1,18 @@
-@*#if (UseWebAssembly && !InteractiveAtRoot)
+@*#if (IndividualLocalAuth && !UseWebAssembly)
+@using BlazorWeb_CSharp.Components.Account.Shared
+##endif*@
+@*#if (UseWebAssembly && !InteractiveAtRoot)
 <Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
 ##else
 <Router AppAssembly="@typeof(Program).Assembly">
 ##endif*@
     <Found Context="routeData">
         @*#if (IndividualLocalAuth)
-        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
+        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)">
+            <NotAuthorized>
+                <RedirectToLogin />
+            </NotAuthorized>
+        </AuthorizeRouteView>
         ##else
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
         ##endif*@
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs
index f6fefe902c63..165ae58378bd 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/UserAccessor.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Identity;
-using BlazorWeb_CSharp.Identity;
+using BlazorWeb_CSharp.Components.Account;
 
 namespace BlazorWeb_CSharp.Data;
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/app.db b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/app.db
similarity index 100%
rename from src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/app.db
rename to src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Data/app.db
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
index 01d1f6af2312..ecd75c08f5d0 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
@@ -14,7 +14,7 @@
 #if (IndividualLocalAuth)
 using BlazorWeb_CSharp.Data;
 #if (UseServer || UseWebAssembly)
-using BlazorWeb_CSharp.Identity;
+using BlazorWeb_CSharp.Components.Account;
 #endif
 #endif
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
index 0cac856a8962..e702f25006dc 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
@@ -14,7 +14,7 @@
 #if (IndividualLocalAuth)
 using BlazorWeb_CSharp.Data;
 #if (UseServer || UseWebAssembly)
-using BlazorWeb_CSharp.Identity;
+using BlazorWeb_CSharp.Components.Account;
 #endif
 #endif
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
index a3f1a98503ab..3a18c82e2dc6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/appsettings.json
@@ -4,7 +4,7 @@
 //#if (UseLocalDB)
 //    "DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-BlazorWeb_CSharp-53bc9b9d-9d6a-45d4-8429-2a2761773502;Trusted_Connection=True;MultipleActiveResultSets=true"
 //#else
-//    "DefaultConnection": "DataSource=app.db;Cache=Shared"
+//    "DefaultConnection": "DataSource=Data\\app.db;Cache=Shared"
 //#endif
 //  },
 ////#endif
diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index aec10851dc2c..da753a4a03bb 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -510,11 +510,7 @@
       "Files": [
         "appsettings.Development.json",
         "appsettings.json",
-        "{ProjectName}.csproj",
-        "Program.cs",
         "Components/App.razor",
-        "Components/Routes.razor",
-        "Components/_Imports.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
         "Components/Layout/NavMenu.razor",
@@ -522,11 +518,15 @@
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
         "Components/Pages/Weather.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
+        "Program.cs",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
-        "wwwroot/favicon.png",
         "wwwroot/bootstrap/bootstrap.min.css",
-        "wwwroot/bootstrap/bootstrap.min.css.map"
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
       ],
       "AuthOption": "None"
     },
@@ -534,71 +534,73 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity none --auth Individual",
       "Files": [
-        "app.db",
         "appsettings.Development.json",
         "appsettings.json",
-        "{ProjectName}.csproj",
-        "Program.cs",
+        "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "Components/Account/IdentityRedirectManager.cs",
+        "Components/Account/Pages/ConfirmEmail.razor",
+        "Components/Account/Pages/ConfirmEmailChange.razor",
+        "Components/Account/Pages/ExternalLogin.razor",
+        "Components/Account/Pages/ForgotPassword.razor",
+        "Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "Components/Account/Pages/InvalidPasswordReset.razor",
+        "Components/Account/Pages/InvalidUser.razor",
+        "Components/Account/Pages/Lockout.razor",
+        "Components/Account/Pages/Login.razor",
+        "Components/Account/Pages/LoginWith2fa.razor",
+        "Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "Components/Account/Pages/Manage/ChangePassword.razor",
+        "Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "Components/Account/Pages/Manage/Disable2fa.razor",
+        "Components/Account/Pages/Manage/Email.razor",
+        "Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "Components/Account/Pages/Manage/ExternalLogins.razor",
+        "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "Components/Account/Pages/Manage/SetPassword.razor",
+        "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "Components/Account/Pages/Manage/_Imports.razor",
+        "Components/Account/Pages/Register.razor",
+        "Components/Account/Pages/RegisterConfirmation.razor",
+        "Components/Account/Pages/ResendEmailConfirmation.razor",
+        "Components/Account/Pages/ResetPassword.razor",
+        "Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "Components/Account/Pages/_Imports.razor",
+        "Components/Account/Shared/AccountLayout.razor",
+        "Components/Account/Shared/ExternalLoginPicker.razor",
+        "Components/Account/Shared/LogoutForm.razor",
+        "Components/Account/Shared/ManageLayout.razor",
+        "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/RedirectToLogin.razor",
+        "Components/Account/Shared/ShowRecoveryCodes.razor",
+        "Components/Account/Shared/StatusMessage.razor",
         "Components/App.razor",
-        "Components/Routes.razor",
-        "Components/_Imports.razor",
-        "Components/Identity/ExternalLoginPicker.razor",
-        "Components/Identity/LogoutForm.razor",
-        "Components/Identity/ShowRecoveryCodes.razor",
-        "Components/Identity/StatusMessage.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
-        "Components/Layout/ManageLayout.razor",
-        "Components/Layout/ManageNavMenu.razor",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
         "Components/Pages/Auth.razor",
         "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
         "Components/Pages/Weather.razor",
-        "Components/Pages/Account/_Imports.razor",
-        "Components/Pages/Account/ConfirmEmail.razor",
-        "Components/Pages/Account/ConfirmEmailChange.razor",
-        "Components/Pages/Account/ExternalLogin.razor",
-        "Components/Pages/Account/ForgotPassword.razor",
-        "Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "Components/Pages/Account/InvalidPasswordReset.razor",
-        "Components/Pages/Account/InvalidUser.razor",
-        "Components/Pages/Account/Lockout.razor",
-        "Components/Pages/Account/Login.razor",
-        "Components/Pages/Account/LoginWith2fa.razor",
-        "Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "Components/Pages/Account/Register.razor",
-        "Components/Pages/Account/RegisterConfirmation.razor",
-        "Components/Pages/Account/ResendEmailConfirmation.razor",
-        "Components/Pages/Account/ResetPassword.razor",
-        "Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "Components/Pages/Account/Manage/_Imports.razor",
-        "Components/Pages/Account/Manage/ChangePassword.razor",
-        "Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "Components/Pages/Account/Manage/Disable2fa.razor",
-        "Components/Pages/Account/Manage/Email.razor",
-        "Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "Components/Pages/Account/Manage/ExternalLogins.razor",
-        "Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "Components/Pages/Account/Manage/Index.razor",
-        "Components/Pages/Account/Manage/PersonalData.razor",
-        "Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "Components/Pages/Account/Manage/SetPassword.razor",
-        "Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
+        "Data/app.db",
         "Data/ApplicationDbContext.cs",
         "Data/ApplicationUser.cs",
-        "Data/UserAccessor.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "Identity/IdentityRedirectManager.cs",
+        "Data/UserAccessor.cs",
+        "Program.cs",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
-        "wwwroot/favicon.png",
         "wwwroot/bootstrap/bootstrap.min.css",
-        "wwwroot/bootstrap/bootstrap.min.css.map"
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
       ],
       "AuthOption": "Individual"
     },
@@ -633,73 +635,75 @@
       "Template": "blazor",
       "Arguments": "new blazor --auth Individual",
       "Files": [
-        "app.db",
         "appsettings.Development.json",
         "appsettings.json",
-        "{ProjectName}.csproj",
-        "Program.cs",
+        "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "Components/Account/IdentityRedirectManager.cs",
+        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Components/Account/Pages/ConfirmEmail.razor",
+        "Components/Account/Pages/ConfirmEmailChange.razor",
+        "Components/Account/Pages/ExternalLogin.razor",
+        "Components/Account/Pages/ForgotPassword.razor",
+        "Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "Components/Account/Pages/InvalidPasswordReset.razor",
+        "Components/Account/Pages/InvalidUser.razor",
+        "Components/Account/Pages/Lockout.razor",
+        "Components/Account/Pages/Login.razor",
+        "Components/Account/Pages/LoginWith2fa.razor",
+        "Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "Components/Account/Pages/Manage/ChangePassword.razor",
+        "Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "Components/Account/Pages/Manage/Disable2fa.razor",
+        "Components/Account/Pages/Manage/Email.razor",
+        "Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "Components/Account/Pages/Manage/ExternalLogins.razor",
+        "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "Components/Account/Pages/Manage/SetPassword.razor",
+        "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "Components/Account/Pages/Manage/_Imports.razor",
+        "Components/Account/Pages/Register.razor",
+        "Components/Account/Pages/RegisterConfirmation.razor",
+        "Components/Account/Pages/ResendEmailConfirmation.razor",
+        "Components/Account/Pages/ResetPassword.razor",
+        "Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "Components/Account/Pages/_Imports.razor",
+        "Components/Account/Shared/AccountLayout.razor",
+        "Components/Account/Shared/ExternalLoginPicker.razor",
+        "Components/Account/Shared/LogoutForm.razor",
+        "Components/Account/Shared/ManageLayout.razor",
+        "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/RedirectToLogin.razor",
+        "Components/Account/Shared/ShowRecoveryCodes.razor",
+        "Components/Account/Shared/StatusMessage.razor",
         "Components/App.razor",
-        "Components/Routes.razor",
-        "Components/_Imports.razor",
-        "Components/Identity/ExternalLoginPicker.razor",
-        "Components/Identity/LogoutForm.razor",
-        "Components/Identity/ShowRecoveryCodes.razor",
-        "Components/Identity/StatusMessage.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
-        "Components/Layout/ManageLayout.razor",
-        "Components/Layout/ManageNavMenu.razor",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
         "Components/Pages/Auth.razor",
-        "Components/Pages/Error.razor",
         "Components/Pages/Counter.razor",
+        "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
         "Components/Pages/Weather.razor",
-        "Components/Pages/Account/_Imports.razor",
-        "Components/Pages/Account/ConfirmEmail.razor",
-        "Components/Pages/Account/ConfirmEmailChange.razor",
-        "Components/Pages/Account/ExternalLogin.razor",
-        "Components/Pages/Account/ForgotPassword.razor",
-        "Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "Components/Pages/Account/InvalidPasswordReset.razor",
-        "Components/Pages/Account/InvalidUser.razor",
-        "Components/Pages/Account/Lockout.razor",
-        "Components/Pages/Account/Login.razor",
-        "Components/Pages/Account/LoginWith2fa.razor",
-        "Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "Components/Pages/Account/Register.razor",
-        "Components/Pages/Account/RegisterConfirmation.razor",
-        "Components/Pages/Account/ResendEmailConfirmation.razor",
-        "Components/Pages/Account/ResetPassword.razor",
-        "Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "Components/Pages/Account/Manage/_Imports.razor",
-        "Components/Pages/Account/Manage/ChangePassword.razor",
-        "Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "Components/Pages/Account/Manage/Disable2fa.razor",
-        "Components/Pages/Account/Manage/Email.razor",
-        "Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "Components/Pages/Account/Manage/ExternalLogins.razor",
-        "Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "Components/Pages/Account/Manage/Index.razor",
-        "Components/Pages/Account/Manage/PersonalData.razor",
-        "Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "Components/Pages/Account/Manage/SetPassword.razor",
-        "Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
+        "Data/app.db",
         "Data/ApplicationDbContext.cs",
         "Data/ApplicationUser.cs",
-        "Data/UserAccessor.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "Identity/IdentityRedirectManager.cs",
-        "Identity/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Data/UserAccessor.cs",
+        "Program.cs",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
-        "wwwroot/favicon.png",
         "wwwroot/bootstrap/bootstrap.min.css",
-        "wwwroot/bootstrap/bootstrap.min.css.map"
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
       ],
       "AuthOption": "Individual"
     },
@@ -709,70 +713,72 @@
       "Files": [
         "appsettings.Development.json",
         "appsettings.json",
-        "{ProjectName}.csproj",
-        "Program.cs",
+        "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "Components/Account/IdentityRedirectManager.cs",
+        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Components/Account/Pages/ConfirmEmail.razor",
+        "Components/Account/Pages/ConfirmEmailChange.razor",
+        "Components/Account/Pages/ExternalLogin.razor",
+        "Components/Account/Pages/ForgotPassword.razor",
+        "Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "Components/Account/Pages/InvalidPasswordReset.razor",
+        "Components/Account/Pages/InvalidUser.razor",
+        "Components/Account/Pages/Lockout.razor",
+        "Components/Account/Pages/Login.razor",
+        "Components/Account/Pages/LoginWith2fa.razor",
+        "Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "Components/Account/Pages/Manage/ChangePassword.razor",
+        "Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "Components/Account/Pages/Manage/Disable2fa.razor",
+        "Components/Account/Pages/Manage/Email.razor",
+        "Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "Components/Account/Pages/Manage/ExternalLogins.razor",
+        "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "Components/Account/Pages/Manage/SetPassword.razor",
+        "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "Components/Account/Pages/Manage/_Imports.razor",
+        "Components/Account/Pages/Register.razor",
+        "Components/Account/Pages/RegisterConfirmation.razor",
+        "Components/Account/Pages/ResendEmailConfirmation.razor",
+        "Components/Account/Pages/ResetPassword.razor",
+        "Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "Components/Account/Pages/_Imports.razor",
+        "Components/Account/Shared/AccountLayout.razor",
+        "Components/Account/Shared/ExternalLoginPicker.razor",
+        "Components/Account/Shared/LogoutForm.razor",
+        "Components/Account/Shared/ManageLayout.razor",
+        "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/RedirectToLogin.razor",
+        "Components/Account/Shared/ShowRecoveryCodes.razor",
+        "Components/Account/Shared/StatusMessage.razor",
         "Components/App.razor",
-        "Components/Routes.razor",
-        "Components/_Imports.razor",
-        "Components/Identity/ExternalLoginPicker.razor",
-        "Components/Identity/LogoutForm.razor",
-        "Components/Identity/ShowRecoveryCodes.razor",
-        "Components/Identity/StatusMessage.razor",
         "Components/Layout/MainLayout.razor",
         "Components/Layout/MainLayout.razor.css",
-        "Components/Layout/ManageLayout.razor",
-        "Components/Layout/ManageNavMenu.razor",
         "Components/Layout/NavMenu.razor",
         "Components/Layout/NavMenu.razor.css",
         "Components/Pages/Auth.razor",
-        "Components/Pages/Error.razor",
         "Components/Pages/Counter.razor",
+        "Components/Pages/Error.razor",
         "Components/Pages/Home.razor",
         "Components/Pages/Weather.razor",
-        "Components/Pages/Account/_Imports.razor",
-        "Components/Pages/Account/ConfirmEmail.razor",
-        "Components/Pages/Account/ConfirmEmailChange.razor",
-        "Components/Pages/Account/ExternalLogin.razor",
-        "Components/Pages/Account/ForgotPassword.razor",
-        "Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "Components/Pages/Account/InvalidPasswordReset.razor",
-        "Components/Pages/Account/InvalidUser.razor",
-        "Components/Pages/Account/Lockout.razor",
-        "Components/Pages/Account/Login.razor",
-        "Components/Pages/Account/LoginWith2fa.razor",
-        "Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "Components/Pages/Account/Register.razor",
-        "Components/Pages/Account/RegisterConfirmation.razor",
-        "Components/Pages/Account/ResendEmailConfirmation.razor",
-        "Components/Pages/Account/ResetPassword.razor",
-        "Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "Components/Pages/Account/Manage/_Imports.razor",
-        "Components/Pages/Account/Manage/ChangePassword.razor",
-        "Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "Components/Pages/Account/Manage/Disable2fa.razor",
-        "Components/Pages/Account/Manage/Email.razor",
-        "Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "Components/Pages/Account/Manage/ExternalLogins.razor",
-        "Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "Components/Pages/Account/Manage/Index.razor",
-        "Components/Pages/Account/Manage/PersonalData.razor",
-        "Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "Components/Pages/Account/Manage/SetPassword.razor",
-        "Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
         "Data/ApplicationDbContext.cs",
         "Data/ApplicationUser.cs",
-        "Data/UserAccessor.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "Identity/IdentityRedirectManager.cs",
-        "Identity/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Data/UserAccessor.cs",
+        "Program.cs",
         "Properties/launchSettings.json",
         "wwwroot/app.css",
-        "wwwroot/favicon.png",
         "wwwroot/bootstrap/bootstrap.min.css",
-        "wwwroot/bootstrap/bootstrap.min.css.map"
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
       ],
       "AuthOption": "None"
     },
@@ -813,81 +819,83 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity webassembly --auth Individual",
       "Files": [
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.Client/Pages/Auth.razor",
+        "{ProjectName}.Client/Pages/Counter.razor",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
+        "{ProjectName}.Client/wwwroot/appsettings.json",
+        "{ProjectName}.Client/_Imports.razor",
         "{ProjectName}.sln",
-        "{ProjectName}/app.db",
         "{ProjectName}/appsettings.Development.json",
         "{ProjectName}/appsettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/Program.cs",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingServerAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/Routes.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Components/Identity/ExternalLoginPicker.razor",
-        "{ProjectName}/Components/Identity/LogoutForm.razor",
-        "{ProjectName}/Components/Identity/ShowRecoveryCodes.razor",
-        "{ProjectName}/Components/Identity/StatusMessage.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
-        "{ProjectName}/Components/Layout/ManageLayout.razor",
-        "{ProjectName}/Components/Layout/ManageNavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor.css",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
         "{ProjectName}/Components/Pages/Weather.razor",
-        "{ProjectName}/Components/Pages/Account/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmail.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmailChange.razor",
-        "{ProjectName}/Components/Pages/Account/ExternalLogin.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidPasswordReset.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidUser.razor",
-        "{ProjectName}/Components/Pages/Account/Lockout.razor",
-        "{ProjectName}/Components/Pages/Account/Login.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWith2fa.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "{ProjectName}/Components/Pages/Account/Register.razor",
-        "{ProjectName}/Components/Pages/Account/RegisterConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResendEmailConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ChangePassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Disable2fa.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Email.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ExternalLogins.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Index.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/PersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/SetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Routes.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
         "{ProjectName}/Data/ApplicationDbContext.cs",
         "{ProjectName}/Data/ApplicationUser.cs",
-        "{ProjectName}/Data/UserAccessor.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "{ProjectName}/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "{ProjectName}/Identity/IdentityRedirectManager.cs",
-        "{ProjectName}/Identity/PersistingServerAuthenticationStateProvider.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/{ProjectName}.csproj",
+        "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
-        "{ProjectName}/wwwroot/favicon.png",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
-        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
-        "{ProjectName}.Client/Program.cs",
-        "{ProjectName}.Client/UserInfo.cs",
-        "{ProjectName}.Client/_Imports.razor",
-        "{ProjectName}.Client/Pages/Auth.razor",
-        "{ProjectName}.Client/Pages/Counter.razor",
-        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
-        "{ProjectName}.Client/wwwroot/appsettings.json"
+        "{ProjectName}/wwwroot/favicon.png"
       ],
       "AuthOption": "Individual"
     },
@@ -928,81 +936,83 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity auto --auth Individual",
       "Files": [
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.Client/Pages/Auth.razor",
+        "{ProjectName}.Client/Pages/Counter.razor",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
+        "{ProjectName}.Client/wwwroot/appsettings.json",
+        "{ProjectName}.Client/_Imports.razor",
         "{ProjectName}.sln",
-        "{ProjectName}/app.db",
         "{ProjectName}/appsettings.Development.json",
         "{ProjectName}/appsettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/Program.cs",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/Routes.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Components/Identity/ExternalLoginPicker.razor",
-        "{ProjectName}/Components/Identity/LogoutForm.razor",
-        "{ProjectName}/Components/Identity/ShowRecoveryCodes.razor",
-        "{ProjectName}/Components/Identity/StatusMessage.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
-        "{ProjectName}/Components/Layout/ManageLayout.razor",
-        "{ProjectName}/Components/Layout/ManageNavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor",
         "{ProjectName}/Components/Layout/NavMenu.razor.css",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
         "{ProjectName}/Components/Pages/Weather.razor",
-        "{ProjectName}/Components/Pages/Account/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmail.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmailChange.razor",
-        "{ProjectName}/Components/Pages/Account/ExternalLogin.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidPasswordReset.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidUser.razor",
-        "{ProjectName}/Components/Pages/Account/Lockout.razor",
-        "{ProjectName}/Components/Pages/Account/Login.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWith2fa.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "{ProjectName}/Components/Pages/Account/Register.razor",
-        "{ProjectName}/Components/Pages/Account/RegisterConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResendEmailConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ChangePassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Disable2fa.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Email.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ExternalLogins.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Index.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/PersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/SetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Routes.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
         "{ProjectName}/Data/ApplicationDbContext.cs",
         "{ProjectName}/Data/ApplicationUser.cs",
-        "{ProjectName}/Data/UserAccessor.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "{ProjectName}/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "{ProjectName}/Identity/IdentityRedirectManager.cs",
-        "{ProjectName}/Identity/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/{ProjectName}.csproj",
+        "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
-        "{ProjectName}/wwwroot/favicon.png",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
-        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
-        "{ProjectName}.Client/Program.cs",
-        "{ProjectName}.Client/UserInfo.cs",
-        "{ProjectName}.Client/_Imports.razor",
-        "{ProjectName}.Client/Pages/Auth.razor",
-        "{ProjectName}.Client/Pages/Counter.razor",
-        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
-        "{ProjectName}.Client/wwwroot/appsettings.json"
+        "{ProjectName}/wwwroot/favicon.png"
       ],
       "AuthOption": "Individual"
     },
@@ -1037,65 +1047,65 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity webassembly --all-interactive",
       "Files": [
-        "{ProjectName}/appsettings.Development.json",
-        "{ProjectName}/appsettings.json",
-        "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Program.cs",
-        "{ProjectName}/Properties/launchSettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/wwwroot/app.css",
-        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
-        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
-        "{ProjectName}/wwwroot/favicon.png",
         "{ProjectName}.Client/Layout/MainLayout.razor",
         "{ProjectName}.Client/Layout/MainLayout.razor.css",
         "{ProjectName}.Client/Layout/NavMenu.razor",
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
         "{ProjectName}.Client/Pages/Counter.razor",
-        "{ProjectName}.Client/Pages/Error.razor",
         "{ProjectName}.Client/Pages/Home.razor",
         "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/Routes.razor",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/wwwroot/appsettings.Development.json",
         "{ProjectName}.Client/wwwroot/appsettings.json",
         "{ProjectName}.Client/_Imports.razor",
-        "{ProjectName}.sln"
-      ],
-      "AuthOption": "None"
-    },
-    "UseServerAndWebAssemblyInteractiveAtRoot": {
-      "Template": "blazor",
-      "Arguments": "new blazor --interactivity auto --all-interactive",
-      "Files": [
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.sln",
         "{ProjectName}/appsettings.Development.json",
         "{ProjectName}/appsettings.json",
         "{ProjectName}/Components/App.razor",
+        "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/_Imports.razor",
         "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
         "{ProjectName}/wwwroot/app.css",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
         "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
         "{ProjectName}/wwwroot/favicon.png",
+        "{ProjectName}/{ProjectName}.csproj"
+      ],
+      "AuthOption": "None"
+    },
+    "UseServerAndWebAssemblyInteractiveAtRoot": {
+      "Template": "blazor",
+      "Arguments": "new blazor --interactivity auto --all-interactive",
+      "Files": [
         "{ProjectName}.Client/Layout/MainLayout.razor",
         "{ProjectName}.Client/Layout/MainLayout.razor.css",
         "{ProjectName}.Client/Layout/NavMenu.razor",
         "{ProjectName}.Client/Layout/NavMenu.razor.css",
         "{ProjectName}.Client/Pages/Counter.razor",
-        "{ProjectName}.Client/Pages/Error.razor",
         "{ProjectName}.Client/Pages/Home.razor",
         "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/Program.cs",
         "{ProjectName}.Client/Routes.razor",
-        "{ProjectName}.Client/{ProjectName}.Client.csproj",
         "{ProjectName}.Client/wwwroot/appsettings.Development.json",
         "{ProjectName}.Client/wwwroot/appsettings.json",
         "{ProjectName}.Client/_Imports.razor",
-        "{ProjectName}.sln"
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.sln",
+        "{ProjectName}/appsettings.Development.json",
+        "{ProjectName}/appsettings.json",
+        "{ProjectName}/Components/App.razor",
+        "{ProjectName}/Components/Pages/Error.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Program.cs",
+        "{ProjectName}/Properties/launchSettings.json",
+        "{ProjectName}/wwwroot/app.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
+        "{ProjectName}/wwwroot/favicon.png",
+        "{ProjectName}/{ProjectName}.csproj"
       ],
       "AuthOption": "None"
     },
@@ -1191,71 +1201,317 @@
       "Template": "blazor",
       "Arguments": "new blazor --interactivity auto --empty --auth Individual",
       "Files": [
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/_Imports.razor",
         "{ProjectName}.sln",
-        "{ProjectName}/app.db",
         "{ProjectName}/appsettings.Development.json",
         "{ProjectName}/appsettings.json",
-        "{ProjectName}/{ProjectName}.csproj",
-        "{ProjectName}/Program.cs",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
         "{ProjectName}/Components/App.razor",
-        "{ProjectName}/Components/Routes.razor",
-        "{ProjectName}/Components/_Imports.razor",
-        "{ProjectName}/Components/Identity/ExternalLoginPicker.razor",
-        "{ProjectName}/Components/Identity/LogoutForm.razor",
-        "{ProjectName}/Components/Identity/ShowRecoveryCodes.razor",
-        "{ProjectName}/Components/Identity/StatusMessage.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor",
         "{ProjectName}/Components/Layout/MainLayout.razor.css",
-        "{ProjectName}/Components/Layout/ManageLayout.razor",
-        "{ProjectName}/Components/Layout/ManageNavMenu.razor",
         "{ProjectName}/Components/Pages/Error.razor",
         "{ProjectName}/Components/Pages/Home.razor",
-        "{ProjectName}/Components/Pages/Account/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmail.razor",
-        "{ProjectName}/Components/Pages/Account/ConfirmEmailChange.razor",
-        "{ProjectName}/Components/Pages/Account/ExternalLogin.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ForgotPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidPasswordReset.razor",
-        "{ProjectName}/Components/Pages/Account/InvalidUser.razor",
-        "{ProjectName}/Components/Pages/Account/Lockout.razor",
-        "{ProjectName}/Components/Pages/Account/Login.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWith2fa.razor",
-        "{ProjectName}/Components/Pages/Account/LoginWithRecoveryCode.razor",
-        "{ProjectName}/Components/Pages/Account/Register.razor",
-        "{ProjectName}/Components/Pages/Account/RegisterConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResendEmailConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/ResetPasswordConfirmation.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/_Imports.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ChangePassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/DeletePersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Disable2fa.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Email.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/EnableAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ExternalLogins.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/GenerateRecoveryCodes.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/Index.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/PersonalData.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/ResetAuthenticator.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/SetPassword.razor",
-        "{ProjectName}/Components/Pages/Account/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Routes.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
         "{ProjectName}/Data/ApplicationDbContext.cs",
         "{ProjectName}/Data/ApplicationUser.cs",
+        "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
+        "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
+        "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
         "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/{ProjectName}.csproj",
+        "{ProjectName}/Program.cs",
+        "{ProjectName}/Properties/launchSettings.json",
+        "{ProjectName}/wwwroot/app.css"
+      ],
+      "AuthOption": "Individual"
+    },
+    "ServerInteractiveAtRootWithIndividualAuth": {
+      "Template": "blazor",
+      "Arguments": "new blazor --all-interactive --auth Individual",
+      "Files": [
+        "appsettings.Development.json",
+        "appsettings.json",
+        "Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "Components/Account/IdentityRedirectManager.cs",
+        "Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs",
+        "Components/Account/Pages/ConfirmEmail.razor",
+        "Components/Account/Pages/ConfirmEmailChange.razor",
+        "Components/Account/Pages/ExternalLogin.razor",
+        "Components/Account/Pages/ForgotPassword.razor",
+        "Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "Components/Account/Pages/InvalidPasswordReset.razor",
+        "Components/Account/Pages/InvalidUser.razor",
+        "Components/Account/Pages/Lockout.razor",
+        "Components/Account/Pages/Login.razor",
+        "Components/Account/Pages/LoginWith2fa.razor",
+        "Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "Components/Account/Pages/Manage/ChangePassword.razor",
+        "Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "Components/Account/Pages/Manage/Disable2fa.razor",
+        "Components/Account/Pages/Manage/Email.razor",
+        "Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "Components/Account/Pages/Manage/ExternalLogins.razor",
+        "Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "Components/Account/Pages/Manage/Index.razor",
+        "Components/Account/Pages/Manage/PersonalData.razor",
+        "Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "Components/Account/Pages/Manage/SetPassword.razor",
+        "Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "Components/Account/Pages/Manage/_Imports.razor",
+        "Components/Account/Pages/Register.razor",
+        "Components/Account/Pages/RegisterConfirmation.razor",
+        "Components/Account/Pages/ResendEmailConfirmation.razor",
+        "Components/Account/Pages/ResetPassword.razor",
+        "Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "Components/Account/Pages/_Imports.razor",
+        "Components/Account/Shared/AccountLayout.razor",
+        "Components/Account/Shared/ExternalLoginPicker.razor",
+        "Components/Account/Shared/LogoutForm.razor",
+        "Components/Account/Shared/ManageLayout.razor",
+        "Components/Account/Shared/ManageNavMenu.razor",
+        "Components/Account/Shared/RedirectToLogin.razor",
+        "Components/Account/Shared/ShowRecoveryCodes.razor",
+        "Components/Account/Shared/StatusMessage.razor",
+        "Components/App.razor",
+        "Components/Layout/MainLayout.razor",
+        "Components/Layout/MainLayout.razor.css",
+        "Components/Layout/NavMenu.razor",
+        "Components/Layout/NavMenu.razor.css",
+        "Components/Pages/Auth.razor",
+        "Components/Pages/Counter.razor",
+        "Components/Pages/Error.razor",
+        "Components/Pages/Home.razor",
+        "Components/Pages/Weather.razor",
+        "Components/Routes.razor",
+        "Components/_Imports.razor",
+        "Data/app.db",
+        "Data/ApplicationDbContext.cs",
+        "Data/ApplicationUser.cs",
+        "Data/Migrations/00000000000000_CreateIdentitySchema.cs",
+        "Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
+        "Data/Migrations/ApplicationDbContextModelSnapshot.cs",
+        "Data/UserAccessor.cs",
+        "Program.cs",
+        "Properties/launchSettings.json",
+        "wwwroot/app.css",
+        "wwwroot/bootstrap/bootstrap.min.css",
+        "wwwroot/bootstrap/bootstrap.min.css.map",
+        "wwwroot/favicon.png",
+        "{ProjectName}.csproj"
+      ],
+      "AuthOption": "Individual"
+    },
+    "WebAssemblyInteractiveAtRootWithIndividualAuth": {
+      "Template": "blazor",
+      "Arguments": "new blazor --interactivity WebAssembly --all-interactive --auth Individual",
+      "Files": [
+        "{ProjectName}.Client/Layout/MainLayout.razor",
+        "{ProjectName}.Client/Layout/MainLayout.razor.css",
+        "{ProjectName}.Client/Layout/NavMenu.razor",
+        "{ProjectName}.Client/Layout/NavMenu.razor.css",
+        "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.Client/Pages/Auth.razor",
+        "{ProjectName}.Client/Pages/Counter.razor",
+        "{ProjectName}.Client/Pages/Home.razor",
+        "{ProjectName}.Client/Pages/Weather.razor",
+        "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
+        "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/Routes.razor",
+        "{ProjectName}.Client/UserInfo.cs",
+        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
+        "{ProjectName}.Client/wwwroot/appsettings.json",
+        "{ProjectName}.Client/_Imports.razor",
+        "{ProjectName}.sln",
+        "{ProjectName}/appsettings.Development.json",
+        "{ProjectName}/appsettings.json",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingServerAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
+        "{ProjectName}/Components/App.razor",
+        "{ProjectName}/Components/Pages/Error.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
+        "{ProjectName}/Data/ApplicationDbContext.cs",
+        "{ProjectName}/Data/ApplicationUser.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
         "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
         "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
-        "{ProjectName}/Identity/Extensions/IdentityComponentsEndpointRouteBuilderExtensions.cs",
-        "{ProjectName}/Identity/IdentityRedirectManager.cs",
-        "{ProjectName}/Identity/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/{ProjectName}.csproj",
+        "{ProjectName}/Program.cs",
         "{ProjectName}/Properties/launchSettings.json",
         "{ProjectName}/wwwroot/app.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
+        "{ProjectName}/wwwroot/favicon.png"
+      ],
+      "AuthOption": "Individual"
+    },
+    "AutoInteractiveAtRootWithIndividualAuth": {
+      "Template": "blazor",
+      "Arguments": "new blazor --interactivity Auto --all-interactive --auth Individual",
+      "Files": [
+        "{ProjectName}.Client/Layout/MainLayout.razor",
+        "{ProjectName}.Client/Layout/MainLayout.razor.css",
+        "{ProjectName}.Client/Layout/NavMenu.razor",
+        "{ProjectName}.Client/Layout/NavMenu.razor.css",
         "{ProjectName}.Client/{ProjectName}.Client.csproj",
+        "{ProjectName}.Client/Pages/Auth.razor",
+        "{ProjectName}.Client/Pages/Counter.razor",
+        "{ProjectName}.Client/Pages/Home.razor",
+        "{ProjectName}.Client/Pages/Weather.razor",
         "{ProjectName}.Client/PersistentAuthenticationStateProvider.cs",
         "{ProjectName}.Client/Program.cs",
+        "{ProjectName}.Client/RedirectToLogin.razor",
+        "{ProjectName}.Client/Routes.razor",
         "{ProjectName}.Client/UserInfo.cs",
-        "{ProjectName}.Client/_Imports.razor"
+        "{ProjectName}.Client/wwwroot/appsettings.Development.json",
+        "{ProjectName}.Client/wwwroot/appsettings.json",
+        "{ProjectName}.Client/_Imports.razor",
+        "{ProjectName}.sln",
+        "{ProjectName}/appsettings.Development.json",
+        "{ProjectName}/appsettings.json",
+        "{ProjectName}/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs",
+        "{ProjectName}/Components/Account/IdentityRedirectManager.cs",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmail.razor",
+        "{ProjectName}/Components/Account/Pages/ConfirmEmailChange.razor",
+        "{ProjectName}/Components/Account/Pages/ExternalLogin.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ForgotPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidPasswordReset.razor",
+        "{ProjectName}/Components/Account/Pages/InvalidUser.razor",
+        "{ProjectName}/Components/Account/Pages/Lockout.razor",
+        "{ProjectName}/Components/Account/Pages/Login.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWith2fa.razor",
+        "{ProjectName}/Components/Account/Pages/LoginWithRecoveryCode.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ChangePassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/DeletePersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Disable2fa.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Email.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/EnableAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ExternalLogins.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/Index.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/PersonalData.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/ResetAuthenticator.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/SetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/TwoFactorAuthentication.razor",
+        "{ProjectName}/Components/Account/Pages/Manage/_Imports.razor",
+        "{ProjectName}/Components/Account/Pages/Register.razor",
+        "{ProjectName}/Components/Account/Pages/RegisterConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResendEmailConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPassword.razor",
+        "{ProjectName}/Components/Account/Pages/ResetPasswordConfirmation.razor",
+        "{ProjectName}/Components/Account/Pages/_Imports.razor",
+        "{ProjectName}/Components/Account/PersistingRevalidatingAuthenticationStateProvider.cs",
+        "{ProjectName}/Components/Account/Shared/AccountLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ExternalLoginPicker.razor",
+        "{ProjectName}/Components/Account/Shared/LogoutForm.razor",
+        "{ProjectName}/Components/Account/Shared/ManageLayout.razor",
+        "{ProjectName}/Components/Account/Shared/ManageNavMenu.razor",
+        "{ProjectName}/Components/Account/Shared/ShowRecoveryCodes.razor",
+        "{ProjectName}/Components/Account/Shared/StatusMessage.razor",
+        "{ProjectName}/Components/App.razor",
+        "{ProjectName}/Components/Pages/Error.razor",
+        "{ProjectName}/Components/_Imports.razor",
+        "{ProjectName}/Data/app.db",
+        "{ProjectName}/Data/ApplicationDbContext.cs",
+        "{ProjectName}/Data/ApplicationUser.cs",
+        "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.cs",
+        "{ProjectName}/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs",
+        "{ProjectName}/Data/Migrations/ApplicationDbContextModelSnapshot.cs",
+        "{ProjectName}/Data/UserAccessor.cs",
+        "{ProjectName}/{ProjectName}.csproj",
+        "{ProjectName}/Program.cs",
+        "{ProjectName}/Properties/launchSettings.json",
+        "{ProjectName}/wwwroot/app.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css",
+        "{ProjectName}/wwwroot/bootstrap/bootstrap.min.css.map",
+        "{ProjectName}/wwwroot/favicon.png"
       ],
       "AuthOption": "Individual"
     }