diff --git a/src/LinkDotNet.Blog.Web/App.razor b/src/LinkDotNet.Blog.Web/App.razor
index 358f152b..74b82bf4 100644
--- a/src/LinkDotNet.Blog.Web/App.razor
+++ b/src/LinkDotNet.Blog.Web/App.razor
@@ -1,3 +1,4 @@
+@using LinkDotNet.Blog.Web.Features.Home.Components
 <CascadingAuthenticationState>
     <Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
         <Found Context="routeData">
diff --git a/src/LinkDotNet.Blog.Web/AppConfiguration.cs b/src/LinkDotNet.Blog.Web/AppConfiguration.cs
index 7c7ff97d..14244ab3 100644
--- a/src/LinkDotNet.Blog.Web/AppConfiguration.cs
+++ b/src/LinkDotNet.Blog.Web/AppConfiguration.cs
@@ -1,5 +1,5 @@
 using LinkDotNet.Blog.Domain;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 
 namespace LinkDotNet.Blog.Web;
 
diff --git a/src/LinkDotNet.Blog.Web/AppConfigurationFactory.cs b/src/LinkDotNet.Blog.Web/AppConfigurationFactory.cs
index 1e2c9ca3..aeb9a68d 100644
--- a/src/LinkDotNet.Blog.Web/AppConfigurationFactory.cs
+++ b/src/LinkDotNet.Blog.Web/AppConfigurationFactory.cs
@@ -1,5 +1,5 @@
 using LinkDotNet.Blog.Domain;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.Extensions.Configuration;
 
 namespace LinkDotNet.Blog.Web;
diff --git a/src/LinkDotNet.Blog.Web/Pages/AboutMe.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/AboutMePage.razor
similarity index 94%
rename from src/LinkDotNet.Blog.Web/Pages/AboutMe.razor
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/AboutMePage.razor
index d1583211..fd7a62f6 100644
--- a/src/LinkDotNet.Blog.Web/Pages/AboutMe.razor
+++ b/src/LinkDotNet.Blog.Web/Features/AboutMe/AboutMePage.razor
@@ -1,6 +1,6 @@
 @page "/AboutMe"
-@using LinkDotNet.Blog.Web.Shared.Skills
-@using LinkDotNet.Blog.Web.Shared.Services
+@using LinkDotNet.Blog.Web.Features.Services
+@using LinkDotNet.Blog.Web.Features.AboutMe.Components
 @inject AppConfiguration appConfiguration
 @inject AuthenticationStateProvider authenticationStateProvider
 @inject IUserRecordService userRecordService
diff --git a/src/LinkDotNet.Blog.Web/Shared/AddProfileShortItem.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/AddProfileShortItem.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/AddProfileShortItem.razor
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/AddProfileShortItem.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/Skills/AddSkillDialog.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/AddSkillDialog.razor
similarity index 97%
rename from src/LinkDotNet.Blog.Web/Shared/Skills/AddSkillDialog.razor
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/AddSkillDialog.razor
index f17fb099..2f1b4d9b 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Skills/AddSkillDialog.razor
+++ b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/AddSkillDialog.razor
@@ -1,4 +1,5 @@
 @using LinkDotNet.Blog.Domain
+@using LinkDotNet.Blog.Web.Features.Components
 @inject IToastService toastService
 <ModalDialog @ref="Dialog" Title="Add Skill">
     <EditForm Model="@model" OnValidSubmit="CreateSkillItem">
diff --git a/src/LinkDotNet.Blog.Web/Shared/Skills/AddSkillModel.cs b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/AddSkillModel.cs
similarity index 85%
rename from src/LinkDotNet.Blog.Web/Shared/Skills/AddSkillModel.cs
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/AddSkillModel.cs
index f4645897..cc4edd94 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Skills/AddSkillModel.cs
+++ b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/AddSkillModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using LinkDotNet.Blog.Domain;
 
-namespace LinkDotNet.Blog.Web.Shared.Skills;
+namespace LinkDotNet.Blog.Web.Features.AboutMe.Components;
 
 public class AddSkillModel
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/Skills/Card.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Card.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Skills/Card.razor
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Card.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/Skills/Card.razor.css b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Card.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Skills/Card.razor.css
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Card.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/Profile.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Profile.razor
similarity index 95%
rename from src/LinkDotNet.Blog.Web/Shared/Profile.razor
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Profile.razor
index 9c94da96..b65e3210 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Profile.razor
+++ b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Profile.razor
@@ -1,7 +1,8 @@
-@using LinkDotNet.Blog.Web.Shared.Services
-@using LinkDotNet.Blog.Domain
+@using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
-@inherits MarkdownComponentBase
+@using LinkDotNet.Blog.Web.Features.Components
+@using LinkDotNet.Blog.Web.Features.Services
+@inherits LinkDotNet.Blog.Web.Features.MarkdownComponentBase
 
 @inject AppConfiguration appConfiguration
 @inject IRepository<ProfileInformationEntry> repository
diff --git a/src/LinkDotNet.Blog.Web/Shared/Profile.razor.css b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Profile.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Profile.razor.css
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Profile.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/Skills/SkillTable.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/SkillTable.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Skills/SkillTable.razor
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/SkillTable.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/Skills/SkillTable.razor.css b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/SkillTable.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Skills/SkillTable.razor.css
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/SkillTable.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/Skills/SkillTag.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/SkillTag.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Skills/SkillTag.razor
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/SkillTag.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/Skills/SkillTag.razor.css b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/SkillTag.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Skills/SkillTag.razor.css
rename to src/LinkDotNet.Blog.Web/Features/AboutMe/Components/SkillTag.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/CreateNewBlogPost.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor
similarity index 99%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/CreateNewBlogPost.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor
index aae545af..8f78324b 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Admin/CreateNewBlogPost.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor
@@ -1,5 +1,4 @@
 @using LinkDotNet.Blog.Domain
-@using LinkDotNet.Blog.Web.Shared.Services
 @inherits MarkdownComponentBase
 
 <h3>@Title</h3>
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/CreateNewBlogPost.razor.css b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/CreateNewBlogPost.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/CreateNewModel.cs b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewModel.cs
similarity index 95%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/CreateNewModel.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewModel.cs
index d7580673..bd9a655c 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Admin/CreateNewModel.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewModel.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using LinkDotNet.Blog.Domain;
 
-namespace LinkDotNet.Blog.Web.Shared.Admin;
+namespace LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
 
 public class CreateNewModel
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/FeatureInfoDialog.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/FeatureInfoDialog.razor
similarity index 93%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/FeatureInfoDialog.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/FeatureInfoDialog.razor
index 4e9b83f9..acd67c0c 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Admin/FeatureInfoDialog.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/FeatureInfoDialog.razor
@@ -1,4 +1,5 @@
-<ModalDialog @ref="FeatureDialog" Title="Additional Features">
+@using LinkDotNet.Blog.Web.Features.Components
+<ModalDialog @ref="FeatureDialog" Title="Additional Features">
     <p>Here you will find a comprehensive list over feature you can use additional to classic markdown</p>
     <p>Features marked with <i class="fas fa-flask"></i> are experimental and can change heavily, get removed or the usage changes.</p>
     <p>Use with caution and check the changelog</p>
diff --git a/src/LinkDotNet.Blog.Web/Shared/SelectionRange.cs b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/SelectionRange.cs
similarity index 60%
rename from src/LinkDotNet.Blog.Web/Shared/SelectionRange.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/SelectionRange.cs
index 829010c4..db191a06 100644
--- a/src/LinkDotNet.Blog.Web/Shared/SelectionRange.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/SelectionRange.cs
@@ -1,4 +1,4 @@
-namespace LinkDotNet.Blog.Web.Shared;
+namespace LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
 
 public sealed class SelectionRange
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/TextAreaWithShortcuts.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/TextAreaWithShortcuts.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/TextAreaWithShortcuts.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/TextAreaWithShortcuts.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/UploadFile.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/UploadFile.razor
similarity index 95%
rename from src/LinkDotNet.Blog.Web/Shared/UploadFile.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/UploadFile.razor
index 7cc09f85..c69fa6df 100644
--- a/src/LinkDotNet.Blog.Web/Shared/UploadFile.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/UploadFile.razor
@@ -1,5 +1,5 @@
 @using System.IO
-@using LinkDotNet.Blog.Web.Shared.Services
+@using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Services
 @inject IFileProcessor fileProcessor
 
 <div>
diff --git a/src/LinkDotNet.Blog.Web/Shared/UploadFile.razor.css b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/UploadFile.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/UploadFile.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/UploadFile.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Pages/Admin/CreateNewBlogPostPage.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/CreateBlogPost.razor
similarity index 89%
rename from src/LinkDotNet.Blog.Web/Pages/Admin/CreateNewBlogPostPage.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/CreateBlogPost.razor
index 97526977..2ca7a70b 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Admin/CreateNewBlogPostPage.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/CreateBlogPost.razor
@@ -1,8 +1,8 @@
 @page "/create"
 @attribute [Authorize]
-@using LinkDotNet.Blog.Web.Shared.Admin
 @using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
