diff --git a/Source/Modules/LandingPages/Modules.LandingPages.Web.Server/Modules.LandingPages.Web.csproj b/Source/Modules/LandingPages/Modules.LandingPages.Web.Server/Modules.LandingPages.Web.csproj
index a8e626a2..979c36b2 100644
--- a/Source/Modules/LandingPages/Modules.LandingPages.Web.Server/Modules.LandingPages.Web.csproj
+++ b/Source/Modules/LandingPages/Modules.LandingPages.Web.Server/Modules.LandingPages.Web.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazored.Modal" Version="7.1.0" />
+    <PackageReference Include="Blazored.Modal" Version="7.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
   </ItemGroup>
 
diff --git a/Source/Modules/Subscriptions/Features/Aggregates/StripeCustomerAggregate/Queries/GetStripeCustomerByStripePortalId.cs b/Source/Modules/Subscriptions/Features/Aggregates/StripeCustomerAggregate/Application/Queries/GetStripeCustomerByStripePortalId.cs
similarity index 97%
rename from Source/Modules/Subscriptions/Features/Aggregates/StripeCustomerAggregate/Queries/GetStripeCustomerByStripePortalId.cs
rename to Source/Modules/Subscriptions/Features/Aggregates/StripeCustomerAggregate/Application/Queries/GetStripeCustomerByStripePortalId.cs
index ddbf3caa..5a6b1bc9 100644
--- a/Source/Modules/Subscriptions/Features/Aggregates/StripeCustomerAggregate/Queries/GetStripeCustomerByStripePortalId.cs
+++ b/Source/Modules/Subscriptions/Features/Aggregates/StripeCustomerAggregate/Application/Queries/GetStripeCustomerByStripePortalId.cs
@@ -3,7 +3,7 @@
 using Modules.Subscriptions.Features.Agregates.StripeCustomerAggregate;
 using Shared.Features.CQRS.Query;
 
-namespace Modules.Subscriptions.Features.Aggregates.StripeCustomerAggregate.Queries
+namespace Modules.Subscriptions.Features.Aggregates.StripeCustomerAggregate.Application.Queries
 {
     public class GetStripeCustomerByStripePortalId : IQuery<StripeCustomer>
     {
diff --git a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/CreateSubscriptionForTenant.cs b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/CreateSubscriptionForTenant.cs
similarity index 68%
rename from Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/CreateSubscriptionForTenant.cs
rename to Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/CreateSubscriptionForTenant.cs
index d15eb4c8..e6397505 100644
--- a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/CreateSubscriptionForTenant.cs
+++ b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/CreateSubscriptionForTenant.cs
@@ -1,6 +1,6 @@
 using Shared.Features.CQRS.Command;
 
-namespace Modules.Subscriptions.Features.Domain.StripeSubscriptionAggregate.Commands
+namespace Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Application.Commands
 {
     public class CreateSubscriptionForTenant : ICommand
     {
diff --git a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/CreateTrialingSubscription.cs b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/CreateTrialingSubscription.cs
similarity index 98%
rename from Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/CreateTrialingSubscription.cs
rename to Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/CreateTrialingSubscription.cs
index 2d5350ff..7f6396df 100644
--- a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/CreateTrialingSubscription.cs
+++ b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/CreateTrialingSubscription.cs
@@ -7,7 +7,7 @@
 using Shared.Features.CQRS.IntegrationEvent;
 using Stripe;
 
-namespace Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Commands
+namespace Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Application.Commands
 {
     public class CreateTrialingSubscription : ICommand
     {
diff --git a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/DeleteSubscription.cs b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/DeleteSubscription.cs
similarity index 62%
rename from Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/DeleteSubscription.cs
rename to Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/DeleteSubscription.cs
index aac6f7ce..73486b9d 100644
--- a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/DeleteSubscription.cs
+++ b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/DeleteSubscription.cs
@@ -1,6 +1,6 @@
 using Shared.Features.CQRS.Command;
 
-namespace Modules.Subscriptions.Features.Domain.StripeSubscriptionAggregate.Commands
+namespace Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Application.Commands
 {
     public class DeleteSubscription : ICommand
     {
diff --git a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/GetSubscriptionForTenant.cs b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/GetSubscriptionForTenant.cs
similarity index 90%
rename from Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/GetSubscriptionForTenant.cs
rename to Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/GetSubscriptionForTenant.cs
index b939bc1c..a69bbc55 100644
--- a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/GetSubscriptionForTenant.cs
+++ b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/GetSubscriptionForTenant.cs
@@ -1,7 +1,7 @@
 using Shared.Features.CQRS.Query;
 using Shared.Kernel.BuildingBlocks.Auth.Attributes;
 
-namespace Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Commands
+namespace Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Application.Commands
 {
     [AuthorizeTenantAdmin]
     public class GetSubscriptionForTenant : IQuery<object>
diff --git a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/UpdateSubscriptionEndDate.cs b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/UpdateSubscriptionEndDate.cs
similarity index 63%
rename from Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/UpdateSubscriptionEndDate.cs
rename to Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/UpdateSubscriptionEndDate.cs
index f9816ffa..4d16f267 100644
--- a/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Commands/UpdateSubscriptionEndDate.cs
+++ b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Application/Commands/UpdateSubscriptionEndDate.cs
@@ -1,6 +1,6 @@
 using Shared.Features.CQRS.Command;
 
-namespace Modules.Subscriptions.Features.Domain.StripeSubscriptionAggregate.Commands
+namespace Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Application.Commands
 {
     public class UpdateSubscriptionEndDate : ICommand
     {
diff --git a/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/StripeSubscriptionConfiguration.cs b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Infrastructure/StripeSubscriptionEFConfiguration.cs
similarity index 59%
rename from Source/Modules/Subscriptions/Features/Infrastructure/EFCore/StripeSubscriptionConfiguration.cs
rename to Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Infrastructure/StripeSubscriptionEFConfiguration.cs
index f810b5d3..c84d3623 100644
--- a/Source/Modules/Subscriptions/Features/Infrastructure/EFCore/StripeSubscriptionConfiguration.cs
+++ b/Source/Modules/Subscriptions/Features/Aggregates/StripeSubscriptionAggregate/Infrastructure/StripeSubscriptionEFConfiguration.cs
@@ -2,13 +2,13 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Modules.Subscriptions.Features.Agregates.StripeSubscriptionAggregate;
 
-namespace Modules.Subscription.Features.Infrastructure.EFCore
+namespace Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Infrastructure
 {
-    public class StripeSubscriptionConfiguration : IEntityTypeConfiguration<StripeSubscription>
+    public class StripeSubscriptionEFConfiguration : IEntityTypeConfiguration<StripeSubscription>
     {
         public void Configure(EntityTypeBuilder<StripeSubscription> builder)
         {
-            
+
         }
     }
 }
diff --git a/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSubscriptionsController.cs b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSubscriptionsController.cs
index b96fca56..fcf17445 100644
--- a/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSubscriptionsController.cs
+++ b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSubscriptionsController.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Commands;
+using Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Application.Commands;
 using Shared.Features.Server;
 using Shared.Kernel.BuildingBlocks.Auth.Attributes;
 
diff --git a/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSuccessController.cs b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSuccessController.cs
index 0eb85587..2021c74d 100644
--- a/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSuccessController.cs
+++ b/Source/Modules/Subscriptions/Web/Server/Controllers/StripeSuccessController.cs
@@ -2,9 +2,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Shared.Kernel.BuildingBlocks.Auth;
 using Stripe.Checkout;
-using Modules.Subscriptions.Features.Aggregates.StripeCustomerAggregate.Queries;
 using Modules.Subscriptions.Features.Agregates.StripeCustomerAggregate;
 using Shared.Features.Server;
+using Modules.Subscriptions.Features.Aggregates.StripeCustomerAggregate.Application.Queries;
 
 namespace Modules.Subscription.Server.Controllers
 {
diff --git a/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs b/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs
index 3602f5fb..52544169 100644
--- a/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs
+++ b/Source/Modules/Subscriptions/Web/Server/WebHooks/StripeWebhook.cs
@@ -3,7 +3,7 @@
 using Stripe;
 using Shared.Features.Server;
 using Modules.Subscription.Features.Infrastructure.Configuration;
-using Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Commands;
+using Modules.Subscriptions.Features.Aggregates.StripeSubscriptionAggregate.Application.Commands;
 
 namespace Modules.Subscription.Server.WebHooks
 {
diff --git a/Source/Web/Server/Pages/LandingPageApp.razor b/Source/Web/Server/Pages/LandingPageApp.razor
deleted file mode 100644
index 3528ccc4..00000000
--- a/Source/Web/Server/Pages/LandingPageApp.razor
+++ /dev/null
@@ -1,19 +0,0 @@
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Routing;
-@using Modules.LandingPages.Web.Server;
-@using Modules.LandingPages.Web.Server.Pages;
-@using Blazored.Modal;
-
-<CascadingBlazoredModal>
-    <Router AppAssembly="@typeof(LandingPage).Assembly">
-        <Found Context="routeData">
-            <RouteView RouteData="@routeData" DefaultLayout="@typeof(LandingPageLayout)" />
-        </Found>
-        <NotFound>
-            <PageTitle>Not found</PageTitle>
-            <LayoutView Layout="@typeof(LandingPageLayout)">
-                <p role="alert">Sorry, there's nothing at this address.</p>
-            </LayoutView>
-        </NotFound>
-    </Router>
-</CascadingBlazoredModal>
diff --git a/Source/Web/Server/Pages/_Host.cshtml b/Source/Web/Server/Pages/_Host.cshtml
index e6be39de..038c139d 100644
--- a/Source/Web/Server/Pages/_Host.cshtml
+++ b/Source/Web/Server/Pages/_Host.cshtml
@@ -9,6 +9,8 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"] ModularMonolith</title>
+    <link rel="stylesheet" href="css/site.css" />
+    <link rel="stylesheet" href="css/fonts.css" />
     <link rel="stylesheet" href=@($"{TailwindSourceConstant.TailwindOutputPath}") />
 </head>
 <body class="h-screen bg-gradient-to-b from-blue-50 to-blue-200">
@@ -19,6 +21,7 @@
     }
     else
     {
+        <link rel="stylesheet" href="Web.Server.styles.css" />
         <component type="typeof(LandingPagesApp)" render-mode="Server" />
         <script src="_framework/blazor.server.js"></script>
     }