+@using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components
 @inherits MarkdownComponentBase
 @inject IRepository<BlogPost> blogPostRepository
 @inject IToastService toastService
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/FileProcessor.cs b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Services/FileProcessor.cs
similarity index 83%
rename from src/LinkDotNet.Blog.Web/Shared/Services/FileProcessor.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Services/FileProcessor.cs
index 8eb52a30..9b836796 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/FileProcessor.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Services/FileProcessor.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Services;
 
 public class FileProcessor : IFileProcessor
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/IFileProcessor.cs b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Services/IFileProcessor.cs
similarity index 69%
rename from src/LinkDotNet.Blog.Web/Shared/Services/IFileProcessor.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Services/IFileProcessor.cs
index 4bf70057..abadb4f9 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/IFileProcessor.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Services/IFileProcessor.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Services;
 
 public interface IFileProcessor
 {
diff --git a/src/LinkDotNet.Blog.Web/Pages/Admin/UpdateBlogPostPage.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/UpdateBlogPostPage.razor
similarity index 94%
rename from src/LinkDotNet.Blog.Web/Pages/Admin/UpdateBlogPostPage.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/UpdateBlogPostPage.razor
index 408e5653..4267b93c 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Admin/UpdateBlogPostPage.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/UpdateBlogPostPage.razor
@@ -1,8 +1,8 @@
 @page "/update/{blogPostId}"
 @attribute [Authorize]
-@using LinkDotNet.Blog.Web.Shared.Admin
 @using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
+@using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components
 @inherits MarkdownComponentBase
 @inject IRepository<BlogPost> blogPostRepository
 @inject IToastService toastService
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/DashboardCard.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/DashboardCard.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/DashboardCard.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/DashboardCard.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/DateRangeSelector.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/DateRangeSelector.razor
similarity index 91%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/DateRangeSelector.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/DateRangeSelector.razor
index 6e0ef821..4d68a3a3 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/DateRangeSelector.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/DateRangeSelector.razor
@@ -1,4 +1,5 @@
-<div class="row mb-3">
+@using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services
+<div class="row mb-3">
     <div class="col-2">
         <label for="startDate">Since</label>
         <input type="date" class="form-control" id="startDate" @onchange="StartDateChanged"/>
diff --git a/src/LinkDotNet.Blog.Web/Pages/Admin/Dashboard.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/DashboardPage.razor
similarity index 91%
rename from src/LinkDotNet.Blog.Web/Pages/Admin/Dashboard.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/DashboardPage.razor
index 7bb9cd79..9f39b6f1 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Admin/Dashboard.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/DashboardPage.razor
@@ -1,5 +1,6 @@
 @page "/dashboard"
-@using LinkDotNet.Blog.Web.Shared.Admin.Dashboard
+@using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services
+@using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Components
 @inject IDashboardService dashboardService
 @inject AppConfiguration appConfiguration
 @attribute [Authorize]
diff --git a/src/LinkDotNet.Blog.Web/Pages/Admin/DashboardData.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/DashboardData.cs
similarity index 83%
rename from src/LinkDotNet.Blog.Web/Pages/Admin/DashboardData.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/DashboardData.cs
index eeec2d71..cfab41d1 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Admin/DashboardData.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/DashboardData.cs
@@ -1,4 +1,4 @@
-namespace LinkDotNet.Blog.Web.Pages.Admin;
+namespace LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 
 public class DashboardData
 {
diff --git a/src/LinkDotNet.Blog.Web/Pages/Admin/DashboardService.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/DashboardService.cs
similarity index 92%
rename from src/LinkDotNet.Blog.Web/Pages/Admin/DashboardService.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/DashboardService.cs
index fac41e58..dc9325cf 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Admin/DashboardService.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/DashboardService.cs
@@ -4,12 +4,7 @@
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
 
-namespace LinkDotNet.Blog.Web.Pages.Admin;
-
-public interface IDashboardService
-{
-    Task<DashboardData> GetDashboardDataAsync();
-}
+namespace LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 
 public class DashboardService : IDashboardService
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/Filter.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/Filter.cs
similarity index 67%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/Filter.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/Filter.cs
index e8c212e9..f29d820e 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/Filter.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/Filter.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LinkDotNet.Blog.Web.Shared.Admin.Dashboard;
+namespace LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 
 public sealed class Filter
 {
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/IDashboardService.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/IDashboardService.cs
new file mode 100644
index 00000000..498f2693
--- /dev/null
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/IDashboardService.cs
@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+
+namespace LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
+
+public interface IDashboardService
+{
+    Task<DashboardData> GetDashboardDataAsync();
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/VisitCountPageData.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/VisitCountPageData.cs
similarity index 73%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/VisitCountPageData.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/VisitCountPageData.cs
index 8db99722..126532d6 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/VisitCountPageData.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/VisitCountPageData.cs
@@ -1,4 +1,4 @@
-namespace LinkDotNet.Blog.Web.Shared.Admin.Dashboard;
+namespace LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 
 public record VisitCountPageData
 {
@@ -9,4 +9,4 @@ public record VisitCountPageData
     public int Likes { get; init; }
 
     public int ClickCount { get; init; }
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/VisitCountPerPage.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/VisitCountPerPage.razor
similarity index 95%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/VisitCountPerPage.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/VisitCountPerPage.razor
index 56ad66d4..40607b8a 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Admin/Dashboard/VisitCountPerPage.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Services/VisitCountPerPage.razor
@@ -1,8 +1,9 @@
-@using LinkDotNet.Blog.Domain
+@using System.Linq.Expressions
+@using Microsoft.EntityFrameworkCore
+@using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
-@using System.Linq.Expressions
 @using LinkDotNet.Blog.Infrastructure.Persistence.Sql
-@using Microsoft.EntityFrameworkCore
+@using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Components
 @inject BlogDbContext blogDbContext
 
 <div class="card">
diff --git a/src/LinkDotNet.Blog.Web/Pages/Admin/DraftBlogPosts.razor b/src/LinkDotNet.Blog.Web/Features/Admin/DraftBlogPost/DraftBlogPostPage.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Pages/Admin/DraftBlogPosts.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/DraftBlogPost/DraftBlogPostPage.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/ISitemapService.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/ISitemapService.cs
similarity index 72%
rename from src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/ISitemapService.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/ISitemapService.cs
index 09c03bf4..581e9467 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/ISitemapService.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/ISitemapService.cs
@@ -1,10 +1,10 @@
 using System.Threading.Tasks;
 
-namespace LinkDotNet.Blog.Web.Shared.Services.Sitemap;
+namespace LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 
 public interface ISitemapService
 {
     Task<SitemapUrlSet> CreateSitemapAsync();
 
     Task SaveSitemapToFileAsync(SitemapUrlSet sitemap);
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/IXmlFileWriter.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/IXmlFileWriter.cs
similarity index 68%
rename from src/LinkDotNet.Blog.Web/Shared/Services/IXmlFileWriter.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/IXmlFileWriter.cs
index c9eded87..12ab89b9 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/IXmlFileWriter.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/IXmlFileWriter.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 
 public interface IXmlFileWriter
 {
     Task WriteObjectToXmlFileAsync<T>(T objectToSave, string fileName);
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapService.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapService.cs
similarity index 97%
rename from src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapService.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapService.cs
index 96dbe2ad..443ed238 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapService.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapService.cs
@@ -6,7 +6,7 @@
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using Microsoft.AspNetCore.Components;
 
-namespace LinkDotNet.Blog.Web.Shared.Services.Sitemap;
+namespace LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 
 public class SitemapService : ISitemapService
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapUrl.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapUrl.cs
similarity index 80%
rename from src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapUrl.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapUrl.cs
index bd3ff1f3..b1f3d67e 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapUrl.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapUrl.cs
@@ -1,6 +1,6 @@
 using System.Xml.Serialization;
 
-namespace LinkDotNet.Blog.Web.Shared.Services.Sitemap;
+namespace LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 
 [XmlRoot(ElementName = "url")]
 public class SitemapUrl
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapUrlSet.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapUrlSet.cs
similarity index 82%
rename from src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapUrlSet.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapUrlSet.cs
index e9aa40ab..a182cf5e 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/Sitemap/SitemapUrlSet.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapUrlSet.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace LinkDotNet.Blog.Web.Shared.Services.Sitemap;
+namespace LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 
 [XmlRoot(ElementName = "urlset", Namespace = "http://www.sitemaps.org/schemas/sitemap/0.9")]
 public class SitemapUrlSet
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/XmlFileWriter.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/XmlFileWriter.cs
similarity index 89%
rename from src/LinkDotNet.Blog.Web/Shared/Services/XmlFileWriter.cs
rename to src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/XmlFileWriter.cs
index 031014ce..87af8a19 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/XmlFileWriter.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/XmlFileWriter.cs
@@ -3,7 +3,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 
 public class XmlFileWriter : IXmlFileWriter
 {
@@ -16,4 +16,4 @@ public async Task WriteObjectToXmlFileAsync<T>(T objectToSave, string fileName)
         xmlWriter.Close();
         file.Close();
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Pages/Admin/Sitemap.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/SitemapPage.razor
similarity index 96%
rename from src/LinkDotNet.Blog.Web/Pages/Admin/Sitemap.razor
rename to src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/SitemapPage.razor
index 053b4f08..25d6057f 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Admin/Sitemap.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/SitemapPage.razor
@@ -1,5 +1,5 @@
 @page "/Sitemap"
-@using LinkDotNet.Blog.Web.Shared.Services.Sitemap
+@using LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services
 @inject ISitemapService sitemapService
 @attribute [Authorize]
 <h3 xmlns="http://www.w3.org/1999/html">Sitemap</h3>
diff --git a/src/LinkDotNet.Blog.Web/Shared/AccessControl.razor b/src/LinkDotNet.Blog.Web/Features/Components/AccessControl.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/AccessControl.razor
rename to src/LinkDotNet.Blog.Web/Features/Components/AccessControl.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/AccessControl.razor.css b/src/LinkDotNet.Blog.Web/Features/Components/AccessControl.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/AccessControl.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Components/AccessControl.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/ConfirmDialog.razor b/src/LinkDotNet.Blog.Web/Features/Components/ConfirmDialog.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/ConfirmDialog.razor
rename to src/LinkDotNet.Blog.Web/Features/Components/ConfirmDialog.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/ConfirmDialog.razor.css b/src/LinkDotNet.Blog.Web/Features/Components/ConfirmDialog.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/ConfirmDialog.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Components/ConfirmDialog.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/Loading.razor b/src/LinkDotNet.Blog.Web/Features/Components/Loading.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Loading.razor
rename to src/LinkDotNet.Blog.Web/Features/Components/Loading.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/ModalDialog.razor b/src/LinkDotNet.Blog.Web/Features/Components/ModalDialog.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/ModalDialog.razor
rename to src/LinkDotNet.Blog.Web/Features/Components/ModalDialog.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/OgData.razor b/src/LinkDotNet.Blog.Web/Features/Components/OgData.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/OgData.razor
rename to src/LinkDotNet.Blog.Web/Features/Components/OgData.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/ShortBlogPost.razor b/src/LinkDotNet.Blog.Web/Features/Components/ShortBlogPost.razor
similarity index 97%
rename from src/LinkDotNet.Blog.Web/Shared/ShortBlogPost.razor
rename to src/LinkDotNet.Blog.Web/Features/Components/ShortBlogPost.razor
index ff7d7652..c9487d8c 100644
--- a/src/LinkDotNet.Blog.Web/Shared/ShortBlogPost.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Components/ShortBlogPost.razor
@@ -2,7 +2,7 @@
 @using System.Text.RegularExpressions
 @using System.Web
 @using LinkDotNet.Blog.Domain
-@inherits MarkdownComponentBase
+@inherits LinkDotNet.Blog.Web.Features.MarkdownComponentBase
 <article>
   <div class="blog-card @AltCssClass">
     <div class="meta">
diff --git a/src/LinkDotNet.Blog.Web/Shared/ShortBlogPost.razor.css b/src/LinkDotNet.Blog.Web/Features/Components/ShortBlogPost.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/ShortBlogPost.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Components/ShortBlogPost.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Pages/Error.cshtml b/src/LinkDotNet.Blog.Web/Features/Error.cshtml
similarity index 96%
rename from src/LinkDotNet.Blog.Web/Pages/Error.cshtml
rename to src/LinkDotNet.Blog.Web/Features/Error.cshtml
index ca1088e4..4c6f22c6 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Error.cshtml
+++ b/src/LinkDotNet.Blog.Web/Features/Error.cshtml
@@ -1,5 +1,5 @@
 @page
-@model LinkDotNet.Blog.Web.Pages.ErrorModel
+@model LinkDotNet.Blog.Web.Features.ErrorModel
 
 <!DOCTYPE html>
 <html>
diff --git a/src/LinkDotNet.Blog.Web/Pages/Error.cshtml.cs b/src/LinkDotNet.Blog.Web/Features/Error.cshtml.cs
similarity index 92%
rename from src/LinkDotNet.Blog.Web/Pages/Error.cshtml.cs
rename to src/LinkDotNet.Blog.Web/Features/Error.cshtml.cs
index f38115d2..1a6f70eb 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Error.cshtml.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Error.cshtml.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace LinkDotNet.Blog.Web.Pages;
+namespace LinkDotNet.Blog.Web.Features;
 
 [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
 [IgnoreAntiforgeryToken]
diff --git a/src/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor b/src/LinkDotNet.Blog.Web/Features/Home/Components/BlogPostNavigation.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/BlogPostNavigation.razor
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/BlogPostNavigation.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/Footer.razor b/src/LinkDotNet.Blog.Web/Features/Home/Components/Footer.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Footer.razor
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/Footer.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/IntroductionCard.razor b/src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor
similarity index 91%
rename from src/LinkDotNet.Blog.Web/Shared/IntroductionCard.razor
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor
index f77d421e..4b429153 100644
--- a/src/LinkDotNet.Blog.Web/Shared/IntroductionCard.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor
@@ -1,5 +1,5 @@
 @using LinkDotNet.Blog.Domain
-@inherits MarkdownComponentBase
+@inherits LinkDotNet.Blog.Web.Features.MarkdownComponentBase
 
 <div style="--profile-background: url(@Introduction.BackgroundUrl)" class="@IntroductionClass">
     <div class="introduction-container">
diff --git a/src/LinkDotNet.Blog.Web/Shared/IntroductionCard.razor.css b/src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/IntroductionCard.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/IntroductionCard.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/MainLayout.razor b/src/LinkDotNet.Blog.Web/Features/Home/Components/MainLayout.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/MainLayout.razor
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/MainLayout.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/NavMenu.razor b/src/LinkDotNet.Blog.Web/Features/Home/Components/NavMenu.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/NavMenu.razor
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/NavMenu.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/NavMenu.razor.css b/src/LinkDotNet.Blog.Web/Features/Home/Components/NavMenu.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/NavMenu.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/NavMenu.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/SearchInput.razor b/src/LinkDotNet.Blog.Web/Features/Home/Components/SearchInput.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/SearchInput.razor
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/SearchInput.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/SearchInput.razor.css b/src/LinkDotNet.Blog.Web/Features/Home/Components/SearchInput.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/SearchInput.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Home/Components/SearchInput.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Pages/Index.razor b/src/LinkDotNet.Blog.Web/Features/Home/Index.razor
similarity index 95%
rename from src/LinkDotNet.Blog.Web/Pages/Index.razor
rename to src/LinkDotNet.Blog.Web/Features/Home/Index.razor
index 51adac92..0111273f 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Index.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Home/Index.razor
@@ -2,9 +2,10 @@
 @page "/{page:int}"
 @using Markdig
 @using X.PagedList
-@using LinkDotNet.Blog.Web.Shared.Services
 @using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
+@using LinkDotNet.Blog.Web.Features.Services
+@using LinkDotNet.Blog.Web.Features.Home.Components
 @inject IRepository<BlogPost> blogPostRepository
 @inject AppConfiguration appConfiguration
 @inject NavigationManager navigationManager
diff --git a/src/LinkDotNet.Blog.Web/Pages/Index.razor.css b/src/LinkDotNet.Blog.Web/Features/Home/Index.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Pages/Index.razor.css
rename to src/LinkDotNet.Blog.Web/Features/Home/Index.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Features/Login.cshtml b/src/LinkDotNet.Blog.Web/Features/Login.cshtml
new file mode 100644
index 00000000..a8ac85bd
--- /dev/null
+++ b/src/LinkDotNet.Blog.Web/Features/Login.cshtml
@@ -0,0 +1,4 @@
+@page
+@model LinkDotNet.Blog.Web.Features.LoginModel
+@{
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Pages/Login.cshtml.cs b/src/LinkDotNet.Blog.Web/Features/Login.cshtml.cs
similarity index 91%
rename from src/LinkDotNet.Blog.Web/Pages/Login.cshtml.cs
rename to src/LinkDotNet.Blog.Web/Features/Login.cshtml.cs
index d2b6b2ca..2184dba6 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Login.cshtml.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Login.cshtml.cs
@@ -2,7 +2,7 @@
 using LinkDotNet.Blog.Web.Authentication;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace LinkDotNet.Blog.Web.Pages;
+namespace LinkDotNet.Blog.Web.Features;
 
 public partial class LoginModel : PageModel
 {
diff --git a/src/LinkDotNet.Blog.Web/Features/Logout.cshtml b/src/LinkDotNet.Blog.Web/Features/Logout.cshtml
new file mode 100644
index 00000000..18e2bdb3
--- /dev/null
+++ b/src/LinkDotNet.Blog.Web/Features/Logout.cshtml
@@ -0,0 +1,4 @@
+@page
+@model LinkDotNet.Blog.Web.Features.LogoutModel
+@{
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Pages/Logout.cshtml.cs b/src/LinkDotNet.Blog.Web/Features/Logout.cshtml.cs
similarity index 91%
rename from src/LinkDotNet.Blog.Web/Pages/Logout.cshtml.cs
rename to src/LinkDotNet.Blog.Web/Features/Logout.cshtml.cs
index e8038f48..a43b3760 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Logout.cshtml.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Logout.cshtml.cs
@@ -2,7 +2,7 @@
 using LinkDotNet.Blog.Web.Authentication;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace LinkDotNet.Blog.Web.Pages;
+namespace LinkDotNet.Blog.Web.Features;
 
 public partial class LogoutModel : PageModel
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/MarkdownComponentBase.cs b/src/LinkDotNet.Blog.Web/Features/MarkdownComponentBase.cs
similarity index 94%
rename from src/LinkDotNet.Blog.Web/Shared/MarkdownComponentBase.cs
rename to src/LinkDotNet.Blog.Web/Features/MarkdownComponentBase.cs
index 5e537fed..48a50c8b 100644
--- a/src/LinkDotNet.Blog.Web/Shared/MarkdownComponentBase.cs
+++ b/src/LinkDotNet.Blog.Web/Features/MarkdownComponentBase.cs
@@ -2,7 +2,7 @@
 using Markdig.Extensions.AutoIdentifiers;
 using Microsoft.AspNetCore.Components;
 
-namespace LinkDotNet.Blog.Web.Shared;
+namespace LinkDotNet.Blog.Web.Features;
 
 public abstract class MarkdownComponentBase : ComponentBase
 {
@@ -23,4 +23,4 @@ protected static MarkupString RenderMarkupString(string content)
 
         return (MarkupString)Markdown.ToHtml(content, MarkdownPipeline);
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Pages/Search.razor b/src/LinkDotNet.Blog.Web/Features/Search/SearchPage.razor
similarity index 96%
rename from src/LinkDotNet.Blog.Web/Pages/Search.razor
rename to src/LinkDotNet.Blog.Web/Features/Search/SearchPage.razor
index 9f80a278..6c2f8d92 100644
--- a/src/LinkDotNet.Blog.Web/Pages/Search.razor
+++ b/src/LinkDotNet.Blog.Web/Features/Search/SearchPage.razor
@@ -1,7 +1,7 @@
 @page "/search/{searchTerm}"
-@using LinkDotNet.Blog.Web.Shared.Services
 @using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
+@using LinkDotNet.Blog.Web.Features.Services
 @inject IRepository<BlogPost> blogPostRepository
 @inject IUserRecordService userRecordService
 
diff --git a/src/LinkDotNet.Blog.Web/Pages/SearchByTag.razor b/src/LinkDotNet.Blog.Web/Features/SearchByTag/SearchByTagPage.razor
similarity index 95%
rename from src/LinkDotNet.Blog.Web/Pages/SearchByTag.razor
rename to src/LinkDotNet.Blog.Web/Features/SearchByTag/SearchByTagPage.razor
index b55f2204..defbfc5a 100644
--- a/src/LinkDotNet.Blog.Web/Pages/SearchByTag.razor
+++ b/src/LinkDotNet.Blog.Web/Features/SearchByTag/SearchByTagPage.razor
@@ -1,7 +1,7 @@
 @page "/searchByTag/{tag}"
-@using LinkDotNet.Blog.Web.Shared.Services
 @using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
+@using LinkDotNet.Blog.Web.Features.Services
 @inject IRepository<BlogPost> blogPostRepository
 @inject IUserRecordService userRecordService
 
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/ILocalStorageService.cs b/src/LinkDotNet.Blog.Web/Features/Services/ILocalStorageService.cs
similarity index 82%
rename from src/LinkDotNet.Blog.Web/Shared/Services/ILocalStorageService.cs
rename to src/LinkDotNet.Blog.Web/Features/Services/ILocalStorageService.cs
index 7b2491a1..1fd4bf40 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/ILocalStorageService.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Services/ILocalStorageService.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Services;
 
 public interface ILocalStorageService
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/ISortOrderCalculator.cs b/src/LinkDotNet.Blog.Web/Features/Services/ISortOrderCalculator.cs
similarity index 80%
rename from src/LinkDotNet.Blog.Web/Shared/Services/ISortOrderCalculator.cs
rename to src/LinkDotNet.Blog.Web/Features/Services/ISortOrderCalculator.cs
index e000635f..ff3e15b4 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/ISortOrderCalculator.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Services/ISortOrderCalculator.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using LinkDotNet.Blog.Domain;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Services;
 
 public interface ISortOrderCalculator
 {
     int GetSortOrder(ProfileInformationEntry target, IEnumerable<ProfileInformationEntry> all);
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/IUserRecordService.cs b/src/LinkDotNet.Blog.Web/Features/Services/IUserRecordService.cs
similarity index 67%
rename from src/LinkDotNet.Blog.Web/Shared/Services/IUserRecordService.cs
rename to src/LinkDotNet.Blog.Web/Features/Services/IUserRecordService.cs
index d0ca4df6..291c2b51 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/IUserRecordService.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Services/IUserRecordService.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Services;
 
 public interface IUserRecordService
 {
     Task StoreUserRecordAsync();
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/LocalStorageService.cs b/src/LinkDotNet.Blog.Web/Features/Services/LocalStorageService.cs
similarity index 93%
rename from src/LinkDotNet.Blog.Web/Shared/Services/LocalStorageService.cs
rename to src/LinkDotNet.Blog.Web/Features/Services/LocalStorageService.cs
index af7ba223..45a0c90d 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/LocalStorageService.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Services/LocalStorageService.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Services;
 
 public class LocalStorageService : ILocalStorageService
 {
@@ -26,4 +26,4 @@ public async ValueTask SetItemAsync<T>(string key, T value)
     {
         await localStorage.SetAsync(key, value);
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/SortOrderCalculator.cs b/src/LinkDotNet.Blog.Web/Features/Services/SortOrderCalculator.cs
similarity index 92%
rename from src/LinkDotNet.Blog.Web/Shared/Services/SortOrderCalculator.cs
rename to src/LinkDotNet.Blog.Web/Features/Services/SortOrderCalculator.cs
index 8b9b5abb..559f1f60 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/SortOrderCalculator.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Services/SortOrderCalculator.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using LinkDotNet.Blog.Domain;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Services;
 
 public class SortOrderCalculator : ISortOrderCalculator
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/UserRecordService.cs b/src/LinkDotNet.Blog.Web/Features/Services/UserRecordService.cs
similarity index 98%
rename from src/LinkDotNet.Blog.Web/Shared/Services/UserRecordService.cs
rename to src/LinkDotNet.Blog.Web/Features/Services/UserRecordService.cs
index 037503f9..b28ca496 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/UserRecordService.cs
+++ b/src/LinkDotNet.Blog.Web/Features/Services/UserRecordService.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.Services;
 
 public class UserRecordService : IUserRecordService
 {
@@ -100,4 +100,4 @@ private string GetClickedUrl()
         var queryIndex = basePath.IndexOf('?');
         return queryIndex >= 0 ? basePath[..queryIndex] : basePath;
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Admin/BlogPostAdminActions.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/BlogPostAdminActions.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Admin/BlogPostAdminActions.razor
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/BlogPostAdminActions.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/CommentSection.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/CommentSection.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/CommentSection.razor
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/CommentSection.razor
diff --git a/src/LinkDotNet.Blog.Web/Shared/Disqus.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Disqus.razor
similarity index 87%
rename from src/LinkDotNet.Blog.Web/Shared/Disqus.razor
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Disqus.razor
index 01df4a92..9e05872d 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Disqus.razor
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Disqus.razor
@@ -8,7 +8,7 @@
     {
         if (firstRender && appConfiguration.IsDisqusEnabled)
         {
-            await jsRuntime.InvokeAsync<IJSObjectReference>("import", "./Shared/Disqus.razor.js");
+            await jsRuntime.InvokeAsync<IJSObjectReference>("import", "./Features/ShowBlogPost/Components/Disqus.razor.js");
             await jsRuntime.InvokeVoidAsync("initDisqus", appConfiguration.DisqusConfiguration);
         }
     }
diff --git a/src/LinkDotNet.Blog.Web/Shared/Disqus.razor.js b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Disqus.razor.js
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/Disqus.razor.js
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Disqus.razor.js
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/DisqusConfiguration.cs b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/DisqusConfiguration.cs
similarity index 55%
rename from src/LinkDotNet.Blog.Web/Shared/Services/DisqusConfiguration.cs
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/DisqusConfiguration.cs
index bb3457c0..b2232e8e 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/DisqusConfiguration.cs
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/DisqusConfiguration.cs
@@ -1,4 +1,4 @@
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 
 public record DisqusConfiguration
 {
diff --git a/src/LinkDotNet.Blog.Web/Shared/Giscus.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Giscus.razor
similarity index 87%
rename from src/LinkDotNet.Blog.Web/Shared/Giscus.razor
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Giscus.razor
index b88a2796..ad72d216 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Giscus.razor
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Giscus.razor
@@ -8,7 +8,7 @@
     {
         if (firstRender && appConfiguration.IsGiscusEnabled)
         {
-            await jsRuntime.InvokeAsync<IJSObjectReference>("import", "./Shared/Giscus.razor.js");
+            await jsRuntime.InvokeAsync<IJSObjectReference>("import", "./Features/ShowBlogPost/Components/Giscus.razor.js");
             await jsRuntime.InvokeVoidAsync("initGiscus", "giscus", appConfiguration.GiscusConfiguration);
         }
     }
diff --git a/src/LinkDotNet.Blog.Web/Shared/Giscus.razor.js b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Giscus.razor.js
similarity index 93%
rename from src/LinkDotNet.Blog.Web/Shared/Giscus.razor.js
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Giscus.razor.js
index 2ba450e3..f26bf772 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Giscus.razor.js
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Giscus.razor.js
@@ -1,4 +1,4 @@
-window.initGiscus = (divClass, giscus) => {
+window.initGiscus = (divClass, giscus) => {
     const script = document.createElement('script');
     script.src = 'https://giscus.app/client.js'
     script.setAttribute('data-repo', giscus.repository)
diff --git a/src/LinkDotNet.Blog.Web/Shared/Services/GiscusConfiguration.cs b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/GiscusConfiguration.cs
similarity index 76%
rename from src/LinkDotNet.Blog.Web/Shared/Services/GiscusConfiguration.cs
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/GiscusConfiguration.cs
index 00549691..743feb88 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Services/GiscusConfiguration.cs
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/GiscusConfiguration.cs
@@ -1,4 +1,4 @@
-namespace LinkDotNet.Blog.Web.Shared.Services;
+namespace LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 
 public record GiscusConfiguration
 {
@@ -9,4 +9,4 @@ public record GiscusConfiguration
     public string Category { get; init; }
 
     public string CategoryId { get; init; }
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Shared/Like.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Like.razor
similarity index 94%
rename from src/LinkDotNet.Blog.Web/Shared/Like.razor
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Like.razor
index c78d8fdc..00a6f02a 100644
--- a/src/LinkDotNet.Blog.Web/Shared/Like.razor
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/Like.razor
@@ -1,5 +1,5 @@
-@using LinkDotNet.Blog.Web.Shared.Services
-@using LinkDotNet.Blog.Domain
+@using LinkDotNet.Blog.Domain
+@using LinkDotNet.Blog.Web.Features.Services
 @inject ILocalStorageService localStorage
 <div class="like-container">
     <button class="btn @BtnClass" @onclick="LikeBlogPost"><i class="far fa-thumbs-up"></i> @BlogPost.Likes @LikeText</button>
diff --git a/src/LinkDotNet.Blog.Web/Shared/ShareBlogPost.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ShareBlogPost.razor
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Shared/ShareBlogPost.razor
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/Components/ShareBlogPost.razor
diff --git a/src/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
similarity index 95%
rename from src/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
index 57fd632b..7a6f4551 100644
--- a/src/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor
+++ b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
@@ -1,9 +1,9 @@
 @page "/blogPost/{blogPostId}"
-@using LinkDotNet.Blog.Web.Shared.Admin
-@using LinkDotNet.Blog.Web.Shared.Services
 @using Markdig
 @using LinkDotNet.Blog.Domain
 @using LinkDotNet.Blog.Infrastructure.Persistence
+@using LinkDotNet.Blog.Web.Features.Services
+@using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components
 @inject IRepository<BlogPost> blogPostRepository
 @inject IJSRuntime jsRuntime
 @inject IUserRecordService userRecordService
diff --git a/src/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor.css b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor.css
similarity index 100%
rename from src/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor.css
rename to src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor.css
diff --git a/src/LinkDotNet.Blog.Web/Shared/UrlExtensions.cs b/src/LinkDotNet.Blog.Web/Features/UrlExtensions.cs
similarity index 92%
rename from src/LinkDotNet.Blog.Web/Shared/UrlExtensions.cs
rename to src/LinkDotNet.Blog.Web/Features/UrlExtensions.cs
index ccee23d6..3db13988 100644
--- a/src/LinkDotNet.Blog.Web/Shared/UrlExtensions.cs
+++ b/src/LinkDotNet.Blog.Web/Features/UrlExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LinkDotNet.Blog.Web.Shared;
+namespace LinkDotNet.Blog.Web.Features;
 
 public static class UrlExtensions
 {
@@ -19,4 +19,4 @@ private static bool IsAbsoluteUrl(string url)
     {
         return Uri.TryCreate(url, UriKind.Absolute, out _);
     }
-}
+}
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj b/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj
index 6f7c24ef..724d2c32 100644
--- a/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj
+++ b/src/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj
@@ -28,4 +28,13 @@
 		<InternalsVisibleTo Include="LinkDotNet.Blog.IntegrationTests" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Update="Features\ShowBlogPost\Components\Giscus.razor.js">
+	    <DependentUpon>Giscus.razor</DependentUpon>
+	  </None>
+	  <None Update="Features\ShowBlogPost\Components\Disqus.razor.js">
+	    <DependentUpon>Disqus.razor</DependentUpon>
+	  </None>
+	</ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/Pages/Login.cshtml b/src/LinkDotNet.Blog.Web/Pages/Login.cshtml
deleted file mode 100644
index dc0dabb0..00000000
--- a/src/LinkDotNet.Blog.Web/Pages/Login.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model LinkDotNet.Blog.Web.Pages.LoginModel
-@{
-}
diff --git a/src/LinkDotNet.Blog.Web/Pages/Logout.cshtml b/src/LinkDotNet.Blog.Web/Pages/Logout.cshtml
deleted file mode 100644
index b75b2418..00000000
--- a/src/LinkDotNet.Blog.Web/Pages/Logout.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@page
-@model LinkDotNet.Blog.Web.Pages.LogoutModel
-@{
-}
diff --git a/src/LinkDotNet.Blog.Web/ServiceExtensions.cs b/src/LinkDotNet.Blog.Web/ServiceExtensions.cs
index ea3c80bc..c7a2ee67 100644
--- a/src/LinkDotNet.Blog.Web/ServiceExtensions.cs
+++ b/src/LinkDotNet.Blog.Web/ServiceExtensions.cs
@@ -1,6 +1,7 @@
-using LinkDotNet.Blog.Web.Pages.Admin;
-using LinkDotNet.Blog.Web.Shared.Services;
-using LinkDotNet.Blog.Web.Shared.Services.Sitemap;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Services;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
+using LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
+using LinkDotNet.Blog.Web.Features.Services;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace LinkDotNet.Blog.Web;
diff --git a/src/LinkDotNet.Blog.Web/_Imports.razor b/src/LinkDotNet.Blog.Web/_Imports.razor
index d86e01ee..467ae152 100644
--- a/src/LinkDotNet.Blog.Web/_Imports.razor
+++ b/src/LinkDotNet.Blog.Web/_Imports.razor
@@ -9,4 +9,4 @@
 @using Blazored.Toast
 @using Blazored.Toast.Services
 @using LinkDotNet.Blog.Web
-@using LinkDotNet.Blog.Web.Shared
\ No newline at end of file
+@using LinkDotNet.Blog.Web.Features.Components
\ No newline at end of file
diff --git a/src/LinkDotNet.Blog.Web/wwwroot/android-chrome-192x192.png b/src/LinkDotNet.Blog.Web/wwwroot/android-chrome-192x192.png
index 2f16f664..69c3d6ad 100644
Binary files a/src/LinkDotNet.Blog.Web/wwwroot/android-chrome-192x192.png and b/src/LinkDotNet.Blog.Web/wwwroot/android-chrome-192x192.png differ
diff --git a/src/LinkDotNet.Blog.Web/wwwroot/android-chrome-512x512.png b/src/LinkDotNet.Blog.Web/wwwroot/android-chrome-512x512.png
new file mode 100644
index 00000000..933ac014
Binary files /dev/null and b/src/LinkDotNet.Blog.Web/wwwroot/android-chrome-512x512.png differ
diff --git a/src/LinkDotNet.Blog.Web/wwwroot/apple-touch-icon.png b/src/LinkDotNet.Blog.Web/wwwroot/apple-touch-icon.png
index 30b1edbd..a334f3c3 100644
Binary files a/src/LinkDotNet.Blog.Web/wwwroot/apple-touch-icon.png and b/src/LinkDotNet.Blog.Web/wwwroot/apple-touch-icon.png differ
diff --git a/src/LinkDotNet.Blog.Web/wwwroot/favicon-16x16.png b/src/LinkDotNet.Blog.Web/wwwroot/favicon-16x16.png
index 3f77ed00..f62507ed 100644
Binary files a/src/LinkDotNet.Blog.Web/wwwroot/favicon-16x16.png and b/src/LinkDotNet.Blog.Web/wwwroot/favicon-16x16.png differ
diff --git a/src/LinkDotNet.Blog.Web/wwwroot/favicon-32x32.png b/src/LinkDotNet.Blog.Web/wwwroot/favicon-32x32.png
index e389d41d..711919ce 100644
Binary files a/src/LinkDotNet.Blog.Web/wwwroot/favicon-32x32.png and b/src/LinkDotNet.Blog.Web/wwwroot/favicon-32x32.png differ
diff --git a/src/LinkDotNet.Blog.Web/wwwroot/favicon.ico b/src/LinkDotNet.Blog.Web/wwwroot/favicon.ico
index 6e4947df..57f2e5d3 100644
Binary files a/src/LinkDotNet.Blog.Web/wwwroot/favicon.ico and b/src/LinkDotNet.Blog.Web/wwwroot/favicon.ico differ
diff --git a/src/LinkDotNet.Blog.Web/wwwroot/site.webmanifest b/src/LinkDotNet.Blog.Web/wwwroot/site.webmanifest
index de65106f..45dc8a20 100644
--- a/src/LinkDotNet.Blog.Web/wwwroot/site.webmanifest
+++ b/src/LinkDotNet.Blog.Web/wwwroot/site.webmanifest
@@ -1,19 +1 @@
-{
-    "name": "",
-    "short_name": "",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-256x256.png",
-            "sizes": "256x256",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
-}
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/CreateNewBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
similarity index 90%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/CreateNewBlogPostPageTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
index 9e837279..39f64bbb 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/CreateNewBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs
@@ -4,15 +4,14 @@
 using Bunit.TestDoubles;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
-using LinkDotNet.Blog.Web.Pages.Admin;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Admin;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Services;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages.Admin;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Admin.BlogPostEditor;
 
 public class CreateNewBlogPostPageTests : SqlDatabaseTestBase<BlogPost>
 {
@@ -26,7 +25,7 @@ public async Task ShouldSaveBlogPostOnSave()
         ctx.Services.AddScoped(_ => toastService.Object);
         ctx.ComponentFactories.AddStub<UploadFile>();
         ctx.Services.AddScoped(_ => Mock.Of<IFileProcessor>());
-        using var cut = ctx.RenderComponent<CreateNewBlogPostPage>();
+        using var cut = ctx.RenderComponent<CreateBlogPost>();
         var newBlogPost = cut.FindComponent<CreateNewBlogPost>();
 
         TriggerNewBlogPost(newBlogPost);
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/UpdateBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
similarity index 88%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/UpdateBlogPostPageTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
index 4eb4eeda..44de5c47 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/UpdateBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Blazored.Toast.Services;
 using Bunit;
@@ -6,13 +6,12 @@
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Pages.Admin;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Admin;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages.Admin;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Admin.BlogPostEditor;
 
 public class UpdateBlogPostPageTests : SqlDatabaseTestBase<BlogPost>
 {
@@ -50,7 +49,7 @@ public void ShouldThrowWhenNoIdProvided()
         Action act = () => ctx.RenderComponent<UpdateBlogPostPage>(
             p => p.Add(s => s.BlogPostId, null));
 
-        act.Should().ThrowExactly<ArgumentNullException>();
+        act.Should().ThrowExactly<ArgumentNullException>();	
     }
 
     private static void TriggerUpdate(IRenderedFragment cut)
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/Dashboard/VisitCountPerPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs
similarity index 94%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/Dashboard/VisitCountPerPageTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs
index 814bc6a9..95300747 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/Dashboard/VisitCountPerPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Components/VisitCountPerPageTests.cs
@@ -5,10 +5,11 @@
 using Bunit;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared.Admin.Dashboard;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Components;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages.Admin.Dashboard;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Admin.Dashboard.Components;
 
 public class VisitCountPerPageTests : SqlDatabaseTestBase<BlogPost>
 {
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/Dashboard/DashboardServiceTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Service/DashboardServiceTests.cs
similarity index 94%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/Dashboard/DashboardServiceTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Service/DashboardServiceTests.cs
index 6c05cef8..41d23240 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/Dashboard/DashboardServiceTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/Dashboard/Service/DashboardServiceTests.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using LinkDotNet.Blog.Domain;
-using LinkDotNet.Blog.Web.Pages.Admin;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages.Admin.Dashboard;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Admin.Dashboard.Service;
 
 public class DashboardServiceTests : SqlDatabaseTestBase<UserRecord>
 {
@@ -94,4 +94,4 @@ public async Task ShouldGetAboutMeClicks()
         data.TotalAboutMeClicks.Should().Be(2);
         data.AboutMeClicksLast30Days.Should().Be(1);
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs
similarity index 82%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs
index ee77e56f..f9f81665 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/DraftBlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/DraftBlogPost/DraftBlogPostPageTests.cs
@@ -4,11 +4,11 @@
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Pages.Admin;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Admin.DraftBlogPost;
+using LinkDotNet.Blog.Web.Features.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages.Admin;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Admin.DraftBlogPost;
 
 public class DraftBlogPostPageTests : SqlDatabaseTestBase<BlogPost>
 {
@@ -22,7 +22,7 @@ public async Task ShouldOnlyShowPublishedPosts()
         using var ctx = new TestContext();
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
-        var cut = ctx.RenderComponent<DraftBlogPosts>();
+        var cut = ctx.RenderComponent<DraftBlogPostPage>();
         cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
         var blogPosts = cut.FindComponents<ShortBlogPost>();
@@ -30,4 +30,4 @@ public async Task ShouldOnlyShowPublishedPosts()
         blogPosts.Should().HaveCount(1);
         blogPosts[0].Find(".description h1").InnerHtml.Should().Be("Not published");
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
similarity index 96%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
index 533b157e..2dff0815 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
@@ -5,12 +5,12 @@
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Components;
+using LinkDotNet.Blog.Web.Features.Home;
+using LinkDotNet.Blog.Web.Features.Services;
 using Microsoft.Extensions.DependencyInjection;
-using Index = LinkDotNet.Blog.Web.Pages.Index;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Home;
 
 public class IndexTests : SqlDatabaseTestBase<BlogPost>
 {
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
similarity index 82%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
index 9a5169c6..e53ba098 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
@@ -4,14 +4,14 @@
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Pages;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Components;
+using LinkDotNet.Blog.Web.Features.Search;
+using LinkDotNet.Blog.Web.Features.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.Search;
 
-public class SearchTests : SqlDatabaseTestBase<BlogPost>
+public class SearchPageTests : SqlDatabaseTestBase<BlogPost>
 {
     [Fact]
     public async Task ShouldFindBlogPostWhenTitleMatches()
@@ -24,7 +24,7 @@ public async Task ShouldFindBlogPostWhenTitleMatches()
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
-        var cut = ctx.RenderComponent<Search>(p => p.Add(s => s.SearchTerm, "Title 1"));
+        var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Title 1"));
 
         cut.WaitForState(() => cut.FindComponents<ShortBlogPost>().Any());
         var blogPosts = cut.FindComponents<ShortBlogPost>();
@@ -43,7 +43,7 @@ public async Task ShouldFindBlogPostWhenTagMatches()
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
-        var cut = ctx.RenderComponent<Search>(p => p.Add(s => s.SearchTerm, "Cat"));
+        var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Cat"));
 
         cut.WaitForState(() => cut.FindComponents<ShortBlogPost>().Any());
         var blogPosts = cut.FindComponents<ShortBlogPost>();
@@ -60,7 +60,7 @@ public async Task ShouldUnescapeQuery()
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
 
-        var cut = ctx.RenderComponent<Search>(p => p.Add(s => s.SearchTerm, "Title%201"));
+        var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Title%201"));
 
         cut.WaitForState(() => cut.FindComponents<ShortBlogPost>().Any());
         var blogPosts = cut.FindComponents<ShortBlogPost>();
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs
similarity index 82%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs
index 95afe769..44d10fde 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/SearchByTag/SearchByTagPageTests.cs
@@ -6,12 +6,12 @@
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Pages;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.SearchByTag;
+using LinkDotNet.Blog.Web.Features.Services;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.SearchByTag;
 
 public class SearchByTagTests : SqlDatabaseTestBase<BlogPost>
 {
@@ -24,7 +24,7 @@ public async Task ShouldOnlyDisplayTagsGivenByParameter()
         await AddBlogPostWithTagAsync("Tag 2");
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
-        var cut = ctx.RenderComponent<SearchByTag>(p => p.Add(s => s.Tag, "Tag 1"));
+        var cut = ctx.RenderComponent<SearchByTagPage>(p => p.Add(s => s.Tag, "Tag 1"));
         cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
         var tags = cut.FindAll(".blog-card");
@@ -39,7 +39,7 @@ public async Task ShouldHandleSpecialCharacters()
         await AddBlogPostWithTagAsync("C#");
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
-        var cut = ctx.RenderComponent<SearchByTag>(p => p.Add(s => s.Tag, Uri.EscapeDataString("C#")));
+        var cut = ctx.RenderComponent<SearchByTagPage>(p => p.Add(s => s.Tag, Uri.EscapeDataString("C#")));
         cut.WaitForState(() => cut.FindAll(".blog-card").Any());
 
         var tags = cut.FindAll(".blog-card");
@@ -55,7 +55,7 @@ public void ShouldSetTitleToTag()
         ctx.Services.AddScoped(_ => Mock.Of<IUserRecordService>());
         ctx.ComponentFactories.AddStub<PageTitle>();
 
-        var cut = ctx.RenderComponent<SearchByTag>(p => p.Add(s => s.Tag, "Tag"));
+        var cut = ctx.RenderComponent<SearchByTagPage>(p => p.Add(s => s.Tag, "Tag"));
 
         var pageTitleStub = cut.FindComponent<Stub<PageTitle>>();
         var pageTitle = ctx.Render(pageTitleStub.Instance.Parameters.Get(p => p.ChildContent));
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/BlogPostPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
similarity index 86%
rename from tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/BlogPostPageTests.cs
rename to tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
index f04f52ff..bb01190c 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/BlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
@@ -6,15 +6,16 @@
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Pages;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Components;
+using LinkDotNet.Blog.Web.Features.Services;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.IntegrationTests.Web.Pages;
+namespace LinkDotNet.Blog.IntegrationTests.Web.Features.ShowBlogPost;
 
-public class BlogPostPageTests : SqlDatabaseTestBase<BlogPost>
+public class ShowBlogPostPageTests : SqlDatabaseTestBase<BlogPost>
 {
     [Fact]
     public async Task ShouldAddLikeOnEvent()
@@ -25,7 +26,7 @@ public async Task ShouldAddLikeOnEvent()
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx);
         ctx.AddTestAuthorization().SetAuthorized("s");
-        var cut = ctx.RenderComponent<BlogPostPage>(
+        var cut = ctx.RenderComponent<ShowBlogPostPage>(
             p => p.Add(b => b.BlogPostId, publishedPost.Id));
         var likeComponent = cut.FindComponent<Like>();
         likeComponent.SetParametersAndRender(c => c.Add(p => p.BlogPost, publishedPost));
@@ -49,7 +50,7 @@ public async Task ShouldSubtractLikeOnEvent()
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         RegisterComponents(ctx, localStorage.Object);
         ctx.AddTestAuthorization().SetAuthorized("s");
-        var cut = ctx.RenderComponent<BlogPostPage>(
+        var cut = ctx.RenderComponent<ShowBlogPostPage>(
             p => p.Add(b => b.BlogPostId, publishedPost.Id));
         var likeComponent = cut.FindComponent<Like>();
         likeComponent.SetParametersAndRender(c => c.Add(p => p.BlogPost, publishedPost));
@@ -69,7 +70,7 @@ public async Task ShouldSetTagsWhenAvailable()
         ctx.JSInterop.Mode = JSRuntimeMode.Loose;
         ctx.AddTestAuthorization();
         RegisterComponents(ctx);
-        var cut = ctx.RenderComponent<BlogPostPage>(
+        var cut = ctx.RenderComponent<ShowBlogPostPage>(
             p => p.Add(b => b.BlogPostId, publishedPost.Id));
 
         var ogData = cut.FindComponent<OgData>();
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs
index 2838bc11..3a031fab 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Admin/BlogPostAdminActionsTests.cs
@@ -3,7 +3,7 @@
 using Bunit.TestDoubles;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
-using LinkDotNet.Blog.Web.Shared.Admin;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ConfirmDialogTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ConfirmDialogTests.cs
index fe588633..d434bc0d 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ConfirmDialogTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ConfirmDialogTests.cs
@@ -1,5 +1,5 @@
 using Bunit;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Components;
 
 namespace LinkDotNet.Blog.IntegrationTests.Web.Shared;
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/NavMenuTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/NavMenuTests.cs
index 428eb7de..ee4e6f22 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/NavMenuTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/NavMenuTests.cs
@@ -5,7 +5,8 @@
 using Bunit.TestDoubles;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Components;
+using LinkDotNet.Blog.Web.Features.Home.Components;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
index 399e9c7c..99085c24 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
@@ -6,8 +6,9 @@
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.AboutMe.Components;
+using LinkDotNet.Blog.Web.Features.Components;
+using LinkDotNet.Blog.Web.Features.Services;
 using Microsoft.Extensions.DependencyInjection;
 using X.PagedList;
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Services/SitemapServiceTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Services/SitemapServiceTests.cs
index 866edbe9..a0a63acd 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Services/SitemapServiceTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Services/SitemapServiceTests.cs
@@ -4,8 +4,7 @@
 using System.Threading.Tasks;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
-using LinkDotNet.Blog.Web.Shared.Services;
-using LinkDotNet.Blog.Web.Shared.Services.Sitemap;
+using LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 
 namespace LinkDotNet.Blog.IntegrationTests.Web.Shared.Services
 {
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
index 56f2d746..ca7d65f7 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
@@ -6,7 +6,7 @@
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared.Skills;
+using LinkDotNet.Blog.Web.Features.AboutMe.Components;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace LinkDotNet.Blog.IntegrationTests.Web.Shared.Skills;
diff --git a/tests/LinkDotNet.Blog.UnitTests/LinkDotNet.Blog.UnitTests.csproj b/tests/LinkDotNet.Blog.UnitTests/LinkDotNet.Blog.UnitTests.csproj
index ce6e7b4c..b6d32001 100644
--- a/tests/LinkDotNet.Blog.UnitTests/LinkDotNet.Blog.UnitTests.csproj
+++ b/tests/LinkDotNet.Blog.UnitTests/LinkDotNet.Blog.UnitTests.csproj
@@ -14,5 +14,4 @@
       <ProjectReference Include="..\LinkDotNet.Blog.TestUtilities\LinkDotNet.Blog.TestUtilities.csproj" />
       <ProjectReference Include="..\..\src\LinkDotNet.Blog.Web\LinkDotNet.Blog.Web.csproj" />
     </ItemGroup>
-
 </Project>
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/AboutMeTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/AboutMePageTests.cs
similarity index 87%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Pages/AboutMeTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/AboutMePageTests.cs
index 277505e2..b52d7d42 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/AboutMeTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/AboutMePageTests.cs
@@ -7,16 +7,16 @@
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Pages;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
-using LinkDotNet.Blog.Web.Shared.Skills;
+using LinkDotNet.Blog.Web.Features.AboutMe;
+using LinkDotNet.Blog.Web.Features.AboutMe.Components;
+using LinkDotNet.Blog.Web.Features.Components;
+using LinkDotNet.Blog.Web.Features.Services;
 using Microsoft.Extensions.DependencyInjection;
 using X.PagedList;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Pages;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.AboutMe;
 
-public class AboutMeTests : TestContext
+public class AboutMePageTests : TestContext
 {
     [Fact]
     public void ShouldPassIsAuthenticated()
@@ -25,7 +25,7 @@ public void ShouldPassIsAuthenticated()
         var config = CreateAppConfiguration(new ProfileInformation { ProfilePictureUrl = string.Empty });
         SetupMocks(config);
 
-        var cut = RenderComponent<AboutMe>();
+        var cut = RenderComponent<AboutMePage>();
 
         cut.FindComponent<Profile>().Instance.IsAuthenticated.Should().BeTrue();
         cut.FindComponent<SkillTable>().Instance.IsAuthenticated.Should().BeTrue();
@@ -38,7 +38,7 @@ public void ShouldNotShowWhenEnabledFalse()
         var config = CreateAppConfiguration();
         SetupMocks(config);
 
-        var cut = RenderComponent<AboutMe>();
+        var cut = RenderComponent<AboutMePage>();
 
         cut.FindComponents<Profile>().Any().Should().BeFalse();
         cut.FindComponents<SkillTable>().Any().Should().BeFalse();
@@ -56,7 +56,7 @@ public void ShouldSetOgData()
         var config = CreateAppConfiguration(profileInformation);
         SetupMocks(config);
 
-        var cut = RenderComponent<AboutMe>();
+        var cut = RenderComponent<AboutMePage>();
 
         var ogData = cut.FindComponent<OgData>().Instance;
         ogData.AbsolutePreviewImageUrl.Should().Be("http://localhost/someurl");
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/AddProfileShortItemTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddProfileShortItemTests.cs
similarity index 89%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/AddProfileShortItemTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddProfileShortItemTests.cs
index 8817421d..e4588aff 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/AddProfileShortItemTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddProfileShortItemTests.cs
@@ -1,7 +1,7 @@
 using Bunit;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.AboutMe.Components;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.AboutMe.Components;
 
 public class AddProfileShortItemTests : TestContext
 {
@@ -44,4 +44,4 @@ public void ShouldEmptyModelAfterTextEntered()
 
         cut.Find("input").TextContent.Should().BeEmpty();
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Skills/AddSkillDialogTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddSkillDialogTests.cs
similarity index 90%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Skills/AddSkillDialogTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddSkillDialogTests.cs
index 53ae9ef1..588956ec 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Skills/AddSkillDialogTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/AddSkillDialogTests.cs
@@ -1,10 +1,10 @@
 using Blazored.Toast.Services;
 using Bunit;
 using LinkDotNet.Blog.Domain;
-using LinkDotNet.Blog.Web.Shared.Skills;
+using LinkDotNet.Blog.Web.Features.AboutMe.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Skills;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.AboutMe.Components;
 
 public class AddSkillDialogTests : TestContext
 {
@@ -33,4 +33,4 @@ public void ShouldCreateSkill()
             string.Empty,
             null));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Skills/SkillTagTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/SkillTagTests.cs
similarity index 91%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Skills/SkillTagTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/SkillTagTests.cs
index b04d9aa5..6df17fe3 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Skills/SkillTagTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/AboutMe/Components/SkillTagTests.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using Bunit;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared.Skills;
+using LinkDotNet.Blog.Web.Features.AboutMe.Components;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Skills;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.AboutMe.Components;
 
 public class SkillTagTests : TestContext
 {
@@ -46,4 +46,4 @@ public void ShouldInvokeDeleteEvent()
 
         wasInvoked.Should().BeTrue();
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs
similarity index 97%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs
index 2e7cf67a..e19acac2 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs
@@ -3,10 +3,9 @@
 using Bunit;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Admin;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Admin;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.BlogPostEditor.Components;
 
 public class CreateNewBlogPostTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/TextAreaWithShortcutsTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/TextAreaWithShortcutsTests.cs
similarity index 92%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/TextAreaWithShortcutsTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/TextAreaWithShortcutsTests.cs
index 62ac082d..e14df90d 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/TextAreaWithShortcutsTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/TextAreaWithShortcutsTests.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using Bunit;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.BlogPostEditor.Components;
 
 public class TextAreaWithShortcutsTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/UploadFileTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/UploadFileTests.cs
similarity index 91%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/UploadFileTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/UploadFileTests.cs
index 2ed1e290..d6994929 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/UploadFileTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/UploadFileTests.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bunit;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Services;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.BlogPostEditor.Components;
 
 public class UploadFileTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/FileProcessorTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Services/FileProcessorTests.cs
similarity index 83%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/FileProcessorTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Services/FileProcessorTests.cs
index 12108ec7..4fbd9bba 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/FileProcessorTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Services/FileProcessorTests.cs
@@ -1,9 +1,9 @@
 using System.IO;
 using System.Threading.Tasks;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Services;
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Services;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.BlogPostEditor.Services;
 
 public class FileProcessorTests
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/Dashboard/DateRangeSelectorTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs
similarity index 88%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/Dashboard/DateRangeSelectorTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs
index bd827b4e..80b5246b 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/Dashboard/DateRangeSelectorTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/Components/DateRangeSelectorTests.cs
@@ -1,8 +1,9 @@
 using System;
 using Bunit;
-using LinkDotNet.Blog.Web.Shared.Admin.Dashboard;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Components;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Admin.Dashboard;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Dashboard.Components;
 
 public class DateRangeSelectorTests : TestContext
 {
@@ -55,4 +56,4 @@ public void ShouldReset()
         filter.StartDate.Should().BeNull();
         filter.EndDate.Should().BeNull();
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/Admin/DashboardTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/DashboardPageTests.cs
similarity index 83%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Pages/Admin/DashboardTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/DashboardPageTests.cs
index cbab3b66..3859963b 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/Admin/DashboardTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Dashboard/DashboardPageTests.cs
@@ -6,15 +6,16 @@
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.Infrastructure.Persistence.Sql;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Pages.Admin;
-using LinkDotNet.Blog.Web.Shared.Admin.Dashboard;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Components;
+using LinkDotNet.Blog.Web.Features.Admin.Dashboard.Services;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Pages.Admin;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Dashboard;
 
-public class DashboardTests : TestContext
+public class DashboardPageTests : TestContext
 {
     [Theory]
     [InlineData(true)]
@@ -33,7 +34,7 @@ public void ShouldShowAboutMeStatisticsAccordingToConfig(bool aboutMeEnabled)
         dashboardService.Setup(d => d.GetDashboardDataAsync())
             .ReturnsAsync(new DashboardData());
 
-        var cut = RenderComponent<Dashboard>();
+        var cut = RenderComponent<DashboardPage>();
 
         cut.FindComponents<DashboardCard>()
             .Any(c => c.Instance.Text == "About Me:")
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/SitemapServiceTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/SitemapServiceTests.cs
similarity index 94%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/SitemapServiceTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/SitemapServiceTests.cs
index 9b0af175..53fa5691 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/SitemapServiceTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/SitemapServiceTests.cs
@@ -6,11 +6,10 @@
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared.Services;
-using LinkDotNet.Blog.Web.Shared.Services.Sitemap;
+using LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 using X.PagedList;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Services;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Sitemap.Services;
 
 public class SitemapServiceTests : TestContext
 {
@@ -72,4 +71,4 @@ public async Task ShouldSaveSitemapToFile()
 
         xmlFileWriterMock.Verify(x => x.WriteObjectToXmlFileAsync(sitemap, "wwwroot/sitemap.xml"));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/XmlFileWriterTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/XmlFileWriterTests.cs
similarity index 86%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/XmlFileWriterTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/XmlFileWriterTests.cs
index 4a67449c..23ac2182 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/XmlFileWriterTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/Services/XmlFileWriterTests.cs
@@ -1,9 +1,9 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Services;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Sitemap.Services;
 
 public sealed class XmlFileWriterTests : IDisposable
 {
@@ -34,4 +34,4 @@ public class MyObject
     {
         public string Property { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/Admin/SitemapTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
similarity index 84%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Pages/Admin/SitemapTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
index d578c381..c735e8bd 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/Admin/SitemapTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
@@ -3,14 +3,14 @@
 using System.Threading.Tasks;
 using Bunit;
 using Bunit.TestDoubles;
-using LinkDotNet.Blog.Web.Pages.Admin;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services.Sitemap;
+using LinkDotNet.Blog.Web.Features.Admin.Sitemap;
+using LinkDotNet.Blog.Web.Features.Admin.Sitemap.Services;
+using LinkDotNet.Blog.Web.Features.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Pages.Admin;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Admin.Sitemap;
 
-public class SitemapTests : TestContext
+public class SitemapPageTests : TestContext
 {
     [Fact]
     public void ShouldSaveSitemap()
@@ -21,7 +21,7 @@ public void ShouldSaveSitemap()
         var sitemap = new SitemapUrlSet();
         sitemapMock.Setup(s => s.CreateSitemapAsync())
             .ReturnsAsync(sitemap);
-        var cut = RenderComponent<Sitemap>();
+        var cut = RenderComponent<SitemapPage>();
 
         cut.Find("button").Click();
 
@@ -43,7 +43,7 @@ public void ShouldDisplaySitemap()
         };
         sitemapMock.Setup(s => s.CreateSitemapAsync())
             .ReturnsAsync(sitemap);
-        var cut = RenderComponent<Sitemap>();
+        var cut = RenderComponent<SitemapPage>();
 
         cut.Find("button").Click();
 
@@ -72,7 +72,7 @@ public void ShouldShowLoadingWhenGenerating()
                 await Task.Delay(1000);
                 return sitemap;
             });
-        var cut = RenderComponent<Sitemap>();
+        var cut = RenderComponent<SitemapPage>();
 
         cut.Find("button").Click();
 
@@ -80,4 +80,4 @@ public void ShouldShowLoadingWhenGenerating()
         var btn = cut.Find("button");
         btn.Attributes.Any(a => a.Name == "disabled").Should().BeTrue();
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/AccessControlTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/AccessControlTests.cs
similarity index 93%
rename from tests/LinkDotNet.Blog.UnitTests/Web/AccessControlTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/AccessControlTests.cs
index ef046b57..fd7ae055 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/AccessControlTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/AccessControlTests.cs
@@ -2,9 +2,9 @@
 using AngleSharpWrappers;
 using Bunit;
 using Bunit.TestDoubles;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Components;
 
-namespace LinkDotNet.Blog.UnitTests.Web;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Components;
 
 public class AccessControlTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/OgDataTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
similarity index 93%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/OgDataTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
index 01effc4a..ee96eefb 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/OgDataTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
@@ -1,10 +1,10 @@
 using System.Linq;
 using AngleSharp.Html.Dom;
 using Bunit;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Components;
 using Microsoft.AspNetCore.Components.Web;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Components;
 
 public class OgDataTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/ShortBlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/ShortBlogPostTests.cs
similarity index 92%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/ShortBlogPostTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/ShortBlogPostTests.cs
index ccd08b99..a5f61d82 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/ShortBlogPostTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/ShortBlogPostTests.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using Bunit;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Components;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Components;
 
 public class ShortBlogPostTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/BlogPostNavigationTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/BlogPostNavigationTests.cs
similarity index 94%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/BlogPostNavigationTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/BlogPostNavigationTests.cs
index 32dd3f4a..ae251468 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/BlogPostNavigationTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/BlogPostNavigationTests.cs
@@ -2,10 +2,10 @@
 using AngleSharp.Html.Dom;
 using Bunit;
 using LinkDotNet.Blog.Domain;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Home.Components;
 using X.PagedList;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
 public class BlogPostNavigationTests : TestContext
 {
@@ -72,4 +72,4 @@ private static Mock<IPagedList<BlogPost>> CreatePagedList(int currentPage, int p
 
         return page;
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/FooterTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/FooterTests.cs
similarity index 87%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/FooterTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/FooterTests.cs
index b6879496..111ae0c6 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/FooterTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/FooterTests.cs
@@ -1,10 +1,10 @@
 using Bunit;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Home.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
 public class FooterTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/IntroductionCardTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/IntroductionCardTests.cs
similarity index 90%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/IntroductionCardTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/IntroductionCardTests.cs
index b411dc15..f840ba03 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/IntroductionCardTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/IntroductionCardTests.cs
@@ -2,9 +2,9 @@
 using AngleSharp.Css.Dom;
 using Bunit;
 using LinkDotNet.Blog.Domain;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Home.Components;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
 public class IntroductionCardTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/SearchInputTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SearchInputTests.cs
similarity index 93%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/SearchInputTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SearchInputTests.cs
index 1ad52bc6..57d7908c 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/SearchInputTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Home/Components/SearchInputTests.cs
@@ -1,7 +1,7 @@
 using Bunit;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.Home.Components;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Home.Components;
 
 public class SearchInputTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/SortOrderCalculatorTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/SortOrderCalculatorTests.cs
similarity index 90%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/SortOrderCalculatorTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/SortOrderCalculatorTests.cs
index 16a5e9f1..8b6dd51b 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/SortOrderCalculatorTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/SortOrderCalculatorTests.cs
@@ -1,7 +1,7 @@
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Services;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Services;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Services;
 
 public class SortOrderCalculatorTests
 {
@@ -35,4 +35,4 @@ public void ShouldProperlyCalculateNewSortOrderWhenLastItem()
 
         newSortOrder.Should().Be(1500);
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/UserRecordServiceTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs
similarity index 97%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/UserRecordServiceTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs
index 8c27703e..bf026ffc 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/UserRecordServiceTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Services/UserRecordServiceTests.cs
@@ -4,9 +4,9 @@
 using Bunit.TestDoubles;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.Infrastructure.Persistence;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Services;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared.Services;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.Services;
 
 public class UserRecordServiceTests : TestContext
 {
@@ -113,4 +113,4 @@ public async Task ShouldRemoveQueryStringIfPresent(string url, string expectedRe
         recordToDb.Should().NotBeNull();
         recordToDb.UrlClicked.Should().Be(expectedRecord);
     }
-}
+}
\ No newline at end of file
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/CommentSectionTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/CommentSectionTests.cs
similarity index 90%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/CommentSectionTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/CommentSectionTests.cs
index f9c10aee..0d6213a2 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/CommentSectionTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/CommentSectionTests.cs
@@ -1,10 +1,9 @@
 using Bunit;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
 public class CommentSectionTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/DisqusTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DisqusTests.cs
similarity index 80%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/DisqusTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DisqusTests.cs
index 26487a60..37407af2 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/DisqusTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/DisqusTests.cs
@@ -1,11 +1,10 @@
 using System.Linq;
 using Bunit;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
 public class DisqusTests : TestContext
 {
@@ -17,7 +16,7 @@ public void ShouldLoadJavascript()
             Shortname = "blog",
         };
         Services.AddScoped(_ => new AppConfiguration { DisqusConfiguration = disqusData });
-        JSInterop.SetupModule("./Shared/Disqus.razor.js");
+        JSInterop.SetupModule("./Features/ShowBlogPost/Components/Disqus.razor.js");
         JSInterop.Mode = JSRuntimeMode.Loose;
 
         RenderComponent<Disqus>();
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/GiscusTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GiscusTests.cs
similarity index 83%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/GiscusTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GiscusTests.cs
index 266f1f24..3325f3b6 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/GiscusTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/GiscusTests.cs
@@ -1,11 +1,10 @@
 using System.Linq;
 using Bunit;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
 public class GiscusTests : TestContext
 {
@@ -20,7 +19,7 @@ public void ShouldLoadJavascript()
             CategoryId = "GeneralId",
         };
         Services.AddScoped(_ => new AppConfiguration { GiscusConfiguration = giscusData });
-        JSInterop.SetupModule("./Shared/Giscus.razor.js");
+        JSInterop.SetupModule("./Features/ShowBlogPost/Components/Giscus.razor.js");
         JSInterop.Mode = JSRuntimeMode.Loose;
 
         RenderComponent<Giscus>();
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/LikeTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/LikeTests.cs
similarity index 94%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/LikeTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/LikeTests.cs
index d89118eb..6b77e443 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/LikeTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/LikeTests.cs
@@ -1,10 +1,10 @@
 using Bunit;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Services;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
 public class LikeTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/ShareBlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/ShareBlogPostTests.cs
similarity index 92%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Shared/ShareBlogPostTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/ShareBlogPostTests.cs
index 8cc7aecf..213a3075 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Shared/ShareBlogPostTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/Components/ShareBlogPostTests.cs
@@ -5,10 +5,10 @@
 using Blazored.Toast.Services;
 using Bunit;
 using Bunit.TestDoubles;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Shared;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost.Components;
 
 public class ShareBlogPostTests : TestContext
 {
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/BlogPostPageTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
similarity index 82%
rename from tests/LinkDotNet.Blog.UnitTests/Web/Pages/BlogPostPageTests.cs
rename to tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
index e551e13a..b75d7676 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/BlogPostPageTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/ShowBlogPost/ShowBlogPostPageTests.cs
@@ -6,15 +6,16 @@
 using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web;
-using LinkDotNet.Blog.Web.Pages;
-using LinkDotNet.Blog.Web.Shared;
-using LinkDotNet.Blog.Web.Shared.Services;
+using LinkDotNet.Blog.Web.Features.Components;
+using LinkDotNet.Blog.Web.Features.Services;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost;
+using LinkDotNet.Blog.Web.Features.ShowBlogPost.Components;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LinkDotNet.Blog.UnitTests.Web.Pages;
+namespace LinkDotNet.Blog.UnitTests.Web.Features.ShowBlogPost;
 
-public class BlogPostPageTests : TestContext
+public class ShowBlogPostPageTests : TestContext
 {
     [Fact]
     public void ShouldShowLoadingAnimation()
@@ -31,7 +32,7 @@ public void ShouldShowLoadingAnimation()
                 return new BlogPostBuilder().Build();
             });
 
-        var cut = RenderComponent<BlogPostPage>(
+        var cut = RenderComponent<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, blogPostId));
 
         cut.FindComponents<Loading>().Count.Should().Be(1);
@@ -53,7 +54,7 @@ public void ShouldSetTitleToTag()
         ComponentFactories.AddStub<Like>();
         ComponentFactories.AddStub<CommentSection>();
 
-        var cut = RenderComponent<BlogPostPage>(
+        var cut = RenderComponent<ShowBlogPostPage>(
             p => p.Add(s => s.BlogPostId, "1"));
 
         var pageTitleStub = cut.FindComponent<Stub<PageTitle>>();
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/LoginModelTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Pages/LoginModelTests.cs
index f3f84ced..95eb63bc 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/LoginModelTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Pages/LoginModelTests.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using LinkDotNet.Blog.Web.Authentication;
-using LinkDotNet.Blog.Web.Pages;
+using LinkDotNet.Blog.Web.Features;
 
 namespace LinkDotNet.Blog.UnitTests.Web.Pages;
 
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/LogoutModelTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Pages/LogoutModelTests.cs
index f13db451..572ac4b0 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Pages/LogoutModelTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Pages/LogoutModelTests.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using LinkDotNet.Blog.Web.Authentication;
-using LinkDotNet.Blog.Web.Pages;
+using LinkDotNet.Blog.Web.Features;
 
 namespace LinkDotNet.Blog.UnitTests.Web.Pages;