diff --git a/Moonlight/App/Database/Entities/Store/ServiceShare.cs b/Moonlight/App/Database/Entities/Store/ServiceShare.cs
deleted file mode 100644
index 4cbcca2..0000000
--- a/Moonlight/App/Database/Entities/Store/ServiceShare.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Moonlight.App.Database.Entities.Store;
-
-public class ServiceShare
-{
-    public int Id { get; set; }
-    public User User { get; set; }
-}
\ No newline at end of file
diff --git a/Moonlight/App/Models/Abstractions/Services/ServiceActions.cs b/Moonlight/App/Models/Abstractions/Services/ServiceActions.cs
deleted file mode 100644
index dfc010e..0000000
--- a/Moonlight/App/Models/Abstractions/Services/ServiceActions.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Moonlight.App.Models.Abstractions.Services;
-
-public abstract class ServiceActions
-{
-    public abstract Task Create(IServiceProvider provider, Database.Entities.Store.Service service);
-    public abstract Task Update(IServiceProvider provider, Database.Entities.Store.Service service);
-    public abstract Task Delete(IServiceProvider provider, Database.Entities.Store.Service service);
-}
\ No newline at end of file
diff --git a/Moonlight/BlazorApp.razor b/Moonlight/BlazorApp.razor
index 5830296..abf100d 100644
--- a/Moonlight/BlazorApp.razor
+++ b/Moonlight/BlazorApp.razor
@@ -1,4 +1,4 @@
-@using Moonlight.Shared.Layouts
+@using Moonlight.Core.UI.Layouts
 
 <Router AppAssembly="@typeof(BlazorApp).Assembly">
     <Found Context="routeData">
diff --git a/Moonlight/App/Actions/Dummy/DummyActions.cs b/Moonlight/Core/Actions/Dummy/DummyActions.cs
similarity index 70%
rename from Moonlight/App/Actions/Dummy/DummyActions.cs
rename to Moonlight/Core/Actions/Dummy/DummyActions.cs
index ba00b19..4f11be2 100644
--- a/Moonlight/App/Actions/Dummy/DummyActions.cs
+++ b/Moonlight/Core/Actions/Dummy/DummyActions.cs
@@ -1,8 +1,7 @@
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Models.Abstractions;
-using Moonlight.App.Models.Abstractions.Services;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 
-namespace Moonlight.App.Actions.Dummy;
+namespace Moonlight.Core.Actions.Dummy;
 
 public class DummyActions : ServiceActions
 {
diff --git a/Moonlight/App/Actions/Dummy/DummyConfig.cs b/Moonlight/Core/Actions/Dummy/DummyConfig.cs
similarity index 84%
rename from Moonlight/App/Actions/Dummy/DummyConfig.cs
rename to Moonlight/Core/Actions/Dummy/DummyConfig.cs
index 6076d0b..f9d7bfa 100644
--- a/Moonlight/App/Actions/Dummy/DummyConfig.cs
+++ b/Moonlight/Core/Actions/Dummy/DummyConfig.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Moonlight.App.Actions.Dummy;
+namespace Moonlight.Core.Actions.Dummy;
 
 public class DummyConfig
 {
diff --git a/Moonlight/App/Actions/Dummy/DummyServiceDefinition.cs b/Moonlight/Core/Actions/Dummy/DummyServiceDefinition.cs
similarity index 72%
rename from Moonlight/App/Actions/Dummy/DummyServiceDefinition.cs
rename to Moonlight/Core/Actions/Dummy/DummyServiceDefinition.cs
index 1d386a1..72f0c84 100644
--- a/Moonlight/App/Actions/Dummy/DummyServiceDefinition.cs
+++ b/Moonlight/Core/Actions/Dummy/DummyServiceDefinition.cs
@@ -1,9 +1,9 @@
-using Moonlight.App.Actions.Dummy.Layouts;
-using Moonlight.App.Actions.Dummy.Pages;
-using Moonlight.App.Helpers;
-using Moonlight.App.Models.Abstractions.Services;
+using Moonlight.Core.Actions.Dummy.Layouts;
+using Moonlight.Core.Actions.Dummy.Pages;
+using Moonlight.Core.Helpers;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 
-namespace Moonlight.App.Actions.Dummy;
+namespace Moonlight.Core.Actions.Dummy;
 
 public class DummyServiceDefinition : ServiceDefinition
 {
diff --git a/Moonlight/App/Actions/Dummy/Layouts/DummyAdmin.razor b/Moonlight/Core/Actions/Dummy/Layouts/DummyAdmin.razor
similarity index 100%
rename from Moonlight/App/Actions/Dummy/Layouts/DummyAdmin.razor
rename to Moonlight/Core/Actions/Dummy/Layouts/DummyAdmin.razor
diff --git a/Moonlight/App/Actions/Dummy/Layouts/DummyUser.razor b/Moonlight/Core/Actions/Dummy/Layouts/DummyUser.razor
similarity index 100%
rename from Moonlight/App/Actions/Dummy/Layouts/DummyUser.razor
rename to Moonlight/Core/Actions/Dummy/Layouts/DummyUser.razor
diff --git a/Moonlight/App/Actions/Dummy/Pages/DummyPage.razor b/Moonlight/Core/Actions/Dummy/Pages/DummyPage.razor
similarity index 100%
rename from Moonlight/App/Actions/Dummy/Pages/DummyPage.razor
rename to Moonlight/Core/Actions/Dummy/Pages/DummyPage.razor
diff --git a/Moonlight/App/Configuration/ConfigV1.cs b/Moonlight/Core/Configuration/ConfigV1.cs
similarity index 81%
rename from Moonlight/App/Configuration/ConfigV1.cs
rename to Moonlight/Core/Configuration/ConfigV1.cs
index 62aab2e..251f5f8 100644
--- a/Moonlight/App/Configuration/ConfigV1.cs
+++ b/Moonlight/Core/Configuration/ConfigV1.cs
@@ -1,8 +1,11 @@
 using System.ComponentModel;
-using Moonlight.App.Helpers;
+using Moonlight.Core.Helpers;
+using Moonlight.Features.Advertisement.Configuration;
+using Moonlight.Features.StoreSystem.Configuration;
+using Moonlight.Features.Theming.Configuration;
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Configuration;
+namespace Moonlight.Core.Configuration;
 
 public class ConfigV1
 {
@@ -19,24 +22,6 @@ public class ConfigV1
     [JsonProperty("Theme")] public ThemeData Theme { get; set; } = new();
     [JsonProperty("Advertisement")] public AdvertisementData Advertisement { get; set; } = new();
     
-    public class AdvertisementData
-    {
-        [JsonProperty("PreventAdBlockers")]
-        [Description("This prevents users from using ad blockers while using moonlight. (Note: The detection might not always work)")]
-        public bool PreventAdBlockers { get; set; }
-    }
-    public class ThemeData
-    {
-        [JsonProperty("EnableDefault")] public bool EnableDefault { get; set; } = true;
-    }
-    
-    public class StoreData
-    {
-        [JsonProperty("Currency")]
-        [Description("A string value representing the currency which will be shown to a user")]
-        public string Currency { get; set; } = "€";
-    }
-    
     public class SecurityData
     {
         [JsonProperty("Token")]
diff --git a/Moonlight/App/Database/DataContext.cs b/Moonlight/Core/Database/DataContext.cs
similarity index 85%
rename from Moonlight/App/Database/DataContext.cs
rename to Moonlight/Core/Database/DataContext.cs
index de9bf50..6667857 100644
--- a/Moonlight/App/Database/DataContext.cs
+++ b/Moonlight/Core/Database/DataContext.cs
@@ -1,11 +1,13 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Community;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Entities.Tickets;
-using Moonlight.App.Services;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Services;
+using Moonlight.Features.Community.Entities;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.StoreSystem.Entities;
+using Moonlight.Features.Theming.Entities;
+using Moonlight.Features.Ticketing.Entities;
 
-namespace Moonlight.App.Database;
+namespace Moonlight.Core.Database;
 
 public class DataContext : DbContext
 {
diff --git a/Moonlight/App/Database/Entities/User.cs b/Moonlight/Core/Database/Entities/User.cs
similarity index 89%
rename from Moonlight/App/Database/Entities/User.cs
rename to Moonlight/Core/Database/Entities/User.cs
index 78bedeb..1c83022 100644
--- a/Moonlight/App/Database/Entities/User.cs
+++ b/Moonlight/Core/Database/Entities/User.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Database.Entities.Store;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Database.Entities;
+namespace Moonlight.Core.Database.Entities;
 
 public class User
 {
diff --git a/Moonlight/App/Database/Migrations/20231013200303_AddedUser.Designer.cs b/Moonlight/Core/Database/Migrations/20231013200303_AddedUser.Designer.cs
similarity index 91%
rename from Moonlight/App/Database/Migrations/20231013200303_AddedUser.Designer.cs
rename to Moonlight/Core/Database/Migrations/20231013200303_AddedUser.Designer.cs
index 00811bc..7eed2ec 100644
--- a/Moonlight/App/Database/Migrations/20231013200303_AddedUser.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20231013200303_AddedUser.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20231013200303_AddedUser")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
diff --git a/Moonlight/App/Database/Migrations/20231013200303_AddedUser.cs b/Moonlight/Core/Database/Migrations/20231013200303_AddedUser.cs
similarity index 97%
rename from Moonlight/App/Database/Migrations/20231013200303_AddedUser.cs
rename to Moonlight/Core/Database/Migrations/20231013200303_AddedUser.cs
index ef03bad..a187145 100644
--- a/Moonlight/App/Database/Migrations/20231013200303_AddedUser.cs
+++ b/Moonlight/Core/Database/Migrations/20231013200303_AddedUser.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddedUser : Migration
diff --git a/Moonlight/App/Database/Migrations/20231017075519_AddStoreModels.Designer.cs b/Moonlight/Core/Database/Migrations/20231017075519_AddStoreModels.Designer.cs
similarity index 82%
rename from Moonlight/App/Database/Migrations/20231017075519_AddStoreModels.Designer.cs
rename to Moonlight/Core/Database/Migrations/20231017075519_AddStoreModels.Designer.cs
index cd17712..3c90fdb 100644
--- a/Moonlight/App/Database/Migrations/20231017075519_AddStoreModels.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20231017075519_AddStoreModels.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20231017075519_AddStoreModels")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -43,7 +44,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -64,7 +65,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -80,7 +81,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -101,7 +102,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -117,7 +118,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -167,7 +168,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -203,7 +204,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -224,7 +225,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -266,9 +267,9 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -277,9 +278,9 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -288,24 +289,24 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId");
 
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -316,13 +317,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -331,7 +332,7 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
diff --git a/Moonlight/App/Database/Migrations/20231017075519_AddStoreModels.cs b/Moonlight/Core/Database/Migrations/20231017075519_AddStoreModels.cs
similarity index 99%
rename from Moonlight/App/Database/Migrations/20231017075519_AddStoreModels.cs
rename to Moonlight/Core/Database/Migrations/20231017075519_AddStoreModels.cs
index 41b821e..dcaefe9 100644
--- a/Moonlight/App/Database/Migrations/20231017075519_AddStoreModels.cs
+++ b/Moonlight/Core/Database/Migrations/20231017075519_AddStoreModels.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddStoreModels : Migration
diff --git a/Moonlight/App/Database/Migrations/20231018203522_AddedUserStoreData.Designer.cs b/Moonlight/Core/Database/Migrations/20231018203522_AddedUserStoreData.Designer.cs
similarity index 81%
rename from Moonlight/App/Database/Migrations/20231018203522_AddedUserStoreData.Designer.cs
rename to Moonlight/Core/Database/Migrations/20231018203522_AddedUserStoreData.Designer.cs
index b584d5f..4249659 100644
--- a/Moonlight/App/Database/Migrations/20231018203522_AddedUserStoreData.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20231018203522_AddedUserStoreData.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20231018203522_AddedUserStoreData")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -43,7 +44,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -64,7 +65,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -85,7 +86,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -106,7 +107,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -127,7 +128,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -177,7 +178,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -213,7 +214,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -234,7 +235,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -279,39 +280,39 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("CouponUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("GiftCodeUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -320,15 +321,15 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -339,13 +340,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -354,12 +355,12 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Navigation("CouponUses");
 
diff --git a/Moonlight/App/Database/Migrations/20231018203522_AddedUserStoreData.cs b/Moonlight/Core/Database/Migrations/20231018203522_AddedUserStoreData.cs
similarity index 98%
rename from Moonlight/App/Database/Migrations/20231018203522_AddedUserStoreData.cs
rename to Moonlight/Core/Database/Migrations/20231018203522_AddedUserStoreData.cs
index 13c6ea2..a22bb9e 100644
--- a/Moonlight/App/Database/Migrations/20231018203522_AddedUserStoreData.cs
+++ b/Moonlight/Core/Database/Migrations/20231018203522_AddedUserStoreData.cs
@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddedUserStoreData : Migration
diff --git a/Moonlight/App/Database/Migrations/20231018204737_AddedTransactions.Designer.cs b/Moonlight/Core/Database/Migrations/20231018204737_AddedTransactions.Designer.cs
similarity index 81%
rename from Moonlight/App/Database/Migrations/20231018204737_AddedTransactions.Designer.cs
rename to Moonlight/Core/Database/Migrations/20231018204737_AddedTransactions.Designer.cs
index 4a54145..caabb9e 100644
--- a/Moonlight/App/Database/Migrations/20231018204737_AddedTransactions.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20231018204737_AddedTransactions.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20231018204737_AddedTransactions")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -43,7 +44,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -64,7 +65,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -85,7 +86,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -106,7 +107,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -127,7 +128,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -177,7 +178,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -213,7 +214,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -234,7 +235,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -257,7 +258,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Transaction");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -302,39 +303,39 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("CouponUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("GiftCodeUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -343,15 +344,15 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -362,13 +363,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -377,19 +378,19 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("Transactions")
                         .HasForeignKey("UserId");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Navigation("CouponUses");
 
diff --git a/Moonlight/App/Database/Migrations/20231018204737_AddedTransactions.cs b/Moonlight/Core/Database/Migrations/20231018204737_AddedTransactions.cs
similarity index 97%
rename from Moonlight/App/Database/Migrations/20231018204737_AddedTransactions.cs
rename to Moonlight/Core/Database/Migrations/20231018204737_AddedTransactions.cs
index b8581b5..72a6a61 100644
--- a/Moonlight/App/Database/Migrations/20231018204737_AddedTransactions.cs
+++ b/Moonlight/Core/Database/Migrations/20231018204737_AddedTransactions.cs
@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddedTransactions : Migration
diff --git a/Moonlight/App/Database/Migrations/20231027105412_AddPostsModels.Designer.cs b/Moonlight/Core/Database/Migrations/20231027105412_AddPostsModels.Designer.cs
similarity index 80%
rename from Moonlight/App/Database/Migrations/20231027105412_AddPostsModels.Designer.cs
rename to Moonlight/Core/Database/Migrations/20231027105412_AddPostsModels.Designer.cs
index b1a2f6e..7b500b5 100644
--- a/Moonlight/App/Database/Migrations/20231027105412_AddPostsModels.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20231027105412_AddPostsModels.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20231027105412_AddPostsModels")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -53,7 +54,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Posts");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -84,7 +85,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostComments");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -108,7 +109,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostLikes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -131,7 +132,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -152,7 +153,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -173,7 +174,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -194,7 +195,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -215,7 +216,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -265,7 +266,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -301,7 +302,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -322,7 +323,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -345,7 +346,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Transaction");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -390,9 +391,9 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -401,28 +402,28 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Comments")
                         .HasForeignKey("PostId");
 
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Likes")
                         .HasForeignKey("PostId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -431,39 +432,39 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("CouponUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("GiftCodeUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -472,15 +473,15 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -491,13 +492,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -506,26 +507,26 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("Transactions")
                         .HasForeignKey("UserId");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Navigation("Comments");
 
                     b.Navigation("Likes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Navigation("CouponUses");
 
diff --git a/Moonlight/App/Database/Migrations/20231027105412_AddPostsModels.cs b/Moonlight/Core/Database/Migrations/20231027105412_AddPostsModels.cs
similarity index 99%
rename from Moonlight/App/Database/Migrations/20231027105412_AddPostsModels.cs
rename to Moonlight/Core/Database/Migrations/20231027105412_AddPostsModels.cs
index 7910ab2..9083ba8 100644
--- a/Moonlight/App/Database/Migrations/20231027105412_AddPostsModels.cs
+++ b/Moonlight/Core/Database/Migrations/20231027105412_AddPostsModels.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddPostsModels : Migration
diff --git a/Moonlight/App/Database/Migrations/20231028214520_AddedWordFilter.Designer.cs b/Moonlight/Core/Database/Migrations/20231028214520_AddedWordFilter.Designer.cs
similarity index 80%
rename from Moonlight/App/Database/Migrations/20231028214520_AddedWordFilter.Designer.cs
rename to Moonlight/Core/Database/Migrations/20231028214520_AddedWordFilter.Designer.cs
index 7f0deef..5492762 100644
--- a/Moonlight/App/Database/Migrations/20231028214520_AddedWordFilter.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20231028214520_AddedWordFilter.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20231028214520_AddedWordFilter")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -53,7 +54,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Posts");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -84,7 +85,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostComments");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -108,7 +109,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostLikes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.WordFilter", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.WordFilter", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -123,7 +124,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("WordFilters");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -146,7 +147,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -167,7 +168,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -188,7 +189,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -209,7 +210,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -230,7 +231,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -280,7 +281,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -316,7 +317,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -337,7 +338,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -360,7 +361,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Transaction");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -405,9 +406,9 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -416,28 +417,28 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Comments")
                         .HasForeignKey("PostId");
 
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Likes")
                         .HasForeignKey("PostId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -446,39 +447,39 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("CouponUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("GiftCodeUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -487,15 +488,15 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -506,13 +507,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -521,26 +522,26 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("Transactions")
                         .HasForeignKey("UserId");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Navigation("Comments");
 
                     b.Navigation("Likes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Navigation("CouponUses");
 
diff --git a/Moonlight/App/Database/Migrations/20231028214520_AddedWordFilter.cs b/Moonlight/Core/Database/Migrations/20231028214520_AddedWordFilter.cs
similarity index 95%
rename from Moonlight/App/Database/Migrations/20231028214520_AddedWordFilter.cs
rename to Moonlight/Core/Database/Migrations/20231028214520_AddedWordFilter.cs
index 4ff13e1..a43b859 100644
--- a/Moonlight/App/Database/Migrations/20231028214520_AddedWordFilter.cs
+++ b/Moonlight/Core/Database/Migrations/20231028214520_AddedWordFilter.cs
@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddedWordFilter : Migration
diff --git a/Moonlight/App/Database/Migrations/20231101161843_AddedTicketModels.Designer.cs b/Moonlight/Core/Database/Migrations/20231101161843_AddedTicketModels.Designer.cs
similarity index 80%
rename from Moonlight/App/Database/Migrations/20231101161843_AddedTicketModels.Designer.cs
rename to Moonlight/Core/Database/Migrations/20231101161843_AddedTicketModels.Designer.cs
index 1419a13..9772bff 100644
--- a/Moonlight/App/Database/Migrations/20231101161843_AddedTicketModels.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20231101161843_AddedTicketModels.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20231101161843_AddedTicketModels")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -53,7 +54,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Posts");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -84,7 +85,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostComments");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -108,7 +109,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostLikes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.WordFilter", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.WordFilter", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -123,7 +124,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("WordFilters");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -146,7 +147,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -167,7 +168,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -188,7 +189,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -209,7 +210,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -230,7 +231,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -280,7 +281,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -316,7 +317,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -337,7 +338,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -360,7 +361,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Transaction");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -402,7 +403,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Tickets");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.TicketMessage", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.TicketMessage", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -436,7 +437,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("TicketMessages");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -481,9 +482,9 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -492,28 +493,28 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Comments")
                         .HasForeignKey("PostId");
 
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Likes")
                         .HasForeignKey("PostId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -522,39 +523,39 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("CouponUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("GiftCodeUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -563,15 +564,15 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -582,13 +583,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -597,22 +598,22 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("Transactions")
                         .HasForeignKey("UserId");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Creator")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Creator")
                         .WithMany()
                         .HasForeignKey("CreatorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", "Service")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", "Service")
                         .WithMany()
                         .HasForeignKey("ServiceId");
 
@@ -621,37 +622,37 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Service");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.TicketMessage", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.TicketMessage", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Sender")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Sender")
                         .WithMany()
                         .HasForeignKey("SenderId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.Tickets.Ticket", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Tickets.Ticket", null)
                         .WithMany("Messages")
                         .HasForeignKey("TicketId");
 
                     b.Navigation("Sender");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Navigation("Comments");
 
                     b.Navigation("Likes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
                     b.Navigation("Messages");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Navigation("CouponUses");
 
diff --git a/Moonlight/App/Database/Migrations/20231101161843_AddedTicketModels.cs b/Moonlight/Core/Database/Migrations/20231101161843_AddedTicketModels.cs
similarity index 98%
rename from Moonlight/App/Database/Migrations/20231101161843_AddedTicketModels.cs
rename to Moonlight/Core/Database/Migrations/20231101161843_AddedTicketModels.cs
index f76fc0d..ac2ad43 100644
--- a/Moonlight/App/Database/Migrations/20231101161843_AddedTicketModels.cs
+++ b/Moonlight/Core/Database/Migrations/20231101161843_AddedTicketModels.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddedTicketModels : Migration
diff --git a/Moonlight/App/Database/Migrations/20231222100225_AddThemeModel.Designer.cs b/Moonlight/Core/Database/Migrations/20231222100225_AddThemeModel.Designer.cs
similarity index 80%
rename from Moonlight/App/Database/Migrations/20231222100225_AddThemeModel.Designer.cs
rename to Moonlight/Core/Database/Migrations/20231222100225_AddThemeModel.Designer.cs
index 33208aa..4a8c9da 100644
--- a/Moonlight/App/Database/Migrations/20231222100225_AddThemeModel.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20231222100225_AddThemeModel.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20231222100225_AddThemeModel")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -53,7 +54,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Posts");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -84,7 +85,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostComments");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -108,7 +109,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostLikes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.WordFilter", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.WordFilter", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -123,7 +124,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("WordFilters");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -146,7 +147,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -167,7 +168,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -188,7 +189,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -209,7 +210,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -230,7 +231,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -280,7 +281,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -316,7 +317,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -337,7 +338,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -360,7 +361,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Transaction");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Theme", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Theme", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -392,7 +393,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Themes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -434,7 +435,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Tickets");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.TicketMessage", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.TicketMessage", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -468,7 +469,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("TicketMessages");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -513,9 +514,9 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -524,28 +525,28 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Comments")
                         .HasForeignKey("PostId");
 
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Likes")
                         .HasForeignKey("PostId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -554,39 +555,39 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("CouponUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("GiftCodeUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -595,15 +596,15 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -614,13 +615,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -629,22 +630,22 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("Transactions")
                         .HasForeignKey("UserId");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Creator")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Creator")
                         .WithMany()
                         .HasForeignKey("CreatorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", "Service")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", "Service")
                         .WithMany()
                         .HasForeignKey("ServiceId");
 
@@ -653,37 +654,37 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Service");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.TicketMessage", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.TicketMessage", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Sender")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Sender")
                         .WithMany()
                         .HasForeignKey("SenderId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.Tickets.Ticket", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Tickets.Ticket", null)
                         .WithMany("Messages")
                         .HasForeignKey("TicketId");
 
                     b.Navigation("Sender");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Navigation("Comments");
 
                     b.Navigation("Likes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
                     b.Navigation("Messages");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Navigation("CouponUses");
 
diff --git a/Moonlight/App/Database/Migrations/20231222100225_AddThemeModel.cs b/Moonlight/Core/Database/Migrations/20231222100225_AddThemeModel.cs
similarity index 96%
rename from Moonlight/App/Database/Migrations/20231222100225_AddThemeModel.cs
rename to Moonlight/Core/Database/Migrations/20231222100225_AddThemeModel.cs
index 9aadbbb..aa5fb5d 100644
--- a/Moonlight/App/Database/Migrations/20231222100225_AddThemeModel.cs
+++ b/Moonlight/Core/Database/Migrations/20231222100225_AddThemeModel.cs
@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddThemeModel : Migration
diff --git a/Moonlight/App/Database/Migrations/20240119090835_AddedTransactionDate.Designer.cs b/Moonlight/Core/Database/Migrations/20240119090835_AddedTransactionDate.Designer.cs
similarity index 80%
rename from Moonlight/App/Database/Migrations/20240119090835_AddedTransactionDate.Designer.cs
rename to Moonlight/Core/Database/Migrations/20240119090835_AddedTransactionDate.Designer.cs
index e25d18d..40b8d57 100644
--- a/Moonlight/App/Database/Migrations/20240119090835_AddedTransactionDate.Designer.cs
+++ b/Moonlight/Core/Database/Migrations/20240119090835_AddedTransactionDate.Designer.cs
@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     [Migration("20240119090835_AddedTransactionDate")]
@@ -20,7 +21,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -53,7 +54,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Posts");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -84,7 +85,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostComments");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -108,7 +109,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostLikes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.WordFilter", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.WordFilter", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -123,7 +124,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("WordFilters");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -146,7 +147,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -167,7 +168,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -188,7 +189,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -209,7 +210,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -230,7 +231,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -280,7 +281,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -316,7 +317,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -337,7 +338,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -363,7 +364,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Transaction");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Theme", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Theme", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -395,7 +396,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Themes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -437,7 +438,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Tickets");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.TicketMessage", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.TicketMessage", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -471,7 +472,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("TicketMessages");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -516,9 +517,9 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -527,28 +528,28 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Comments")
                         .HasForeignKey("PostId");
 
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Likes")
                         .HasForeignKey("PostId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -557,39 +558,39 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("CouponUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("GiftCodeUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -598,15 +599,15 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -617,13 +618,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -632,22 +633,22 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("Transactions")
                         .HasForeignKey("UserId");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Creator")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Creator")
                         .WithMany()
                         .HasForeignKey("CreatorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", "Service")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", "Service")
                         .WithMany()
                         .HasForeignKey("ServiceId");
 
@@ -656,37 +657,37 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Service");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.TicketMessage", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.TicketMessage", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Sender")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Sender")
                         .WithMany()
                         .HasForeignKey("SenderId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.Tickets.Ticket", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Tickets.Ticket", null)
                         .WithMany("Messages")
                         .HasForeignKey("TicketId");
 
                     b.Navigation("Sender");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Navigation("Comments");
 
                     b.Navigation("Likes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
                     b.Navigation("Messages");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Navigation("CouponUses");
 
diff --git a/Moonlight/App/Database/Migrations/20240119090835_AddedTransactionDate.cs b/Moonlight/Core/Database/Migrations/20240119090835_AddedTransactionDate.cs
similarity index 94%
rename from Moonlight/App/Database/Migrations/20240119090835_AddedTransactionDate.cs
rename to Moonlight/Core/Database/Migrations/20240119090835_AddedTransactionDate.cs
index bb3d3e9..806e2ec 100644
--- a/Moonlight/App/Database/Migrations/20240119090835_AddedTransactionDate.cs
+++ b/Moonlight/Core/Database/Migrations/20240119090835_AddedTransactionDate.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     /// <inheritdoc />
     public partial class AddedTransactionDate : Migration
diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/Core/Database/Migrations/DataContextModelSnapshot.cs
similarity index 80%
rename from Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs
rename to Moonlight/Core/Database/Migrations/DataContextModelSnapshot.cs
index debff26..0e1f2dc 100644
--- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs
+++ b/Moonlight/Core/Database/Migrations/DataContextModelSnapshot.cs
@@ -3,11 +3,12 @@ using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
+using Moonlight.Core.Database;
 
 #nullable disable
 
-namespace Moonlight.App.Database.Migrations
+namespace Moonlight.Core.Database.Migrations
 {
     [DbContext(typeof(DataContext))]
     partial class DataContextModelSnapshot : ModelSnapshot
@@ -17,7 +18,7 @@ namespace Moonlight.App.Database.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -50,7 +51,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Posts");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -81,7 +82,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostComments");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -105,7 +106,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("PostLikes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.WordFilter", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.WordFilter", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -120,7 +121,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("WordFilters");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Category", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Category", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -143,7 +144,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Categories");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Coupon", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Coupon", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -164,7 +165,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Coupons");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -185,7 +186,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("CouponUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCode", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCode", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -206,7 +207,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -227,7 +228,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("GiftCodeUses");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -277,7 +278,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Products");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -313,7 +314,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Services");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -334,7 +335,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("ServiceShares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -360,7 +361,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Transaction");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Theme", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Theme", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -392,7 +393,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Themes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -434,7 +435,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Tickets");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.TicketMessage", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.TicketMessage", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -468,7 +469,7 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("TicketMessages");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -513,9 +514,9 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -524,28 +525,28 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostComment", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostComment", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Author")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Author")
                         .WithMany()
                         .HasForeignKey("AuthorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Comments")
                         .HasForeignKey("PostId");
 
                     b.Navigation("Author");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.PostLike", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.PostLike", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Community.Post", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Community.Post", null)
                         .WithMany("Likes")
                         .HasForeignKey("PostId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -554,39 +555,39 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.CouponUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.CouponUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Coupon", "Coupon")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Coupon", "Coupon")
                         .WithMany()
                         .HasForeignKey("CouponId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("CouponUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("Coupon");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.GiftCodeUse", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.GiftCodeUse", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.GiftCode", "GiftCode")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.GiftCode", "GiftCode")
                         .WithMany()
                         .HasForeignKey("GiftCodeId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("GiftCodeUses")
                         .HasForeignKey("UserId");
 
                     b.Navigation("GiftCode");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Product", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Product", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Category", "Category")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Category", "Category")
                         .WithMany()
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -595,15 +596,15 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Product", "Product")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Product", "Product")
                         .WithMany()
                         .HasForeignKey("ProductId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -614,13 +615,13 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Product");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.ServiceShare", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.ServiceShare", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", null)
                         .WithMany("Shares")
                         .HasForeignKey("ServiceId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -629,22 +630,22 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Transaction", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Transaction", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.User", null)
                         .WithMany("Transactions")
                         .HasForeignKey("UserId");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Creator")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Creator")
                         .WithMany()
                         .HasForeignKey("CreatorId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Moonlight.App.Database.Entities.Store.Service", "Service")
+                    b.HasOne("Moonlight.Core.Database.Entities.Store.Service", "Service")
                         .WithMany()
                         .HasForeignKey("ServiceId");
 
@@ -653,37 +654,37 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("Service");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.TicketMessage", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.TicketMessage", b =>
                 {
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Sender")
+                    b.HasOne("Moonlight.Core.Database.Entities.User", "Sender")
                         .WithMany()
                         .HasForeignKey("SenderId");
 
-                    b.HasOne("Moonlight.App.Database.Entities.Tickets.Ticket", null)
+                    b.HasOne("Moonlight.Core.Database.Entities.Tickets.Ticket", null)
                         .WithMany("Messages")
                         .HasForeignKey("TicketId");
 
                     b.Navigation("Sender");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Community.Post", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Community.Post", b =>
                 {
                     b.Navigation("Comments");
 
                     b.Navigation("Likes");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Store.Service", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Store.Service", b =>
                 {
                     b.Navigation("Shares");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Tickets.Ticket", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.Tickets.Ticket", b =>
                 {
                     b.Navigation("Messages");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+            modelBuilder.Entity("Moonlight.Core.Database.Entities.User", b =>
                 {
                     b.Navigation("CouponUses");
 
diff --git a/Moonlight/App/Event/Args/MailVerificationEventArgs.cs b/Moonlight/Core/Event/Args/MailVerificationEventArgs.cs
similarity index 58%
rename from Moonlight/App/Event/Args/MailVerificationEventArgs.cs
rename to Moonlight/Core/Event/Args/MailVerificationEventArgs.cs
index a1f3160..69b4450 100644
--- a/Moonlight/App/Event/Args/MailVerificationEventArgs.cs
+++ b/Moonlight/Core/Event/Args/MailVerificationEventArgs.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Database.Entities;
+using Moonlight.Core.Database.Entities;
 
-namespace Moonlight.App.Event.Args;
+namespace Moonlight.Core.Event.Args;
 
 public class MailVerificationEventArgs
 {
diff --git a/Moonlight/App/Event/Args/TicketMessageEventArgs.cs b/Moonlight/Core/Event/Args/TicketMessageEventArgs.cs
similarity index 60%
rename from Moonlight/App/Event/Args/TicketMessageEventArgs.cs
rename to Moonlight/Core/Event/Args/TicketMessageEventArgs.cs
index 900be64..715d3a7 100644
--- a/Moonlight/App/Event/Args/TicketMessageEventArgs.cs
+++ b/Moonlight/Core/Event/Args/TicketMessageEventArgs.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Database.Entities.Tickets;
+using Moonlight.Features.Ticketing.Entities;
 
-namespace Moonlight.App.Event.Args;
+namespace Moonlight.Core.Event.Args;
 
 public class TicketMessageEventArgs
 {
diff --git a/Moonlight/App/Event/Args/TransactionCreatedEventArgs.cs b/Moonlight/Core/Event/Args/TransactionCreatedEventArgs.cs
similarity index 50%
rename from Moonlight/App/Event/Args/TransactionCreatedEventArgs.cs
rename to Moonlight/Core/Event/Args/TransactionCreatedEventArgs.cs
index 585791c..a04e258 100644
--- a/Moonlight/App/Event/Args/TransactionCreatedEventArgs.cs
+++ b/Moonlight/Core/Event/Args/TransactionCreatedEventArgs.cs
@@ -1,7 +1,7 @@
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Event.Args;
+namespace Moonlight.Core.Event.Args;
 
 public class TransactionCreatedEventArgs
 {
diff --git a/Moonlight/App/Event/Events.cs b/Moonlight/Core/Event/Events.cs
similarity index 79%
rename from Moonlight/App/Event/Events.cs
rename to Moonlight/Core/Event/Events.cs
index 7ee34f8..9f3f38a 100644
--- a/Moonlight/App/Event/Events.cs
+++ b/Moonlight/Core/Event/Events.cs
@@ -1,10 +1,10 @@
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Community;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Entities.Tickets;
-using Moonlight.App.Event.Args;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Event.Args;
+using Moonlight.Features.Community.Entities;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.Ticketing.Entities;
 
-namespace Moonlight.App.Event;
+namespace Moonlight.Core.Event;
 
 public class Events
 {
diff --git a/Moonlight/App/Exceptions/DisplayException.cs b/Moonlight/Core/Exceptions/DisplayException.cs
similarity index 86%
rename from Moonlight/App/Exceptions/DisplayException.cs
rename to Moonlight/Core/Exceptions/DisplayException.cs
index 5f2df09..cc8c04a 100644
--- a/Moonlight/App/Exceptions/DisplayException.cs
+++ b/Moonlight/Core/Exceptions/DisplayException.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Exceptions;
+namespace Moonlight.Core.Exceptions;
 
 public class DisplayException : Exception
 {
diff --git a/Moonlight/App/Extensions/Attributes/RequirePermissionAttribute.cs b/Moonlight/Core/Extensions/Attributes/RequirePermissionAttribute.cs
similarity index 80%
rename from Moonlight/App/Extensions/Attributes/RequirePermissionAttribute.cs
rename to Moonlight/Core/Extensions/Attributes/RequirePermissionAttribute.cs
index e6d6db4..e409c43 100644
--- a/Moonlight/App/Extensions/Attributes/RequirePermissionAttribute.cs
+++ b/Moonlight/Core/Extensions/Attributes/RequirePermissionAttribute.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Models.Enums;
+using Moonlight.Core.Models.Enums;
 
-namespace Moonlight.App.Extensions.Attributes;
+namespace Moonlight.Core.Extensions.Attributes;
 
 public class RequirePermissionAttribute : Attribute
 {
diff --git a/Moonlight/App/Extensions/Attributes/SelectorAttribute.cs b/Moonlight/Core/Extensions/Attributes/SelectorAttribute.cs
similarity index 79%
rename from Moonlight/App/Extensions/Attributes/SelectorAttribute.cs
rename to Moonlight/Core/Extensions/Attributes/SelectorAttribute.cs
index 308bfa8..4caf59a 100644
--- a/Moonlight/App/Extensions/Attributes/SelectorAttribute.cs
+++ b/Moonlight/Core/Extensions/Attributes/SelectorAttribute.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Extensions.Attributes;
+namespace Moonlight.Core.Extensions.Attributes;
 
 public class SelectorAttribute : Attribute
 {
diff --git a/Moonlight/App/Extensions/ConfigurationBuilderExtensions.cs b/Moonlight/Core/Extensions/ConfigurationBuilderExtensions.cs
similarity index 90%
rename from Moonlight/App/Extensions/ConfigurationBuilderExtensions.cs
rename to Moonlight/Core/Extensions/ConfigurationBuilderExtensions.cs
index 2ade456..89c69a6 100644
--- a/Moonlight/App/Extensions/ConfigurationBuilderExtensions.cs
+++ b/Moonlight/Core/Extensions/ConfigurationBuilderExtensions.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Moonlight.App.Extensions;
+namespace Moonlight.Core.Extensions;
 
 public static class ConfigurationBuilderExtensions
 {
diff --git a/Moonlight/App/Extensions/EventHandlerExtensions.cs b/Moonlight/Core/Extensions/EventHandlerExtensions.cs
similarity index 95%
rename from Moonlight/App/Extensions/EventHandlerExtensions.cs
rename to Moonlight/Core/Extensions/EventHandlerExtensions.cs
index 31f5393..a070432 100644
--- a/Moonlight/App/Extensions/EventHandlerExtensions.cs
+++ b/Moonlight/Core/Extensions/EventHandlerExtensions.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Extensions;
+namespace Moonlight.Core.Extensions;
 
 public static class EventHandlerExtensions
 {
diff --git a/Moonlight/App/Extensions/ZipArchiveExtension.cs b/Moonlight/Core/Extensions/ZipArchiveExtension.cs
similarity index 95%
rename from Moonlight/App/Extensions/ZipArchiveExtension.cs
rename to Moonlight/Core/Extensions/ZipArchiveExtension.cs
index 9937e55..14be580 100644
--- a/Moonlight/App/Extensions/ZipArchiveExtension.cs
+++ b/Moonlight/Core/Extensions/ZipArchiveExtension.cs
@@ -1,7 +1,7 @@
 using System.IO.Compression;
 using System.Text;
 
-namespace Moonlight.App.Extensions;
+namespace Moonlight.Core.Extensions;
 
 public static class ZipArchiveExtension
 {
diff --git a/Moonlight/App/Helpers/ComponentHelper.cs b/Moonlight/Core/Helpers/ComponentHelper.cs
similarity index 95%
rename from Moonlight/App/Helpers/ComponentHelper.cs
rename to Moonlight/Core/Helpers/ComponentHelper.cs
index 754bd6b..a8296d9 100644
--- a/Moonlight/App/Helpers/ComponentHelper.cs
+++ b/Moonlight/Core/Helpers/ComponentHelper.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace Moonlight.App.Helpers;
+namespace Moonlight.Core.Helpers;
 
 public static class ComponentHelper
 {
diff --git a/Moonlight/App/Helpers/Formatter.cs b/Moonlight/Core/Helpers/Formatter.cs
similarity index 99%
rename from Moonlight/App/Helpers/Formatter.cs
rename to Moonlight/Core/Helpers/Formatter.cs
index dadf049..ce8c343 100644
--- a/Moonlight/App/Helpers/Formatter.cs
+++ b/Moonlight/Core/Helpers/Formatter.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using Microsoft.AspNetCore.Components;
 
-namespace Moonlight.App.Helpers;
+namespace Moonlight.Core.Helpers;
 
 public static class Formatter
 {
diff --git a/Moonlight/App/Helpers/HashHelper.cs b/Moonlight/Core/Helpers/HashHelper.cs
similarity index 99%
rename from Moonlight/App/Helpers/HashHelper.cs
rename to Moonlight/Core/Helpers/HashHelper.cs
index 97458b8..9e5b46c 100644
--- a/Moonlight/App/Helpers/HashHelper.cs
+++ b/Moonlight/Core/Helpers/HashHelper.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using Microsoft.AspNetCore.Cryptography.KeyDerivation;
 
-namespace Moonlight.App.Helpers;
+namespace Moonlight.Core.Helpers;
 
 // Src: https://codereview.stackexchange.com/questions/176697/net-core-mvc-future-proof-hashing-of-passwords
 public static class HashHelper
diff --git a/Moonlight/App/Helpers/LogMigrator/LogMigrateProvider.cs b/Moonlight/Core/Helpers/LogMigrator/LogMigrateProvider.cs
similarity index 78%
rename from Moonlight/App/Helpers/LogMigrator/LogMigrateProvider.cs
rename to Moonlight/Core/Helpers/LogMigrator/LogMigrateProvider.cs
index 5c2469f..9d7d4de 100644
--- a/Moonlight/App/Helpers/LogMigrator/LogMigrateProvider.cs
+++ b/Moonlight/Core/Helpers/LogMigrator/LogMigrateProvider.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Helpers.LogMigrator;
+namespace Moonlight.Core.Helpers.LogMigrator;
 
 public class LogMigrateProvider : ILoggerProvider
 {
diff --git a/Moonlight/App/Helpers/LogMigrator/MigrateLogger.cs b/Moonlight/Core/Helpers/LogMigrator/MigrateLogger.cs
similarity index 96%
rename from Moonlight/App/Helpers/LogMigrator/MigrateLogger.cs
rename to Moonlight/Core/Helpers/LogMigrator/MigrateLogger.cs
index fb9100d..a0de98e 100644
--- a/Moonlight/App/Helpers/LogMigrator/MigrateLogger.cs
+++ b/Moonlight/Core/Helpers/LogMigrator/MigrateLogger.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Helpers.LogMigrator;
+namespace Moonlight.Core.Helpers.LogMigrator;
 
 public class MigrateLogger : ILogger
 {
diff --git a/Moonlight/App/Helpers/Logger.cs b/Moonlight/Core/Helpers/Logger.cs
similarity index 98%
rename from Moonlight/App/Helpers/Logger.cs
rename to Moonlight/Core/Helpers/Logger.cs
index efce9e9..068ed3c 100644
--- a/Moonlight/App/Helpers/Logger.cs
+++ b/Moonlight/Core/Helpers/Logger.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using Serilog;
 
-namespace Moonlight.App.Helpers;
+namespace Moonlight.Core.Helpers;
 
 public class Logger
 {
diff --git a/Moonlight/App/Helpers/PathBuilder.cs b/Moonlight/Core/Helpers/PathBuilder.cs
similarity index 95%
rename from Moonlight/App/Helpers/PathBuilder.cs
rename to Moonlight/Core/Helpers/PathBuilder.cs
index 8d1054c..5388208 100644
--- a/Moonlight/App/Helpers/PathBuilder.cs
+++ b/Moonlight/Core/Helpers/PathBuilder.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Helpers;
+namespace Moonlight.Core.Helpers;
 
 public static class PathBuilder
 {
diff --git a/Moonlight/App/Helpers/PropBinder.cs b/Moonlight/Core/Helpers/PropBinder.cs
similarity index 97%
rename from Moonlight/App/Helpers/PropBinder.cs
rename to Moonlight/Core/Helpers/PropBinder.cs
index 9d3d986..39b0c6d 100644
--- a/Moonlight/App/Helpers/PropBinder.cs
+++ b/Moonlight/Core/Helpers/PropBinder.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace Moonlight.App.Helpers;
+namespace Moonlight.Core.Helpers;
 
 public class PropBinder<T>
 {
diff --git a/Moonlight/App/Http/Controllers/Api/AssetProxyController.cs b/Moonlight/Core/Http/Controllers/Api/AssetProxyController.cs
similarity index 86%
rename from Moonlight/App/Http/Controllers/Api/AssetProxyController.cs
rename to Moonlight/Core/Http/Controllers/Api/AssetProxyController.cs
index a8650a3..e38b5a4 100644
--- a/Moonlight/App/Http/Controllers/Api/AssetProxyController.cs
+++ b/Moonlight/Core/Http/Controllers/Api/AssetProxyController.cs
@@ -1,17 +1,16 @@
-using System.Text;
 using Microsoft.AspNetCore.Mvc;
-using Moonlight.App.Helpers;
-using Moonlight.App.Services.Sys;
+using Moonlight.Core.Helpers;
+using Moonlight.Features.Theming.Services;
 
-namespace Moonlight.App.Http.Controllers.Api;
+namespace Moonlight.Core.Http.Controllers.Api;
 
 [ApiController]
 [Route("api/assetproxy")]
 public class AssetProxyController : Controller
 {
-    private readonly MoonlightThemeService ThemeService;
+    private readonly ThemeService ThemeService;
 
-    public AssetProxyController(MoonlightThemeService themeService)
+    public AssetProxyController(ThemeService themeService)
     {
         ThemeService = themeService;
     }
diff --git a/Moonlight/App/Http/Controllers/Api/Auth/ResetController.cs b/Moonlight/Core/Http/Controllers/Api/Auth/ResetController.cs
similarity index 89%
rename from Moonlight/App/Http/Controllers/Api/Auth/ResetController.cs
rename to Moonlight/Core/Http/Controllers/Api/Auth/ResetController.cs
index 482da17..4905a55 100644
--- a/Moonlight/App/Http/Controllers/Api/Auth/ResetController.cs
+++ b/Moonlight/Core/Http/Controllers/Api/Auth/ResetController.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Models.Enums;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services;
-using Moonlight.App.Services.Utils;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Models.Enums;
+using Moonlight.Core.Repositories;
+using Moonlight.Core.Services;
+using Moonlight.Core.Services.Utils;
 
-namespace Moonlight.App.Http.Controllers.Api.Auth;
+namespace Moonlight.Core.Http.Controllers.Api.Auth;
 
 [ApiController]
 [Route("api/auth/reset")]
diff --git a/Moonlight/App/Http/Controllers/Api/Auth/VerifyController.cs b/Moonlight/Core/Http/Controllers/Api/Auth/VerifyController.cs
similarity index 87%
rename from Moonlight/App/Http/Controllers/Api/Auth/VerifyController.cs
rename to Moonlight/Core/Http/Controllers/Api/Auth/VerifyController.cs
index e2b19e2..518fb72 100644
--- a/Moonlight/App/Http/Controllers/Api/Auth/VerifyController.cs
+++ b/Moonlight/Core/Http/Controllers/Api/Auth/VerifyController.cs
@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using Moonlight.App.Helpers;
-using Moonlight.App.Models.Enums;
-using Moonlight.App.Services;
-using Moonlight.App.Services.Utils;
+using Moonlight.Core.Helpers;
+using Moonlight.Core.Models.Enums;
+using Moonlight.Core.Services;
+using Moonlight.Core.Services.Utils;
 
-namespace Moonlight.App.Http.Controllers.Api.Auth;
+namespace Moonlight.Core.Http.Controllers.Api.Auth;
 
 [ApiController]
 [Route("api/auth/verify")]
diff --git a/Moonlight/App/Http/Controllers/Api/BucketController.cs b/Moonlight/Core/Http/Controllers/Api/BucketController.cs
similarity index 89%
rename from Moonlight/App/Http/Controllers/Api/BucketController.cs
rename to Moonlight/Core/Http/Controllers/Api/BucketController.cs
index ea38470..5525d4e 100644
--- a/Moonlight/App/Http/Controllers/Api/BucketController.cs
+++ b/Moonlight/Core/Http/Controllers/Api/BucketController.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using Moonlight.App.Helpers;
-using Moonlight.App.Services;
+using Moonlight.Core.Helpers;
+using Moonlight.Core.Services;
 
-namespace Moonlight.App.Http.Controllers.Api;
+namespace Moonlight.Core.Http.Controllers.Api;
 
 [ApiController]
 [Route("api/bucket")]
diff --git a/Moonlight/App/Models/Abstractions/FlagStorage.cs b/Moonlight/Core/Models/Abstractions/FlagStorage.cs
similarity index 92%
rename from Moonlight/App/Models/Abstractions/FlagStorage.cs
rename to Moonlight/Core/Models/Abstractions/FlagStorage.cs
index 7ec57b9..829dedf 100644
--- a/Moonlight/App/Models/Abstractions/FlagStorage.cs
+++ b/Moonlight/Core/Models/Abstractions/FlagStorage.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Models.Enums;
+using Moonlight.Core.Models.Enums;
 
-namespace Moonlight.App.Models.Abstractions;
+namespace Moonlight.Core.Models.Abstractions;
 
 public class FlagStorage
 {
diff --git a/Moonlight/App/Models/Abstractions/PermissionStorage.cs b/Moonlight/Core/Models/Abstractions/PermissionStorage.cs
similarity index 89%
rename from Moonlight/App/Models/Abstractions/PermissionStorage.cs
rename to Moonlight/Core/Models/Abstractions/PermissionStorage.cs
index 8a85b6f..78cf17f 100644
--- a/Moonlight/App/Models/Abstractions/PermissionStorage.cs
+++ b/Moonlight/Core/Models/Abstractions/PermissionStorage.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Models.Enums;
+using Moonlight.Core.Models.Enums;
 
-namespace Moonlight.App.Models.Abstractions;
+namespace Moonlight.Core.Models.Abstractions;
 
 public class PermissionStorage
 {
diff --git a/Moonlight/App/Models/Abstractions/Session.cs b/Moonlight/Core/Models/Abstractions/Session.cs
similarity index 77%
rename from Moonlight/App/Models/Abstractions/Session.cs
rename to Moonlight/Core/Models/Abstractions/Session.cs
index e076266..d4b6d93 100644
--- a/Moonlight/App/Models/Abstractions/Session.cs
+++ b/Moonlight/Core/Models/Abstractions/Session.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Database.Entities;
+using Moonlight.Core.Database.Entities;
 
-namespace Moonlight.App.Models.Abstractions;
+namespace Moonlight.Core.Models.Abstractions;
 
 public class Session
 {
diff --git a/Moonlight/App/Models/Abstractions/Subscriber.cs b/Moonlight/Core/Models/Abstractions/Subscriber.cs
similarity index 73%
rename from Moonlight/App/Models/Abstractions/Subscriber.cs
rename to Moonlight/Core/Models/Abstractions/Subscriber.cs
index 97d4944..f752f33 100644
--- a/Moonlight/App/Models/Abstractions/Subscriber.cs
+++ b/Moonlight/Core/Models/Abstractions/Subscriber.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Abstractions;
+namespace Moonlight.Core.Models.Abstractions;
 
 public class Subscriber
 {
diff --git a/Moonlight/App/Models/Enums/Permission.cs b/Moonlight/Core/Models/Enums/Permission.cs
similarity index 88%
rename from Moonlight/App/Models/Enums/Permission.cs
rename to Moonlight/Core/Models/Enums/Permission.cs
index d342dde..11a0c4f 100644
--- a/Moonlight/App/Models/Enums/Permission.cs
+++ b/Moonlight/Core/Models/Enums/Permission.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Enums;
+namespace Moonlight.Core.Models.Enums;
 
 public enum Permission
 {
diff --git a/Moonlight/App/Models/Enums/UserFlag.cs b/Moonlight/Core/Models/Enums/UserFlag.cs
similarity index 64%
rename from Moonlight/App/Models/Enums/UserFlag.cs
rename to Moonlight/Core/Models/Enums/UserFlag.cs
index d6fcd35..ef613a6 100644
--- a/Moonlight/App/Models/Enums/UserFlag.cs
+++ b/Moonlight/Core/Models/Enums/UserFlag.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Enums;
+namespace Moonlight.Core.Models.Enums;
 
 public enum UserFlag
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Users/UpdateUserForm.cs b/Moonlight/Core/Models/Forms/Admin/Users/UpdateUserForm.cs
similarity index 92%
rename from Moonlight/App/Models/Forms/Admin/Users/UpdateUserForm.cs
rename to Moonlight/Core/Models/Forms/Admin/Users/UpdateUserForm.cs
index c8f092a..8682efe 100644
--- a/Moonlight/App/Models/Forms/Admin/Users/UpdateUserForm.cs
+++ b/Moonlight/Core/Models/Forms/Admin/Users/UpdateUserForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Users;
+namespace Moonlight.Core.Models.Forms.Admin.Users;
 
 public class UpdateUserForm
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Users/UpdateUserPasswordForm.cs b/Moonlight/Core/Models/Forms/Admin/Users/UpdateUserPasswordForm.cs
similarity index 87%
rename from Moonlight/App/Models/Forms/Admin/Users/UpdateUserPasswordForm.cs
rename to Moonlight/Core/Models/Forms/Admin/Users/UpdateUserPasswordForm.cs
index e6bfb7e..9136579 100644
--- a/Moonlight/App/Models/Forms/Admin/Users/UpdateUserPasswordForm.cs
+++ b/Moonlight/Core/Models/Forms/Admin/Users/UpdateUserPasswordForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Users;
+namespace Moonlight.Core.Models.Forms.Admin.Users;
 
 public class UpdateUserPasswordForm
 {
diff --git a/Moonlight/App/Models/Forms/Auth/LoginForm.cs b/Moonlight/Core/Models/Forms/Auth/LoginForm.cs
similarity index 89%
rename from Moonlight/App/Models/Forms/Auth/LoginForm.cs
rename to Moonlight/Core/Models/Forms/Auth/LoginForm.cs
index 32cd2be..7b414a4 100644
--- a/Moonlight/App/Models/Forms/Auth/LoginForm.cs
+++ b/Moonlight/Core/Models/Forms/Auth/LoginForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Auth;
+namespace Moonlight.Core.Models.Forms.Auth;
 
 public class LoginForm
 {
diff --git a/Moonlight/App/Models/Forms/Auth/RegisterForm.cs b/Moonlight/Core/Models/Forms/Auth/RegisterForm.cs
similarity index 96%
rename from Moonlight/App/Models/Forms/Auth/RegisterForm.cs
rename to Moonlight/Core/Models/Forms/Auth/RegisterForm.cs
index b07fed6..6ebbde4 100644
--- a/Moonlight/App/Models/Forms/Auth/RegisterForm.cs
+++ b/Moonlight/Core/Models/Forms/Auth/RegisterForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Auth;
+namespace Moonlight.Core.Models.Forms.Auth;
 
 public class RegisterForm
 {
diff --git a/Moonlight/App/Models/Forms/Auth/ResetPasswordForm.cs b/Moonlight/Core/Models/Forms/Auth/ResetPasswordForm.cs
similarity index 85%
rename from Moonlight/App/Models/Forms/Auth/ResetPasswordForm.cs
rename to Moonlight/Core/Models/Forms/Auth/ResetPasswordForm.cs
index 8bcca4a..6816728 100644
--- a/Moonlight/App/Models/Forms/Auth/ResetPasswordForm.cs
+++ b/Moonlight/Core/Models/Forms/Auth/ResetPasswordForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Auth;
+namespace Moonlight.Core.Models.Forms.Auth;
 
 public class ResetPasswordForm
 {
diff --git a/Moonlight/App/Models/Forms/Auth/TwoFactorCodeForm.cs b/Moonlight/Core/Models/Forms/Auth/TwoFactorCodeForm.cs
similarity index 81%
rename from Moonlight/App/Models/Forms/Auth/TwoFactorCodeForm.cs
rename to Moonlight/Core/Models/Forms/Auth/TwoFactorCodeForm.cs
index ed84da3..88c7521 100644
--- a/Moonlight/App/Models/Forms/Auth/TwoFactorCodeForm.cs
+++ b/Moonlight/Core/Models/Forms/Auth/TwoFactorCodeForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Auth;
+namespace Moonlight.Core.Models.Forms.Auth;
 
 public class TwoFactorCodeForm
 {
diff --git a/Moonlight/App/Models/Forms/Auth/UpdateAccountForm.cs b/Moonlight/Core/Models/Forms/Auth/UpdateAccountForm.cs
similarity index 93%
rename from Moonlight/App/Models/Forms/Auth/UpdateAccountForm.cs
rename to Moonlight/Core/Models/Forms/Auth/UpdateAccountForm.cs
index 09ec62d..9796e02 100644
--- a/Moonlight/App/Models/Forms/Auth/UpdateAccountForm.cs
+++ b/Moonlight/Core/Models/Forms/Auth/UpdateAccountForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Auth;
+namespace Moonlight.Core.Models.Forms.Auth;
 
 public class UpdateAccountForm
 {
diff --git a/Moonlight/App/Models/Forms/Auth/UpdateAccountPasswordForm.cs b/Moonlight/Core/Models/Forms/Auth/UpdateAccountPasswordForm.cs
similarity index 93%
rename from Moonlight/App/Models/Forms/Auth/UpdateAccountPasswordForm.cs
rename to Moonlight/Core/Models/Forms/Auth/UpdateAccountPasswordForm.cs
index ed2b187..f8f6120 100644
--- a/Moonlight/App/Models/Forms/Auth/UpdateAccountPasswordForm.cs
+++ b/Moonlight/Core/Models/Forms/Auth/UpdateAccountPasswordForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Auth;
+namespace Moonlight.Core.Models.Forms.Auth;
 
 public class UpdateAccountPasswordForm
 {
diff --git a/Moonlight/App/Models/Templates/MailVerify.cs b/Moonlight/Core/Models/Templates/MailVerify.cs
similarity index 59%
rename from Moonlight/App/Models/Templates/MailVerify.cs
rename to Moonlight/Core/Models/Templates/MailVerify.cs
index 9254253..7d90436 100644
--- a/Moonlight/App/Models/Templates/MailVerify.cs
+++ b/Moonlight/Core/Models/Templates/MailVerify.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Templates;
+namespace Moonlight.Core.Models.Templates;
 
 public class MailVerify
 {
diff --git a/Moonlight/App/Models/Templates/ResetPassword.cs b/Moonlight/Core/Models/Templates/ResetPassword.cs
similarity index 60%
rename from Moonlight/App/Models/Templates/ResetPassword.cs
rename to Moonlight/Core/Models/Templates/ResetPassword.cs
index 46f0cd3..d06356b 100644
--- a/Moonlight/App/Models/Templates/ResetPassword.cs
+++ b/Moonlight/Core/Models/Templates/ResetPassword.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Templates;
+namespace Moonlight.Core.Models.Templates;
 
 public class ResetPassword
 {
diff --git a/Moonlight/App/Plugins/Contexts/PluginContext.cs b/Moonlight/Core/Plugins/Contexts/PluginContext.cs
similarity index 83%
rename from Moonlight/App/Plugins/Contexts/PluginContext.cs
rename to Moonlight/Core/Plugins/Contexts/PluginContext.cs
index afdf874..f16b8d1 100644
--- a/Moonlight/App/Plugins/Contexts/PluginContext.cs
+++ b/Moonlight/Core/Plugins/Contexts/PluginContext.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Models.Abstractions.Services;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 
-namespace Moonlight.App.Plugins.Contexts;
+namespace Moonlight.Core.Plugins.Contexts;
 
 public class PluginContext
 {
diff --git a/Moonlight/App/Plugins/MoonlightPlugin.cs b/Moonlight/Core/Plugins/MoonlightPlugin.cs
similarity index 67%
rename from Moonlight/App/Plugins/MoonlightPlugin.cs
rename to Moonlight/Core/Plugins/MoonlightPlugin.cs
index b7d413e..b6f71c1 100644
--- a/Moonlight/App/Plugins/MoonlightPlugin.cs
+++ b/Moonlight/Core/Plugins/MoonlightPlugin.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Plugins.Contexts;
+using Moonlight.Core.Plugins.Contexts;
 
-namespace Moonlight.App.Plugins;
+namespace Moonlight.Core.Plugins;
 
 public abstract class MoonlightPlugin
 {
diff --git a/Moonlight/App/Repositories/Repository.cs b/Moonlight/Core/Repositories/Repository.cs
similarity index 92%
rename from Moonlight/App/Repositories/Repository.cs
rename to Moonlight/Core/Repositories/Repository.cs
index 1c46f6a..874ea06 100644
--- a/Moonlight/App/Repositories/Repository.cs
+++ b/Moonlight/Core/Repositories/Repository.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database;
+using Moonlight.Core.Database;
 
-namespace Moonlight.App.Repositories;
+namespace Moonlight.Core.Repositories;
 
 public class Repository<TEntity> where TEntity : class
 {
diff --git a/Moonlight/App/Services/Background/AutoMailSendService.cs b/Moonlight/Core/Services/Background/AutoMailSendService.cs
similarity index 85%
rename from Moonlight/App/Services/Background/AutoMailSendService.cs
rename to Moonlight/Core/Services/Background/AutoMailSendService.cs
index 12a3f4c..3cbff63 100644
--- a/Moonlight/App/Services/Background/AutoMailSendService.cs
+++ b/Moonlight/Core/Services/Background/AutoMailSendService.cs
@@ -1,9 +1,9 @@
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Event;
-using Moonlight.App.Event.Args;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Event;
+using Moonlight.Core.Event.Args;
+using Moonlight.Features.ServiceManagement.Entities;
 
-namespace Moonlight.App.Services.Background;
+namespace Moonlight.Core.Services.Background;
 
 public class AutoMailSendService // This service is responsible for sending mails automatically 
 {
diff --git a/Moonlight/App/Services/BucketService.cs b/Moonlight/Core/Services/BucketService.cs
similarity index 97%
rename from Moonlight/App/Services/BucketService.cs
rename to Moonlight/Core/Services/BucketService.cs
index ced7ccd..260d7e8 100644
--- a/Moonlight/App/Services/BucketService.cs
+++ b/Moonlight/Core/Services/BucketService.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Helpers;
+using Moonlight.Core.Helpers;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.Core.Services;
 
 public class BucketService
 {
diff --git a/Moonlight/App/Services/ConfigService.cs b/Moonlight/Core/Services/ConfigService.cs
similarity index 96%
rename from Moonlight/App/Services/ConfigService.cs
rename to Moonlight/Core/Services/ConfigService.cs
index e10553c..c8d0f67 100644
--- a/Moonlight/App/Services/ConfigService.cs
+++ b/Moonlight/Core/Services/ConfigService.cs
@@ -1,8 +1,8 @@
-using Moonlight.App.Configuration;
-using Moonlight.App.Helpers;
+using Moonlight.Core.Configuration;
+using Moonlight.Core.Helpers;
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.Core.Services;
 
 public class ConfigService
 {
diff --git a/Moonlight/App/Services/IdentityService.cs b/Moonlight/Core/Services/IdentityService.cs
similarity index 94%
rename from Moonlight/App/Services/IdentityService.cs
rename to Moonlight/Core/Services/IdentityService.cs
index c31b303..7f21769 100644
--- a/Moonlight/App/Services/IdentityService.cs
+++ b/Moonlight/Core/Services/IdentityService.cs
@@ -1,15 +1,15 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Helpers;
-using Moonlight.App.Models.Abstractions;
-using Moonlight.App.Models.Enums;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services.Utils;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Helpers;
+using Moonlight.Core.Models.Abstractions;
+using Moonlight.Core.Models.Enums;
+using Moonlight.Core.Repositories;
+using Moonlight.Core.Services.Utils;
+using Moonlight.Features.StoreSystem.Entities;
 using OtpNet;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.Core.Services;
 
 // This service allows you to reauthenticate, login and force login
 // It does also contain the permission system accessor for the current user
diff --git a/Moonlight/App/Services/Interop/AlertService.cs b/Moonlight/Core/Services/Interop/AlertService.cs
similarity index 96%
rename from Moonlight/App/Services/Interop/AlertService.cs
rename to Moonlight/Core/Services/Interop/AlertService.cs
index ee1f9f9..c66a221 100644
--- a/Moonlight/App/Services/Interop/AlertService.cs
+++ b/Moonlight/Core/Services/Interop/AlertService.cs
@@ -1,6 +1,6 @@
 using Microsoft.JSInterop;
 
-namespace Moonlight.App.Services.Interop;
+namespace Moonlight.Core.Services.Interop;
 
 public class AlertService
 {
diff --git a/Moonlight/App/Services/Interop/CookieService.cs b/Moonlight/Core/Services/Interop/CookieService.cs
similarity index 95%
rename from Moonlight/App/Services/Interop/CookieService.cs
rename to Moonlight/Core/Services/Interop/CookieService.cs
index 2aa0ce0..d171174 100644
--- a/Moonlight/App/Services/Interop/CookieService.cs
+++ b/Moonlight/Core/Services/Interop/CookieService.cs
@@ -1,7 +1,6 @@
 using Microsoft.JSInterop;
-using Moonlight.App.Helpers;
 
-namespace Moonlight.App.Services.Interop;
+namespace Moonlight.Core.Services.Interop;
 
 public class CookieService
 {
diff --git a/Moonlight/App/Services/Interop/FileDownloadService.cs b/Moonlight/Core/Services/Interop/FileDownloadService.cs
similarity index 95%
rename from Moonlight/App/Services/Interop/FileDownloadService.cs
rename to Moonlight/Core/Services/Interop/FileDownloadService.cs
index 572417e..7b9b598 100644
--- a/Moonlight/App/Services/Interop/FileDownloadService.cs
+++ b/Moonlight/Core/Services/Interop/FileDownloadService.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using Microsoft.JSInterop;
 
-namespace Moonlight.App.Services.Interop;
+namespace Moonlight.Core.Services.Interop;
 
 public class FileDownloadService
 {
diff --git a/Moonlight/App/Services/Interop/ModalService.cs b/Moonlight/Core/Services/Interop/ModalService.cs
similarity index 94%
rename from Moonlight/App/Services/Interop/ModalService.cs
rename to Moonlight/Core/Services/Interop/ModalService.cs
index fcff73e..c9f8819 100644
--- a/Moonlight/App/Services/Interop/ModalService.cs
+++ b/Moonlight/Core/Services/Interop/ModalService.cs
@@ -1,6 +1,6 @@
 using Microsoft.JSInterop;
 
-namespace Moonlight.App.Services.Interop;
+namespace Moonlight.Core.Services.Interop;
 
 public class ModalService
 {
diff --git a/Moonlight/App/Services/Interop/ToastService.cs b/Moonlight/Core/Services/Interop/ToastService.cs
similarity index 97%
rename from Moonlight/App/Services/Interop/ToastService.cs
rename to Moonlight/Core/Services/Interop/ToastService.cs
index 1128cc9..3e83dac 100644
--- a/Moonlight/App/Services/Interop/ToastService.cs
+++ b/Moonlight/Core/Services/Interop/ToastService.cs
@@ -1,6 +1,6 @@
 using Microsoft.JSInterop;
 
-namespace Moonlight.App.Services.Interop;
+namespace Moonlight.Core.Services.Interop;
 
 public class ToastService
 {
diff --git a/Moonlight/App/Services/MailService.cs b/Moonlight/Core/Services/MailService.cs
similarity index 96%
rename from Moonlight/App/Services/MailService.cs
rename to Moonlight/Core/Services/MailService.cs
index b04c7fb..c025d27 100644
--- a/Moonlight/App/Services/MailService.cs
+++ b/Moonlight/Core/Services/MailService.cs
@@ -1,9 +1,9 @@
 using MailKit.Net.Smtp;
 using MimeKit;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Helpers;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Helpers;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.Core.Services;
 
 public class MailService
 {
diff --git a/Moonlight/App/Services/Sys/MoonlightService.cs b/Moonlight/Core/Services/MoonlightService.cs
similarity index 90%
rename from Moonlight/App/Services/Sys/MoonlightService.cs
rename to Moonlight/Core/Services/MoonlightService.cs
index f6fb628..44e6521 100644
--- a/Moonlight/App/Services/Sys/MoonlightService.cs
+++ b/Moonlight/Core/Services/MoonlightService.cs
@@ -1,9 +1,10 @@
 using System.IO.Compression;
-using Moonlight.App.Event;
-using Moonlight.App.Extensions;
-using Moonlight.App.Helpers;
+using Moonlight.Core.Event;
+using Moonlight.Core.Extensions;
+using Moonlight.Core.Helpers;
+using Moonlight.Features.Theming.Services;
 
-namespace Moonlight.App.Services.Sys;
+namespace Moonlight.Core.Services;
 
 public class MoonlightService // This service can be used to perform strictly panel specific actions
 {
@@ -12,7 +13,7 @@ public class MoonlightService // This service can be used to perform strictly pa
     
     public WebApplication Application { get; set; } // Do NOT modify using a plugin
     public string LogPath { get; set; } // Do NOT modify using a plugin
-    public MoonlightThemeService Theme => ServiceProvider.GetRequiredService<MoonlightThemeService>();
+    public ThemeService Theme => ServiceProvider.GetRequiredService<ThemeService>();
     
     public MoonlightService(ConfigService configService, IServiceProvider serviceProvider)
     {
diff --git a/Moonlight/App/Services/PluginService.cs b/Moonlight/Core/Services/PluginService.cs
similarity index 93%
rename from Moonlight/App/Services/PluginService.cs
rename to Moonlight/Core/Services/PluginService.cs
index 6cd608f..74f70a3 100644
--- a/Moonlight/App/Services/PluginService.cs
+++ b/Moonlight/Core/Services/PluginService.cs
@@ -1,13 +1,10 @@
 using System.Reflection;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Helpers;
-using Moonlight.App.Models.Abstractions;
-using Moonlight.App.Models.Abstractions.Services;
-using Moonlight.App.Plugins;
-using Moonlight.App.Plugins.Contexts;
+using Moonlight.Core.Helpers;
+using Moonlight.Core.Plugins;
+using Moonlight.Core.Plugins.Contexts;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.Core.Services;
 
 public class PluginService
 {
diff --git a/Moonlight/App/Services/SessionService.cs b/Moonlight/Core/Services/SessionService.cs
similarity index 88%
rename from Moonlight/App/Services/SessionService.cs
rename to Moonlight/Core/Services/SessionService.cs
index e013c3f..61c7adf 100644
--- a/Moonlight/App/Services/SessionService.cs
+++ b/Moonlight/Core/Services/SessionService.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Models.Abstractions;
+using Moonlight.Core.Models.Abstractions;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.Core.Services;
 
 public class SessionService
 {
diff --git a/Moonlight/App/Services/Users/UserAuthService.cs b/Moonlight/Core/Services/Users/UserAuthService.cs
similarity index 89%
rename from Moonlight/App/Services/Users/UserAuthService.cs
rename to Moonlight/Core/Services/Users/UserAuthService.cs
index 4dd055d..78217cc 100644
--- a/Moonlight/App/Services/Users/UserAuthService.cs
+++ b/Moonlight/Core/Services/Users/UserAuthService.cs
@@ -1,16 +1,16 @@
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Event;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Extensions;
-using Moonlight.App.Helpers;
-using Moonlight.App.Models.Abstractions;
-using Moonlight.App.Models.Enums;
-using Moonlight.App.Models.Templates;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services.Utils;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Event;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Extensions;
+using Moonlight.Core.Helpers;
+using Moonlight.Core.Models.Abstractions;
+using Moonlight.Core.Models.Enums;
+using Moonlight.Core.Models.Templates;
+using Moonlight.Core.Repositories;
+using Moonlight.Core.Services.Utils;
 using OtpNet;
 
-namespace Moonlight.App.Services.Users;
+namespace Moonlight.Core.Services.Users;
 
 public class UserAuthService
 {
diff --git a/Moonlight/App/Services/Users/UserDeleteService.cs b/Moonlight/Core/Services/Users/UserDeleteService.cs
similarity index 93%
rename from Moonlight/App/Services/Users/UserDeleteService.cs
rename to Moonlight/Core/Services/Users/UserDeleteService.cs
index 6280c16..07a31ac 100644
--- a/Moonlight/App/Services/Users/UserDeleteService.cs
+++ b/Moonlight/Core/Services/Users/UserDeleteService.cs
@@ -1,13 +1,14 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Community;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Entities.Tickets;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services.Community;
-using Moonlight.App.Services.ServiceManage;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.Community.Entities;
+using Moonlight.Features.Community.Services;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Services;
+using Moonlight.Features.StoreSystem.Entities;
+using Moonlight.Features.Ticketing.Entities;
 
-namespace Moonlight.App.Services.Users;
+namespace Moonlight.Core.Services.Users;
 
 public class UserDeleteService
 {
diff --git a/Moonlight/App/Services/Users/UserDetailsService.cs b/Moonlight/Core/Services/Users/UserDetailsService.cs
similarity index 89%
rename from Moonlight/App/Services/Users/UserDetailsService.cs
rename to Moonlight/Core/Services/Users/UserDetailsService.cs
index f1070ff..96b3178 100644
--- a/Moonlight/App/Services/Users/UserDetailsService.cs
+++ b/Moonlight/Core/Services/Users/UserDetailsService.cs
@@ -1,7 +1,7 @@
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Repositories;
 
-namespace Moonlight.App.Services.Users;
+namespace Moonlight.Core.Services.Users;
 
 public class UserDetailsService
 {
diff --git a/Moonlight/App/Services/Users/UserService.cs b/Moonlight/Core/Services/Users/UserService.cs
similarity index 90%
rename from Moonlight/App/Services/Users/UserService.cs
rename to Moonlight/Core/Services/Users/UserService.cs
index 4770545..798e849 100644
--- a/Moonlight/App/Services/Users/UserService.cs
+++ b/Moonlight/Core/Services/Users/UserService.cs
@@ -1,8 +1,8 @@
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Repositories;
 
-namespace Moonlight.App.Services.Users;
+namespace Moonlight.Core.Services.Users;
 
 public class UserService
 {
diff --git a/Moonlight/App/Services/Utils/ConnectionService.cs b/Moonlight/Core/Services/Utils/ConnectionService.cs
similarity index 94%
rename from Moonlight/App/Services/Utils/ConnectionService.cs
rename to Moonlight/Core/Services/Utils/ConnectionService.cs
index 9f50591..e79e10b 100644
--- a/Moonlight/App/Services/Utils/ConnectionService.cs
+++ b/Moonlight/Core/Services/Utils/ConnectionService.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Helpers;
+using Moonlight.Core.Helpers;
 
-namespace Moonlight.App.Services.Utils;
+namespace Moonlight.Core.Services.Utils;
 
 public class ConnectionService
 {
diff --git a/Moonlight/App/Services/Utils/JwtService.cs b/Moonlight/Core/Services/Utils/JwtService.cs
similarity index 96%
rename from Moonlight/App/Services/Utils/JwtService.cs
rename to Moonlight/Core/Services/Utils/JwtService.cs
index 3021c1c..2712ea1 100644
--- a/Moonlight/App/Services/Utils/JwtService.cs
+++ b/Moonlight/Core/Services/Utils/JwtService.cs
@@ -1,9 +1,9 @@
 using JWT.Algorithms;
 using JWT.Builder;
-using Moonlight.App.Helpers;
+using Moonlight.Core.Helpers;
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Services.Utils;
+namespace Moonlight.Core.Services.Utils;
 
 public class JwtService
 {
diff --git a/Moonlight/Shared/Components/Alerts/NotFoundAlert.razor b/Moonlight/Core/UI/Components/Alerts/NotFoundAlert.razor
similarity index 100%
rename from Moonlight/Shared/Components/Alerts/NotFoundAlert.razor
rename to Moonlight/Core/UI/Components/Alerts/NotFoundAlert.razor
diff --git a/Moonlight/Shared/Components/Alerts/RestartAlert.razor b/Moonlight/Core/UI/Components/Alerts/RestartAlert.razor
similarity index 100%
rename from Moonlight/Shared/Components/Alerts/RestartAlert.razor
rename to Moonlight/Core/UI/Components/Alerts/RestartAlert.razor
diff --git a/Moonlight/Shared/Components/Auth/ChangePassword.razor b/Moonlight/Core/UI/Components/Auth/ChangePassword.razor
similarity index 90%
rename from Moonlight/Shared/Components/Auth/ChangePassword.razor
rename to Moonlight/Core/UI/Components/Auth/ChangePassword.razor
index a509d08..58c8769 100644
--- a/Moonlight/Shared/Components/Auth/ChangePassword.razor
+++ b/Moonlight/Core/UI/Components/Auth/ChangePassword.razor
@@ -1,8 +1,9 @@
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Users
-@using Moonlight.App.Models.Forms
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Models.Forms.Auth
+@using Moonlight.Core.Models.Forms
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Models.Forms.Auth
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Users
 
 @inject IdentityService IdentityService
 @inject UserService UserService
diff --git a/Moonlight/Shared/Components/Auth/Login.razor b/Moonlight/Core/UI/Components/Auth/Login.razor
similarity index 94%
rename from Moonlight/Shared/Components/Auth/Login.razor
rename to Moonlight/Core/UI/Components/Auth/Login.razor
index 41c4b4b..a4520e2 100644
--- a/Moonlight/Shared/Components/Auth/Login.razor
+++ b/Moonlight/Core/UI/Components/Auth/Login.razor
@@ -1,9 +1,9 @@
 @page "/login"
 @* Virtual route to trick blazor *@
-
-@using Moonlight.App.Services
-@using Moonlight.App.Models.Forms
-@using Moonlight.App.Models.Forms.Auth
+@using Moonlight.Core.Models.Forms
+@using Moonlight.Core.Models.Forms.Auth
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
 
 @inject IdentityService IdentityService
 @inject CookieService CookieService
diff --git a/Moonlight/Shared/Components/Auth/MailVerify.razor b/Moonlight/Core/UI/Components/Auth/MailVerify.razor
similarity index 94%
rename from Moonlight/Shared/Components/Auth/MailVerify.razor
rename to Moonlight/Core/UI/Components/Auth/MailVerify.razor
index b80bca7..cf5ddf6 100644
--- a/Moonlight/Shared/Components/Auth/MailVerify.razor
+++ b/Moonlight/Core/UI/Components/Auth/MailVerify.razor
@@ -1,6 +1,5 @@
-@using Moonlight.App.Services.Users
-@using Moonlight.App.Services
-
+@using Moonlight.Core.Services.Users
+@using Moonlight.Core.Services
 @inject UserService UserService
 @inject IdentityService IdentityService
 
diff --git a/Moonlight/Shared/Components/Auth/PasswordReset.razor b/Moonlight/Core/UI/Components/Auth/PasswordReset.razor
similarity index 93%
rename from Moonlight/Shared/Components/Auth/PasswordReset.razor
rename to Moonlight/Core/UI/Components/Auth/PasswordReset.razor
index 946dd39..f842c47 100644
--- a/Moonlight/Shared/Components/Auth/PasswordReset.razor
+++ b/Moonlight/Core/UI/Components/Auth/PasswordReset.razor
@@ -1,8 +1,7 @@
 @page "/password-reset"
-
-@using Moonlight.App.Services.Users
-@using Moonlight.App.Models.Forms
-@using Moonlight.App.Models.Forms.Auth
+@using Moonlight.Core.Models.Forms
+@using Moonlight.Core.Models.Forms.Auth
+@using Moonlight.Core.Services.Users
 
 @inject UserService UserService
 
diff --git a/Moonlight/Shared/Components/Auth/Register.razor b/Moonlight/Core/UI/Components/Auth/Register.razor
similarity index 92%
rename from Moonlight/Shared/Components/Auth/Register.razor
rename to Moonlight/Core/UI/Components/Auth/Register.razor
index a685ca1..6999763 100644
--- a/Moonlight/Shared/Components/Auth/Register.razor
+++ b/Moonlight/Core/UI/Components/Auth/Register.razor
@@ -1,11 +1,11 @@
 @page "/register"
 @* Virtual route to trick blazor *@
-
-@using Moonlight.App.Services
-@using Moonlight.App.Models.Forms
-@using Moonlight.App.Services.Users
-@using Moonlight.App.Exceptions
-@using Moonlight.App.Models.Forms.Auth
+@using Moonlight.Core.Models.Forms
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Models.Forms.Auth
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Core.Services.Users
 
 @inject IdentityService IdentityService
 @inject UserService UserService
diff --git a/Moonlight/Shared/Components/Forms/AutoCrud.razor b/Moonlight/Core/UI/Components/Forms/AutoCrud.razor
similarity index 99%
rename from Moonlight/Shared/Components/Forms/AutoCrud.razor
rename to Moonlight/Core/UI/Components/Forms/AutoCrud.razor
index dfad589..0cdd39c 100644
--- a/Moonlight/Shared/Components/Forms/AutoCrud.razor
+++ b/Moonlight/Core/UI/Components/Forms/AutoCrud.razor
@@ -1,7 +1,8 @@
 @using BlazorTable
-@using Moonlight.App.Repositories
 @using System.Linq.Expressions
 @using Mappy.Net
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services.Interop
 
 @typeparam TItem where TItem : class
 @typeparam TCreateForm
diff --git a/Moonlight/Shared/Components/Forms/AutoForm.razor b/Moonlight/Core/UI/Components/Forms/AutoForm.razor
similarity index 93%
rename from Moonlight/Shared/Components/Forms/AutoForm.razor
rename to Moonlight/Core/UI/Components/Forms/AutoForm.razor
index 3135cf1..b3d248e 100644
--- a/Moonlight/Shared/Components/Forms/AutoForm.razor
+++ b/Moonlight/Core/UI/Components/Forms/AutoForm.razor
@@ -1,5 +1,4 @@
-@using Moonlight.App.Extensions
-
+@using Moonlight.Core.Helpers
 @typeparam TForm
 
 @foreach (var prop in typeof(TForm).GetProperties())
diff --git a/Moonlight/Shared/Components/Forms/AutoProperty.razor b/Moonlight/Core/UI/Components/Forms/AutoProperty.razor
similarity index 97%
rename from Moonlight/Shared/Components/Forms/AutoProperty.razor
rename to Moonlight/Core/UI/Components/Forms/AutoProperty.razor
index 202b542..71afe7e 100644
--- a/Moonlight/Shared/Components/Forms/AutoProperty.razor
+++ b/Moonlight/Core/UI/Components/Forms/AutoProperty.razor
@@ -1,8 +1,9 @@
 @using System.Reflection
 @using System.ComponentModel
 @using Microsoft.AspNetCore.Components.Forms
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Repositories
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Repositories
 
 @typeparam TProp
 @inject IServiceProvider ServiceProvider
diff --git a/Moonlight/Shared/Components/Forms/ConfirmButton.razor b/Moonlight/Core/UI/Components/Forms/ConfirmButton.razor
similarity index 100%
rename from Moonlight/Shared/Components/Forms/ConfirmButton.razor
rename to Moonlight/Core/UI/Components/Forms/ConfirmButton.razor
diff --git a/Moonlight/Shared/Components/Forms/DynamicTypedAutoForm.razor b/Moonlight/Core/UI/Components/Forms/DynamicTypedAutoForm.razor
similarity index 90%
rename from Moonlight/Shared/Components/Forms/DynamicTypedAutoForm.razor
rename to Moonlight/Core/UI/Components/Forms/DynamicTypedAutoForm.razor
index 2504763..cd91812 100644
--- a/Moonlight/Shared/Components/Forms/DynamicTypedAutoForm.razor
+++ b/Moonlight/Core/UI/Components/Forms/DynamicTypedAutoForm.razor
@@ -1,4 +1,5 @@
-@{
+@using Moonlight.Core.Helpers
+@{
     var typeToCreate = typeof(AutoForm<>).MakeGenericType(Model.GetType());
     var rf = ComponentHelper.FromType(typeToCreate, parameter =>
     {
diff --git a/Moonlight/Shared/Components/Forms/SmartCustomFileSelect.razor b/Moonlight/Core/UI/Components/Forms/SmartCustomFileSelect.razor
similarity index 95%
rename from Moonlight/Shared/Components/Forms/SmartCustomFileSelect.razor
rename to Moonlight/Core/UI/Components/Forms/SmartCustomFileSelect.razor
index 1cb6a67..0897bba 100644
--- a/Moonlight/Shared/Components/Forms/SmartCustomFileSelect.razor
+++ b/Moonlight/Core/UI/Components/Forms/SmartCustomFileSelect.razor
@@ -1,4 +1,6 @@
 @using Microsoft.AspNetCore.Components.Forms
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Services.Interop
 
 @inject ToastService ToastService
 
diff --git a/Moonlight/Shared/Components/Forms/SmartDropdown.razor b/Moonlight/Core/UI/Components/Forms/SmartDropdown.razor
similarity index 100%
rename from Moonlight/Shared/Components/Forms/SmartDropdown.razor
rename to Moonlight/Core/UI/Components/Forms/SmartDropdown.razor
diff --git a/Moonlight/Shared/Components/Forms/SmartEnumSelect.razor b/Moonlight/Core/UI/Components/Forms/SmartEnumSelect.razor
similarity index 100%
rename from Moonlight/Shared/Components/Forms/SmartEnumSelect.razor
rename to Moonlight/Core/UI/Components/Forms/SmartEnumSelect.razor
diff --git a/Moonlight/Shared/Components/Forms/SmartFileSelect.razor b/Moonlight/Core/UI/Components/Forms/SmartFileSelect.razor
similarity index 95%
rename from Moonlight/Shared/Components/Forms/SmartFileSelect.razor
rename to Moonlight/Core/UI/Components/Forms/SmartFileSelect.razor
index f084821..a78f288 100644
--- a/Moonlight/Shared/Components/Forms/SmartFileSelect.razor
+++ b/Moonlight/Core/UI/Components/Forms/SmartFileSelect.razor
@@ -1,4 +1,6 @@
 @using Microsoft.AspNetCore.Components.Forms
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Services.Interop
 
 @inject ToastService ToastService
 
diff --git a/Moonlight/Shared/Components/Forms/SmartForm.razor b/Moonlight/Core/UI/Components/Forms/SmartForm.razor
similarity index 98%
rename from Moonlight/Shared/Components/Forms/SmartForm.razor
rename to Moonlight/Core/UI/Components/Forms/SmartForm.razor
index f78d4fa..f022818 100644
--- a/Moonlight/Shared/Components/Forms/SmartForm.razor
+++ b/Moonlight/Core/UI/Components/Forms/SmartForm.razor
@@ -1,5 +1,5 @@
 @using Microsoft.AspNetCore.Components.Forms
-@using Moonlight.App.Exceptions
+@using Moonlight.Core.Exceptions
 
 <div class="form @CssClass">
     <EditForm @ref="EditForm" Model="Model" OnValidSubmit="ValidSubmit" OnInvalidSubmit="InvalidSubmit">
diff --git a/Moonlight/Shared/Components/Forms/SmartSelect.razor b/Moonlight/Core/UI/Components/Forms/SmartSelect.razor
similarity index 100%
rename from Moonlight/Shared/Components/Forms/SmartSelect.razor
rename to Moonlight/Core/UI/Components/Forms/SmartSelect.razor
diff --git a/Moonlight/Shared/Components/Forms/TextEditor.razor b/Moonlight/Core/UI/Components/Forms/TextEditor.razor
similarity index 99%
rename from Moonlight/Shared/Components/Forms/TextEditor.razor
rename to Moonlight/Core/UI/Components/Forms/TextEditor.razor
index 54e1f59..1496278 100644
--- a/Moonlight/Shared/Components/Forms/TextEditor.razor
+++ b/Moonlight/Core/UI/Components/Forms/TextEditor.razor
@@ -1,7 +1,8 @@
 @inject IJSRuntime JsRuntime
 @using Microsoft.AspNetCore.Components.Forms
-@using Moonlight.App.Services
 @using Ganss.Xss
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Services
 @inherits InputBase<string>
 
 @inject IdentityService IdentityService
diff --git a/Moonlight/Shared/Components/Forms/WButton.razor b/Moonlight/Core/UI/Components/Forms/WButton.razor
similarity index 100%
rename from Moonlight/Shared/Components/Forms/WButton.razor
rename to Moonlight/Core/UI/Components/Forms/WButton.razor
diff --git a/Moonlight/Shared/Components/Navigations/AccountNavigation.razor b/Moonlight/Core/UI/Components/Navigations/AccountNavigation.razor
similarity index 100%
rename from Moonlight/Shared/Components/Navigations/AccountNavigation.razor
rename to Moonlight/Core/UI/Components/Navigations/AccountNavigation.razor
diff --git a/Moonlight/Shared/Components/Navigations/AdminSysNavigation.razor b/Moonlight/Core/UI/Components/Navigations/AdminSysNavigation.razor
similarity index 100%
rename from Moonlight/Shared/Components/Navigations/AdminSysNavigation.razor
rename to Moonlight/Core/UI/Components/Navigations/AdminSysNavigation.razor
diff --git a/Moonlight/Shared/Components/Navigations/AdminUsersNavigation.razor b/Moonlight/Core/UI/Components/Navigations/AdminUsersNavigation.razor
similarity index 100%
rename from Moonlight/Shared/Components/Navigations/AdminUsersNavigation.razor
rename to Moonlight/Core/UI/Components/Navigations/AdminUsersNavigation.razor
diff --git a/Moonlight/Shared/Components/Partials/ConnectionIndicator.razor b/Moonlight/Core/UI/Components/Partials/ConnectionIndicator.razor
similarity index 100%
rename from Moonlight/Shared/Components/Partials/ConnectionIndicator.razor
rename to Moonlight/Core/UI/Components/Partials/ConnectionIndicator.razor
diff --git a/Moonlight/Shared/Components/Partials/LazyLoader.razor b/Moonlight/Core/UI/Components/Partials/LazyLoader.razor
similarity index 100%
rename from Moonlight/Shared/Components/Partials/LazyLoader.razor
rename to Moonlight/Core/UI/Components/Partials/LazyLoader.razor
diff --git a/Moonlight/Shared/Components/Partials/PageHeader.razor b/Moonlight/Core/UI/Components/Partials/PageHeader.razor
similarity index 97%
rename from Moonlight/Shared/Components/Partials/PageHeader.razor
rename to Moonlight/Core/UI/Components/Partials/PageHeader.razor
index d688771..fd99072 100644
--- a/Moonlight/Shared/Components/Partials/PageHeader.razor
+++ b/Moonlight/Core/UI/Components/Partials/PageHeader.razor
@@ -1,5 +1,6 @@
-@using Moonlight.Shared.Layouts
-@using Moonlight.App.Services
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Core.UI.Layouts
 
 @inject IdentityService IdentityService
 @inject ConfigService ConfigService
diff --git a/Moonlight/Shared/Components/Partials/PermissionChecker.razor b/Moonlight/Core/UI/Components/Partials/PermissionChecker.razor
similarity index 92%
rename from Moonlight/Shared/Components/Partials/PermissionChecker.razor
rename to Moonlight/Core/UI/Components/Partials/PermissionChecker.razor
index 227be23..7b366f6 100644
--- a/Moonlight/Shared/Components/Partials/PermissionChecker.razor
+++ b/Moonlight/Core/UI/Components/Partials/PermissionChecker.razor
@@ -1,7 +1,6 @@
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Abstractions
-@using Moonlight.App.Services
-
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Abstractions
+@using Moonlight.Core.Services
 @inject IdentityService IdentityService
 
 @if (Allowed)
diff --git a/Moonlight/Shared/Components/Partials/Sidebar.razor b/Moonlight/Core/UI/Components/Partials/Sidebar.razor
similarity index 96%
rename from Moonlight/Shared/Components/Partials/Sidebar.razor
rename to Moonlight/Core/UI/Components/Partials/Sidebar.razor
index e21c3e9..f03f3b4 100644
--- a/Moonlight/Shared/Components/Partials/Sidebar.razor
+++ b/Moonlight/Core/UI/Components/Partials/Sidebar.razor
@@ -1,6 +1,6 @@
-@using Moonlight.Shared.Layouts
-@using Moonlight.App.Services
-@using Moonlight.App.Models.Enums
+@using Moonlight.Core.Services
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.UI.Layouts
 
 @inject IdentityService IdentityService
 
@@ -11,7 +11,7 @@
         </a>
     </div>
     <div class="app-sidebar-navs flex-column-fluid py-6" id="kt_app_sidebar_navs">
-        <div id="kt_app_sidebar_navs_wrappers" class="app-sidebar-wrapper hover-scroll-y my-2" style="height: 811px;">
+        <div class="app-sidebar-wrapper hover-scroll-y my-2" style="height: 811px;">
             <div class="app-sidebar-menu-secondary menu menu-rounded menu-column mb-6">
                 <div class="menu-item">
                     <a class="menu-link " href="/">
diff --git a/Moonlight/Shared/Components/Partials/SmartModal.razor b/Moonlight/Core/UI/Components/Partials/SmartModal.razor
similarity index 92%
rename from Moonlight/Shared/Components/Partials/SmartModal.razor
rename to Moonlight/Core/UI/Components/Partials/SmartModal.razor
index 4ef560c..5f6a9be 100644
--- a/Moonlight/Shared/Components/Partials/SmartModal.razor
+++ b/Moonlight/Core/UI/Components/Partials/SmartModal.razor
@@ -1,4 +1,5 @@
-@inject ModalService ModalService
+@using Moonlight.Core.Services.Interop
+@inject ModalService ModalService
 
 <div class="modal fade" id="modal@(Id)" tabindex="-1">
     <div class="modal-dialog @(CssClasses)">
diff --git a/Moonlight/Shared/Components/Partials/SoftErrorHandler.razor b/Moonlight/Core/UI/Components/Partials/SoftErrorHandler.razor
similarity index 94%
rename from Moonlight/Shared/Components/Partials/SoftErrorHandler.razor
rename to Moonlight/Core/UI/Components/Partials/SoftErrorHandler.razor
index e4504dc..f839987 100644
--- a/Moonlight/Shared/Components/Partials/SoftErrorHandler.razor
+++ b/Moonlight/Core/UI/Components/Partials/SoftErrorHandler.razor
@@ -1,7 +1,8 @@
 @using System.Diagnostics
-@using Moonlight.App.Exceptions
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Services
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Services
 
 @inherits ErrorBoundaryBase
 @inject IdentityService IdentityService
diff --git a/Moonlight/Shared/Components/Partials/Tooltip.razor b/Moonlight/Core/UI/Components/Partials/Tooltip.razor
similarity index 100%
rename from Moonlight/Shared/Components/Partials/Tooltip.razor
rename to Moonlight/Core/UI/Components/Partials/Tooltip.razor
diff --git a/Moonlight/Shared/Layouts/DefaultLayout.razor b/Moonlight/Core/UI/Layouts/DefaultLayout.razor
similarity index 95%
rename from Moonlight/Shared/Layouts/DefaultLayout.razor
rename to Moonlight/Core/UI/Layouts/DefaultLayout.razor
index 2c751a9..5dd77c0 100644
--- a/Moonlight/Shared/Layouts/DefaultLayout.razor
+++ b/Moonlight/Core/UI/Layouts/DefaultLayout.razor
@@ -1,4 +1,4 @@
-@using Moonlight.Shared.Components.TicketPopup
+@using Moonlight.Features.Ticketing.UI.Components
 
 <div class="d-flex flex-column flex-root app-root">
     <div class="app-page flex-column flex-column-fluid">
diff --git a/Moonlight/Shared/Layouts/MainLayout.razor b/Moonlight/Core/UI/Layouts/MainLayout.razor
similarity index 92%
rename from Moonlight/Shared/Layouts/MainLayout.razor
rename to Moonlight/Core/UI/Layouts/MainLayout.razor
index cb58c9f..9203136 100644
--- a/Moonlight/Shared/Layouts/MainLayout.razor
+++ b/Moonlight/Core/UI/Layouts/MainLayout.razor
@@ -1,9 +1,12 @@
-@using Moonlight.App.Services
-@using Moonlight.App.Models.Abstractions
-@using Moonlight.App.Models.Enums
-@using Moonlight.Shared.Components.Auth
-@using Moonlight.App.Event
-@using Moonlight.App.Services.Utils
+@using Moonlight.Core.Models.Abstractions
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Core.Services.Utils
+@using Moonlight.Core.Event
+@using Moonlight.Core.UI.Components.Auth
+@using Moonlight.Features.Advertisement.Services
+@using Moonlight.Features.Advertisement.UI.Components
 
 @inherits LayoutComponentBase
 @implements IDisposable
diff --git a/Moonlight/Shared/Layouts/OverlayLayout.razor b/Moonlight/Core/UI/Layouts/OverlayLayout.razor
similarity index 100%
rename from Moonlight/Shared/Layouts/OverlayLayout.razor
rename to Moonlight/Core/UI/Layouts/OverlayLayout.razor
diff --git a/Moonlight/Shared/Views/Account/Index.razor b/Moonlight/Core/UI/Views/Account/Index.razor
similarity index 95%
rename from Moonlight/Shared/Views/Account/Index.razor
rename to Moonlight/Core/UI/Views/Account/Index.razor
index bf28559..83dc81b 100644
--- a/Moonlight/Shared/Views/Account/Index.razor
+++ b/Moonlight/Core/UI/Views/Account/Index.razor
@@ -1,9 +1,10 @@
 @page "/account"
-
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Users
-@using Moonlight.App.Models.Forms
-@using Moonlight.App.Models.Forms.Auth
+@using Moonlight.Core.Models.Forms
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Forms.Auth
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Core.Services.Users
 
 @inject IdentityService IdentityService
 @inject UserService UserService
diff --git a/Moonlight/Shared/Views/Account/Payments.razor b/Moonlight/Core/UI/Views/Account/Payments.razor
similarity index 94%
rename from Moonlight/Shared/Views/Account/Payments.razor
rename to Moonlight/Core/UI/Views/Account/Payments.razor
index 160ffd6..359b140 100644
--- a/Moonlight/Shared/Views/Account/Payments.razor
+++ b/Moonlight/Core/UI/Views/Account/Payments.razor
@@ -1,10 +1,13 @@
 @page "/account/payments"
-
-@using Moonlight.App.Services
-@using Moonlight.App.Database.Entities.Store
 @using BlazorTable
-@using Moonlight.App.Models.Abstractions
-@using Moonlight.App.Services.Store
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Abstractions
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.StoreSystem.Entities
+@using Moonlight.Features.StoreSystem.Models.Abstractions
+@using Moonlight.Features.StoreSystem.Services
 
 @inject IdentityService IdentityService
 @inject ConfigService ConfigService
diff --git a/Moonlight/Shared/Views/Account/Security.razor b/Moonlight/Core/UI/Views/Account/Security.razor
similarity index 97%
rename from Moonlight/Shared/Views/Account/Security.razor
rename to Moonlight/Core/UI/Views/Account/Security.razor
index 1f4f293..33a6817 100644
--- a/Moonlight/Shared/Views/Account/Security.razor
+++ b/Moonlight/Core/UI/Views/Account/Security.razor
@@ -1,11 +1,12 @@
 @page "/account/security"
-
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Users
 @using OtpNet
 @using QRCoder
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Models.Forms.Auth
+@using Moonlight.Core.Models.Forms.Auth
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Core.Services.Users
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Models.Enums
 
 @inject IdentityService IdentityService
 @inject UserService UserService
diff --git a/Moonlight/Core/UI/Views/Admin/Index.razor b/Moonlight/Core/UI/Views/Admin/Index.razor
new file mode 100644
index 0000000..2000df3
--- /dev/null
+++ b/Moonlight/Core/UI/Views/Admin/Index.razor
@@ -0,0 +1,5 @@
+@page "/admin"
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+
+@attribute [RequirePermission(Permission.AdminOverview)]
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Admin/Services/Index.razor b/Moonlight/Core/UI/Views/Admin/Services/Index.razor
similarity index 94%
rename from Moonlight/Shared/Views/Admin/Services/Index.razor
rename to Moonlight/Core/UI/Views/Admin/Services/Index.razor
index 7b755ee..06d5939 100644
--- a/Moonlight/Shared/Views/Admin/Services/Index.razor
+++ b/Moonlight/Core/UI/Views/Admin/Services/Index.razor
@@ -1,11 +1,10 @@
 @page "/admin/services"
-
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Store
 @using Microsoft.EntityFrameworkCore
 @using BlazorTable
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Features.ServiceManagement.Entities
 
 @attribute [RequirePermission(Permission.AdminServices)]
 
diff --git a/Moonlight/Shared/Views/Admin/Services/View.razor b/Moonlight/Core/UI/Views/Admin/Services/View.razor
similarity index 87%
rename from Moonlight/Shared/Views/Admin/Services/View.razor
rename to Moonlight/Core/UI/Views/Admin/Services/View.razor
index f16f1ff..dedfe3b 100644
--- a/Moonlight/Shared/Views/Admin/Services/View.razor
+++ b/Moonlight/Core/UI/Views/Admin/Services/View.razor
@@ -1,13 +1,12 @@
 @page "/admin/services/view/{Id:int}/{Route?}"
-
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Services.ServiceManage
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Abstractions.Services
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Services
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Models.Abstractions
+@using Moonlight.Features.ServiceManagement.Services
 
 @attribute [RequirePermission(Permission.AdminServices)]
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/Diagnose.razor b/Moonlight/Core/UI/Views/Admin/Sys/Diagnose.razor
similarity index 85%
rename from Moonlight/Shared/Views/Admin/Sys/Diagnose.razor
rename to Moonlight/Core/UI/Views/Admin/Sys/Diagnose.razor
index 22f0403..be0cb39 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Diagnose.razor
+++ b/Moonlight/Core/UI/Views/Admin/Sys/Diagnose.razor
@@ -1,7 +1,8 @@
 @page "/admin/sys/diagnose"
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Services.Sys
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
 
 @attribute [RequirePermission(Permission.AdminRoot)]
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/Index.razor b/Moonlight/Core/UI/Views/Admin/Sys/Index.razor
similarity index 71%
rename from Moonlight/Shared/Views/Admin/Sys/Index.razor
rename to Moonlight/Core/UI/Views/Admin/Sys/Index.razor
index a0c32fc..37bfa4f 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Index.razor
+++ b/Moonlight/Core/UI/Views/Admin/Sys/Index.razor
@@ -1,9 +1,7 @@
 @page "/admin/sys"
-
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Sys
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Services
 
 @attribute [RequirePermission(Permission.AdminRoot)]
 
diff --git a/Moonlight/Shared/Views/Admin/Sys/Settings.razor b/Moonlight/Core/UI/Views/Admin/Sys/Settings.razor
similarity index 96%
rename from Moonlight/Shared/Views/Admin/Sys/Settings.razor
rename to Moonlight/Core/UI/Views/Admin/Sys/Settings.razor
index 9f4cfe1..c559cfc 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Settings.razor
+++ b/Moonlight/Core/UI/Views/Admin/Sys/Settings.razor
@@ -1,8 +1,10 @@
 @page "/admin/sys/settings"
-@using Moonlight.App.Services
 @using System.Reflection
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
 
 @attribute [RequirePermission(Permission.AdminRoot)]
 
diff --git a/Moonlight/Shared/Views/Admin/Users/Index.razor b/Moonlight/Core/UI/Views/Admin/Users/Index.razor
similarity index 90%
rename from Moonlight/Shared/Views/Admin/Users/Index.razor
rename to Moonlight/Core/UI/Views/Admin/Users/Index.razor
index a73473c..ea0ca09 100644
--- a/Moonlight/Shared/Views/Admin/Users/Index.razor
+++ b/Moonlight/Core/UI/Views/Admin/Users/Index.razor
@@ -1,9 +1,10 @@
 @page "/admin/users"
-
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Repositories
 @using BlazorTable
+@using Moonlight.Core.Database.Entities
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
 
 @attribute [RequirePermission(Permission.AdminUsers)]
 
diff --git a/Moonlight/Shared/Views/Admin/Users/Sessions.razor b/Moonlight/Core/UI/Views/Admin/Users/Sessions.razor
similarity index 93%
rename from Moonlight/Shared/Views/Admin/Users/Sessions.razor
rename to Moonlight/Core/UI/Views/Admin/Users/Sessions.razor
index dab5f2e..dd19fd3 100644
--- a/Moonlight/Shared/Views/Admin/Users/Sessions.razor
+++ b/Moonlight/Core/UI/Views/Admin/Users/Sessions.razor
@@ -1,10 +1,10 @@
 @page "/admin/users/sessions"
-
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
 @using BlazorTable
-@using Moonlight.App.Models.Abstractions
-@using Moonlight.App.Services
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Abstractions
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Services
 
 @attribute [RequirePermission(Permission.AdminSessions)]
 
diff --git a/Moonlight/Shared/Views/Admin/Users/View.razor b/Moonlight/Core/UI/Views/Admin/Users/View.razor
similarity index 95%
rename from Moonlight/Shared/Views/Admin/Users/View.razor
rename to Moonlight/Core/UI/Views/Admin/Users/View.razor
index b343cba..324b6b9 100644
--- a/Moonlight/Shared/Views/Admin/Users/View.razor
+++ b/Moonlight/Core/UI/Views/Admin/Users/View.razor
@@ -1,15 +1,18 @@
 @page "/admin/users/view/{Id:int}"
-
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Repositories
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Models.Forms.Admin.Users
-@using Moonlight.App.Services
 @using Mappy.Net
 @using BlazorTable
-@using Moonlight.App.Services.Users
+@using Moonlight.Core.Database.Entities
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Models.Forms.Admin.Users
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Core.Services.Users
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.StoreSystem.Entities
 
 @attribute [RequirePermission(Permission.AdminUsers)]
 
diff --git a/Moonlight/Shared/Views/Index.razor b/Moonlight/Core/UI/Views/Index.razor
similarity index 98%
rename from Moonlight/Shared/Views/Index.razor
rename to Moonlight/Core/UI/Views/Index.razor
index 4444fe7..82b9cd6 100644
--- a/Moonlight/Shared/Views/Index.razor
+++ b/Moonlight/Core/UI/Views/Index.razor
@@ -1,6 +1,6 @@
 @page "/"
 
-@using Moonlight.App.Services
+@using Moonlight.Core.Services
 
 @inject IdentityService IdentityService
 
diff --git a/Moonlight/Features/Advertisement/Configuration/AdvertisementData.cs b/Moonlight/Features/Advertisement/Configuration/AdvertisementData.cs
new file mode 100644
index 0000000..8904687
--- /dev/null
+++ b/Moonlight/Features/Advertisement/Configuration/AdvertisementData.cs
@@ -0,0 +1,11 @@
+using System.ComponentModel;
+using Newtonsoft.Json;
+
+namespace Moonlight.Features.Advertisement.Configuration;
+
+public class AdvertisementData
+{
+    [JsonProperty("PreventAdBlockers")]
+    [Description("This prevents users from using ad blockers while using moonlight. (Note: The detection might not always work)")]
+    public bool PreventAdBlockers { get; set; }
+}
\ No newline at end of file
diff --git a/Moonlight/App/Services/Interop/AdBlockService.cs b/Moonlight/Features/Advertisement/Services/AdBlockService.cs
similarity index 87%
rename from Moonlight/App/Services/Interop/AdBlockService.cs
rename to Moonlight/Features/Advertisement/Services/AdBlockService.cs
index 074f807..74061af 100644
--- a/Moonlight/App/Services/Interop/AdBlockService.cs
+++ b/Moonlight/Features/Advertisement/Services/AdBlockService.cs
@@ -1,7 +1,7 @@
 using Microsoft.JSInterop;
-using Moonlight.App.Helpers;
+using Moonlight.Core.Helpers;
 
-namespace Moonlight.App.Services.Interop;
+namespace Moonlight.Features.Advertisement.Services;
 
 public class AdBlockService
 {
diff --git a/Moonlight/Shared/Components/Alerts/AdBlockAlert.razor b/Moonlight/Features/Advertisement/UI/Components/AdBlockAlert.razor
similarity index 100%
rename from Moonlight/Shared/Components/Alerts/AdBlockAlert.razor
rename to Moonlight/Features/Advertisement/UI/Components/AdBlockAlert.razor
diff --git a/Moonlight/App/Database/Enums/PostType.cs b/Moonlight/Features/Community/Entities/Enums/PostType.cs
similarity index 56%
rename from Moonlight/App/Database/Enums/PostType.cs
rename to Moonlight/Features/Community/Entities/Enums/PostType.cs
index 4555a3b..4899855 100644
--- a/Moonlight/App/Database/Enums/PostType.cs
+++ b/Moonlight/Features/Community/Entities/Enums/PostType.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Enums;
+namespace Moonlight.Features.Community.Entities.Enums;
 
 public enum PostType
 {
diff --git a/Moonlight/App/Database/Entities/Community/Post.cs b/Moonlight/Features/Community/Entities/Post.cs
similarity index 76%
rename from Moonlight/App/Database/Entities/Community/Post.cs
rename to Moonlight/Features/Community/Entities/Post.cs
index 2d4af22..09b92be 100644
--- a/Moonlight/App/Database/Entities/Community/Post.cs
+++ b/Moonlight/Features/Community/Entities/Post.cs
@@ -1,6 +1,7 @@
-using Moonlight.App.Database.Enums;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Features.Community.Entities.Enums;
 
-namespace Moonlight.App.Database.Entities.Community;
+namespace Moonlight.Features.Community.Entities;
 
 public class Post
 {
diff --git a/Moonlight/App/Database/Entities/Community/PostComment.cs b/Moonlight/Features/Community/Entities/PostComment.cs
similarity index 74%
rename from Moonlight/App/Database/Entities/Community/PostComment.cs
rename to Moonlight/Features/Community/Entities/PostComment.cs
index 633bf41..545f81d 100644
--- a/Moonlight/App/Database/Entities/Community/PostComment.cs
+++ b/Moonlight/Features/Community/Entities/PostComment.cs
@@ -1,4 +1,6 @@
-namespace Moonlight.App.Database.Entities.Community;
+using Moonlight.Core.Database.Entities;
+
+namespace Moonlight.Features.Community.Entities;
 
 public class PostComment
 {
diff --git a/Moonlight/App/Database/Entities/Community/PostLike.cs b/Moonlight/Features/Community/Entities/PostLike.cs
similarity index 62%
rename from Moonlight/App/Database/Entities/Community/PostLike.cs
rename to Moonlight/Features/Community/Entities/PostLike.cs
index 0d0085d..4cb0cad 100644
--- a/Moonlight/App/Database/Entities/Community/PostLike.cs
+++ b/Moonlight/Features/Community/Entities/PostLike.cs
@@ -1,4 +1,6 @@
-namespace Moonlight.App.Database.Entities.Community;
+using Moonlight.Core.Database.Entities;
+
+namespace Moonlight.Features.Community.Entities;
 
 public class PostLike
 {
diff --git a/Moonlight/App/Database/Entities/Community/WordFilter.cs b/Moonlight/Features/Community/Entities/WordFilter.cs
similarity index 64%
rename from Moonlight/App/Database/Entities/Community/WordFilter.cs
rename to Moonlight/Features/Community/Entities/WordFilter.cs
index 8d08115..e0ab97e 100644
--- a/Moonlight/App/Database/Entities/Community/WordFilter.cs
+++ b/Moonlight/Features/Community/Entities/WordFilter.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Entities.Community;
+namespace Moonlight.Features.Community.Entities;
 
 public class WordFilter
 {
diff --git a/Moonlight/App/Models/Forms/Community/AddPostForm.cs b/Moonlight/Features/Community/Models/Forms/AddPostForm.cs
similarity index 92%
rename from Moonlight/App/Models/Forms/Community/AddPostForm.cs
rename to Moonlight/Features/Community/Models/Forms/AddPostForm.cs
index c4dded8..5f8c5bf 100644
--- a/Moonlight/App/Models/Forms/Community/AddPostForm.cs
+++ b/Moonlight/Features/Community/Models/Forms/AddPostForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Community;
+namespace Moonlight.Features.Community.Models.Forms;
 
 public class AddPostForm
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Community/AddWordFilter.cs b/Moonlight/Features/Community/Models/Forms/Admin/AddWordFilter.cs
similarity index 85%
rename from Moonlight/App/Models/Forms/Admin/Community/AddWordFilter.cs
rename to Moonlight/Features/Community/Models/Forms/Admin/AddWordFilter.cs
index b059a13..ac434ec 100644
--- a/Moonlight/App/Models/Forms/Admin/Community/AddWordFilter.cs
+++ b/Moonlight/Features/Community/Models/Forms/Admin/AddWordFilter.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Community;
+namespace Moonlight.Features.Community.Models.Forms.Admin;
 
 public class AddWordFilter
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Community/EditWordFilter.cs b/Moonlight/Features/Community/Models/Forms/Admin/EditWordFilter.cs
similarity index 85%
rename from Moonlight/App/Models/Forms/Admin/Community/EditWordFilter.cs
rename to Moonlight/Features/Community/Models/Forms/Admin/EditWordFilter.cs
index c87cbc1..97f421b 100644
--- a/Moonlight/App/Models/Forms/Admin/Community/EditWordFilter.cs
+++ b/Moonlight/Features/Community/Models/Forms/Admin/EditWordFilter.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Community;
+namespace Moonlight.Features.Community.Models.Forms.Admin;
 
 public class EditWordFilter
 {
diff --git a/Moonlight/App/Services/Community/PostService.cs b/Moonlight/Features/Community/Services/PostService.cs
similarity index 95%
rename from Moonlight/App/Services/Community/PostService.cs
rename to Moonlight/Features/Community/Services/PostService.cs
index 0e1f56b..63e6519 100644
--- a/Moonlight/App/Services/Community/PostService.cs
+++ b/Moonlight/Features/Community/Services/PostService.cs
@@ -1,14 +1,14 @@
 using System.Text.RegularExpressions;
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Community;
-using Moonlight.App.Database.Enums;
-using Moonlight.App.Event;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Extensions;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Event;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Extensions;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.Community.Entities;
+using Moonlight.Features.Community.Entities.Enums;
 
-namespace Moonlight.App.Services.Community;
+namespace Moonlight.Features.Community.Services;
 
 public class PostService
 {
diff --git a/Moonlight/Shared/Components/Navigations/AdminCommunityNavigation.razor b/Moonlight/Features/Community/UI/Components/AdminCommunityNavigation.razor
similarity index 100%
rename from Moonlight/Shared/Components/Navigations/AdminCommunityNavigation.razor
rename to Moonlight/Features/Community/UI/Components/AdminCommunityNavigation.razor
diff --git a/Moonlight/Shared/Components/Navigations/CommunityNavigation.razor b/Moonlight/Features/Community/UI/Components/CommunityNavigation.razor
similarity index 100%
rename from Moonlight/Shared/Components/Navigations/CommunityNavigation.razor
rename to Moonlight/Features/Community/UI/Components/CommunityNavigation.razor
diff --git a/Moonlight/Shared/Components/Modals/Community/CreatePostModal.razor b/Moonlight/Features/Community/UI/Components/CreatePostModal.razor
similarity index 89%
rename from Moonlight/Shared/Components/Modals/Community/CreatePostModal.razor
rename to Moonlight/Features/Community/UI/Components/CreatePostModal.razor
index 9d89e4c..03955cc 100644
--- a/Moonlight/Shared/Components/Modals/Community/CreatePostModal.razor
+++ b/Moonlight/Features/Community/UI/Components/CreatePostModal.razor
@@ -1,7 +1,8 @@
-@using Moonlight.App.Models.Forms.Community
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Community
-@using Moonlight.App.Database.Enums
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.Community.Entities.Enums
+@using Moonlight.Features.Community.Models.Forms
+@using Moonlight.Features.Community.Services
 
 @inject PostService PostService
 @inject IdentityService IdentityService
diff --git a/Moonlight/Shared/Components/Community/PostView.razor b/Moonlight/Features/Community/UI/Components/PostView.razor
similarity index 97%
rename from Moonlight/Shared/Components/Community/PostView.razor
rename to Moonlight/Features/Community/UI/Components/PostView.razor
index 1ecaac4..c9fd7ed 100644
--- a/Moonlight/Shared/Components/Community/PostView.razor
+++ b/Moonlight/Features/Community/UI/Components/PostView.razor
@@ -1,10 +1,12 @@
-@using Moonlight.App.Database.Entities.Community
-@using Ganss.Xss
+@using Ganss.Xss
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Repositories
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Community
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.Community.Entities
+@using Moonlight.Features.Community.Services
 
 @inject Repository<Post> PostRepository
 @inject IdentityService IdentityService
diff --git a/Moonlight/Shared/Views/Admin/Community/Filter.razor b/Moonlight/Features/Community/UI/Views/Admin/Filter.razor
similarity index 79%
rename from Moonlight/Shared/Views/Admin/Community/Filter.razor
rename to Moonlight/Features/Community/UI/Views/Admin/Filter.razor
index 149e041..0f9bd85 100644
--- a/Moonlight/Shared/Views/Admin/Community/Filter.razor
+++ b/Moonlight/Features/Community/UI/Views/Admin/Filter.razor
@@ -1,11 +1,12 @@
 @page "/admin/community/filter"
 
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
 @using BlazorTable
-@using Moonlight.App.Database.Entities.Community
-@using Moonlight.App.Models.Forms.Admin.Community
-@using Moonlight.App.Repositories
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Features.Community.Entities
+@using Moonlight.Features.Community.Models.Forms.Admin
+@using Moonlight.Features.Community.UI.Components
 
 @attribute [RequirePermission(Permission.AdminCommunity)]
 
diff --git a/Moonlight/Features/Community/UI/Views/Admin/Index.razor b/Moonlight/Features/Community/UI/Views/Admin/Index.razor
new file mode 100644
index 0000000..d1dda89
--- /dev/null
+++ b/Moonlight/Features/Community/UI/Views/Admin/Index.razor
@@ -0,0 +1,9 @@
+@page "/admin/community"
+
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Features.Community.UI.Components
+
+@attribute [RequirePermission(Permission.AdminCommunity)]
+
+<AdminCommunityNavigation Index="0" />
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Community/Events.razor b/Moonlight/Features/Community/UI/Views/Events.razor
similarity index 85%
rename from Moonlight/Shared/Views/Community/Events.razor
rename to Moonlight/Features/Community/UI/Views/Events.razor
index a7a4d97..9055b26 100644
--- a/Moonlight/Shared/Views/Community/Events.razor
+++ b/Moonlight/Features/Community/UI/Views/Events.razor
@@ -1,13 +1,12 @@
 @page "/community/events"
 
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Community
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Database.Enums
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Services
-@using Moonlight.Shared.Components.Community
-@using Moonlight.Shared.Components.Modals.Community
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Features.Community.Entities
+@using Moonlight.Features.Community.Entities.Enums
+@using Moonlight.Features.Community.UI.Components
 
 @inject IdentityService IdentityService
 @inject Repository<Post> PostRepository
diff --git a/Moonlight/Shared/Views/Community/Index.razor b/Moonlight/Features/Community/UI/Views/Index.razor
similarity index 86%
rename from Moonlight/Shared/Views/Community/Index.razor
rename to Moonlight/Features/Community/UI/Views/Index.razor
index 45a0205..5a0d48c 100644
--- a/Moonlight/Shared/Views/Community/Index.razor
+++ b/Moonlight/Features/Community/UI/Views/Index.razor
@@ -1,13 +1,12 @@
 @page "/community"
 
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Community
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Database.Enums
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Services
-@using Moonlight.Shared.Components.Community
-@using Moonlight.Shared.Components.Modals.Community
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Features.Community.Entities
+@using Moonlight.Features.Community.Entities.Enums
+@using Moonlight.Features.Community.UI.Components
 
 @inject Repository<Post> PostRepository
 @inject IdentityService IdentityService
diff --git a/Moonlight/Shared/Views/Community/Projects.razor b/Moonlight/Features/Community/UI/Views/Projects.razor
similarity index 87%
rename from Moonlight/Shared/Views/Community/Projects.razor
rename to Moonlight/Features/Community/UI/Views/Projects.razor
index 6511b35..7bbe54e 100644
--- a/Moonlight/Shared/Views/Community/Projects.razor
+++ b/Moonlight/Features/Community/UI/Views/Projects.razor
@@ -1,11 +1,10 @@
 @page "/community/projects"
 
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Community
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Database.Enums
-@using Moonlight.Shared.Components.Community
-@using Moonlight.Shared.Components.Modals.Community
+@using Moonlight.Core.Repositories
+@using Moonlight.Features.Community.Entities
+@using Moonlight.Features.Community.Entities.Enums
+@using Moonlight.Features.Community.UI.Components
 
 @inject Repository<Post> PostRepository
 
diff --git a/Moonlight/App/Database/Enums/ServiceType.cs b/Moonlight/Features/ServiceManagement/Entities/Enums/ServiceType.cs
similarity index 53%
rename from Moonlight/App/Database/Enums/ServiceType.cs
rename to Moonlight/Features/ServiceManagement/Entities/Enums/ServiceType.cs
index 1f2c4d1..50df6dd 100644
--- a/Moonlight/App/Database/Enums/ServiceType.cs
+++ b/Moonlight/Features/ServiceManagement/Entities/Enums/ServiceType.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Enums;
+namespace Moonlight.Features.ServiceManagement.Entities.Enums;
 
 public enum ServiceType
 {
diff --git a/Moonlight/App/Database/Entities/Store/Service.cs b/Moonlight/Features/ServiceManagement/Entities/Service.cs
similarity index 76%
rename from Moonlight/App/Database/Entities/Store/Service.cs
rename to Moonlight/Features/ServiceManagement/Entities/Service.cs
index 8f65996..7e1c624 100644
--- a/Moonlight/App/Database/Entities/Store/Service.cs
+++ b/Moonlight/Features/ServiceManagement/Entities/Service.cs
@@ -1,4 +1,7 @@
-namespace Moonlight.App.Database.Entities.Store;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Features.StoreSystem.Entities;
+
+namespace Moonlight.Features.ServiceManagement.Entities;
 
 public class Service
 {
diff --git a/Moonlight/Features/ServiceManagement/Entities/ServiceShare.cs b/Moonlight/Features/ServiceManagement/Entities/ServiceShare.cs
new file mode 100644
index 0000000..20b5f8a
--- /dev/null
+++ b/Moonlight/Features/ServiceManagement/Entities/ServiceShare.cs
@@ -0,0 +1,9 @@
+using Moonlight.Core.Database.Entities;
+
+namespace Moonlight.Features.ServiceManagement.Entities;
+
+public class ServiceShare
+{
+    public int Id { get; set; }
+    public User User { get; set; }
+}
\ No newline at end of file
diff --git a/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceActions.cs b/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceActions.cs
new file mode 100644
index 0000000..2c04d8a
--- /dev/null
+++ b/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceActions.cs
@@ -0,0 +1,10 @@
+using Moonlight.Features.ServiceManagement.Entities;
+
+namespace Moonlight.Features.ServiceManagement.Models.Abstractions;
+
+public abstract class ServiceActions
+{
+    public abstract Task Create(IServiceProvider provider, Service service);
+    public abstract Task Update(IServiceProvider provider, Service service);
+    public abstract Task Delete(IServiceProvider provider, Service service);
+}
\ No newline at end of file
diff --git a/Moonlight/App/Models/Abstractions/Services/ServiceDefinition.cs b/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceDefinition.cs
similarity index 69%
rename from Moonlight/App/Models/Abstractions/Services/ServiceDefinition.cs
rename to Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceDefinition.cs
index 0aafded..221ffbe 100644
--- a/Moonlight/App/Models/Abstractions/Services/ServiceDefinition.cs
+++ b/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceDefinition.cs
@@ -1,7 +1,4 @@
-using Microsoft.AspNetCore.Components;
-using Moonlight.App.Database.Entities;
-
-namespace Moonlight.App.Models.Abstractions.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 public abstract class ServiceDefinition
 {
diff --git a/Moonlight/App/Models/Abstractions/Services/ServiceUiPage.cs b/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceUiPage.cs
similarity index 77%
rename from Moonlight/App/Models/Abstractions/Services/ServiceUiPage.cs
rename to Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceUiPage.cs
index 19a0ef0..27f866f 100644
--- a/Moonlight/App/Models/Abstractions/Services/ServiceUiPage.cs
+++ b/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceUiPage.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace Moonlight.App.Models.Abstractions.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 public class ServiceUiPage
 {
diff --git a/Moonlight/App/Models/Abstractions/Services/ServiceViewContext.cs b/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceViewContext.cs
similarity index 73%
rename from Moonlight/App/Models/Abstractions/Services/ServiceViewContext.cs
rename to Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceViewContext.cs
index cc7bf80..e02b7b5 100644
--- a/Moonlight/App/Models/Abstractions/Services/ServiceViewContext.cs
+++ b/Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceViewContext.cs
@@ -1,9 +1,10 @@
 using Microsoft.AspNetCore.Components;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Helpers;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Helpers;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Models.Abstractions.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 public class ServiceViewContext
 {
diff --git a/Moonlight/App/Models/Forms/Services/AddUserToServiceForm.cs b/Moonlight/Features/ServiceManagement/Models/Forms/AddUserToServiceForm.cs
similarity index 88%
rename from Moonlight/App/Models/Forms/Services/AddUserToServiceForm.cs
rename to Moonlight/Features/ServiceManagement/Models/Forms/AddUserToServiceForm.cs
index 9109f1c..48afc85 100644
--- a/Moonlight/App/Models/Forms/Services/AddUserToServiceForm.cs
+++ b/Moonlight/Features/ServiceManagement/Models/Forms/AddUserToServiceForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Forms;
 
 public class AddUserToServiceForm
 {
diff --git a/Moonlight/App/Services/ServiceManage/ServiceAdminService.cs b/Moonlight/Features/ServiceManagement/Services/ServiceAdminService.cs
similarity index 90%
rename from Moonlight/App/Services/ServiceManage/ServiceAdminService.cs
rename to Moonlight/Features/ServiceManagement/Services/ServiceAdminService.cs
index a22bf95..b50781f 100644
--- a/Moonlight/App/Services/ServiceManage/ServiceAdminService.cs
+++ b/Moonlight/Features/ServiceManagement/Services/ServiceAdminService.cs
@@ -1,10 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Services.ServiceManage;
+namespace Moonlight.Features.ServiceManagement.Services;
 
 public class ServiceAdminService
 {
diff --git a/Moonlight/App/Services/ServiceManage/ServiceDefinitionService.cs b/Moonlight/Features/ServiceManagement/Services/ServiceDefinitionService.cs
similarity index 83%
rename from Moonlight/App/Services/ServiceManage/ServiceDefinitionService.cs
rename to Moonlight/Features/ServiceManagement/Services/ServiceDefinitionService.cs
index 20c59d5..0044c2e 100644
--- a/Moonlight/App/Services/ServiceManage/ServiceDefinitionService.cs
+++ b/Moonlight/Features/ServiceManagement/Services/ServiceDefinitionService.cs
@@ -1,11 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Enums;
-using Moonlight.App.Models.Abstractions;
-using Moonlight.App.Models.Abstractions.Services;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Services.ServiceManage;
+namespace Moonlight.Features.ServiceManagement.Services;
 
 public class ServiceDefinitionService
 {
diff --git a/Moonlight/App/Services/ServiceManage/ServiceManageService.cs b/Moonlight/Features/ServiceManagement/Services/ServiceManageService.cs
similarity index 86%
rename from Moonlight/App/Services/ServiceManage/ServiceManageService.cs
rename to Moonlight/Features/ServiceManagement/Services/ServiceManageService.cs
index 8858fcc..5bcd40e 100644
--- a/Moonlight/App/Services/ServiceManage/ServiceManageService.cs
+++ b/Moonlight/Features/ServiceManagement/Services/ServiceManageService.cs
@@ -1,11 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Models.Abstractions;
-using Moonlight.App.Models.Enums;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Models.Abstractions;
+using Moonlight.Core.Models.Enums;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
 
-namespace Moonlight.App.Services.ServiceManage;
+namespace Moonlight.Features.ServiceManagement.Services;
 
 public class ServiceManageService
 {
diff --git a/Moonlight/App/Services/ServiceManage/ServiceService.cs b/Moonlight/Features/ServiceManagement/Services/ServiceService.cs
similarity index 94%
rename from Moonlight/App/Services/ServiceManage/ServiceService.cs
rename to Moonlight/Features/ServiceManagement/Services/ServiceService.cs
index 24ab12d..2d23083 100644
--- a/Moonlight/App/Services/ServiceManage/ServiceService.cs
+++ b/Moonlight/Features/ServiceManagement/Services/ServiceService.cs
@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
 
-namespace Moonlight.App.Services.ServiceManage;
+namespace Moonlight.Features.ServiceManagement.Services;
 
 public class ServiceService // This service is used for managing services and create the connection to the actual logic behind a service type
 {
diff --git a/Moonlight/Shared/Components/Modals/ManageServiceShareModal.razor b/Moonlight/Features/ServiceManagement/UI/Components/ManageServiceShareModal.razor
similarity index 94%
rename from Moonlight/Shared/Components/Modals/ManageServiceShareModal.razor
rename to Moonlight/Features/ServiceManagement/UI/Components/ManageServiceShareModal.razor
index 693bcd5..d8e5bd8 100644
--- a/Moonlight/Shared/Components/Modals/ManageServiceShareModal.razor
+++ b/Moonlight/Features/ServiceManagement/UI/Components/ManageServiceShareModal.razor
@@ -1,7 +1,8 @@
-@using Moonlight.App.Services.ServiceManage
-@using Moonlight.App.Database.Entities.Store
-@using BlazorTable
-@using Moonlight.App.Models.Forms.Services
+@using BlazorTable
+@using Moonlight.Core.Database.Entities
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Models.Forms
+@using Moonlight.Features.ServiceManagement.Services
 
 @inject ServiceService ServiceService
 
diff --git a/Moonlight/Shared/Components/Alerts/NeedsRenewalAlert.razor b/Moonlight/Features/ServiceManagement/UI/Components/NeedsRenewalAlert.razor
similarity index 100%
rename from Moonlight/Shared/Components/Alerts/NeedsRenewalAlert.razor
rename to Moonlight/Features/ServiceManagement/UI/Components/NeedsRenewalAlert.razor
diff --git a/Moonlight/Shared/Components/Service/ServiceItem.razor b/Moonlight/Features/ServiceManagement/UI/Components/ServiceItem.razor
similarity index 97%
rename from Moonlight/Shared/Components/Service/ServiceItem.razor
rename to Moonlight/Features/ServiceManagement/UI/Components/ServiceItem.razor
index 109cd1e..d42e69f 100644
--- a/Moonlight/Shared/Components/Service/ServiceItem.razor
+++ b/Moonlight/Features/ServiceManagement/UI/Components/ServiceItem.razor
@@ -1,8 +1,10 @@
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Services
-@using Moonlight.App.Services.ServiceManage
-@using Moonlight.App.Services.Store
-@using Moonlight.Shared.Components.Modals
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Services
+@using Moonlight.Features.StoreSystem.Services
 
 @inject ConfigService ConfigService
 @inject ToastService ToastService
diff --git a/Moonlight/Shared/Views/Services/Index.razor b/Moonlight/Features/ServiceManagement/UI/Views/Index.razor
similarity index 93%
rename from Moonlight/Shared/Views/Services/Index.razor
rename to Moonlight/Features/ServiceManagement/UI/Views/Index.razor
index 6c5b8d1..53c92bb 100644
--- a/Moonlight/Shared/Views/Services/Index.razor
+++ b/Moonlight/Features/ServiceManagement/UI/Views/Index.razor
@@ -1,9 +1,10 @@
 @page "/services"
 
-@using Moonlight.App.Services.ServiceManage
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Services
-@using Moonlight.Shared.Components.Service
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Services
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Services
+@using Moonlight.Features.ServiceManagement.UI.Components
 
 @inject ServiceService ServiceService
 @inject IdentityService IdentityService
diff --git a/Moonlight/Shared/Views/Service/Index.razor b/Moonlight/Features/ServiceManagement/UI/Views/View.razor
similarity index 91%
rename from Moonlight/Shared/Views/Service/Index.razor
rename to Moonlight/Features/ServiceManagement/UI/Views/View.razor
index a1c2db6..b66dca3 100644
--- a/Moonlight/Shared/Views/Service/Index.razor
+++ b/Moonlight/Features/ServiceManagement/UI/Views/View.razor
@@ -1,12 +1,11 @@
 @page "/service/{Id:int}/{Route?}"
-
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Services.ServiceManage
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Models.Abstractions.Services
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Services
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Models.Abstractions
+@using Moonlight.Features.ServiceManagement.Services
 
 @inject Repository<Service> ServiceRepository
 @inject ServiceService ServiceService
diff --git a/Moonlight/Features/StoreSystem/Configuration/StoreData.cs b/Moonlight/Features/StoreSystem/Configuration/StoreData.cs
new file mode 100644
index 0000000..fe59504
--- /dev/null
+++ b/Moonlight/Features/StoreSystem/Configuration/StoreData.cs
@@ -0,0 +1,11 @@
+using System.ComponentModel;
+using Newtonsoft.Json;
+
+namespace Moonlight.Features.StoreSystem.Configuration;
+
+public class StoreData
+{
+    [JsonProperty("Currency")]
+    [Description("A string value representing the currency which will be shown to a user")]
+    public string Currency { get; set; } = "€";
+}
\ No newline at end of file
diff --git a/Moonlight/App/Database/Entities/Store/Category.cs b/Moonlight/Features/StoreSystem/Entities/Category.cs
similarity index 77%
rename from Moonlight/App/Database/Entities/Store/Category.cs
rename to Moonlight/Features/StoreSystem/Entities/Category.cs
index da73690..ad88074 100644
--- a/Moonlight/App/Database/Entities/Store/Category.cs
+++ b/Moonlight/Features/StoreSystem/Entities/Category.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Entities.Store;
+namespace Moonlight.Features.StoreSystem.Entities;
 
 public class Category
 {
diff --git a/Moonlight/App/Database/Entities/Store/Coupon.cs b/Moonlight/Features/StoreSystem/Entities/Coupon.cs
similarity index 75%
rename from Moonlight/App/Database/Entities/Store/Coupon.cs
rename to Moonlight/Features/StoreSystem/Entities/Coupon.cs
index f510716..0f5f91e 100644
--- a/Moonlight/App/Database/Entities/Store/Coupon.cs
+++ b/Moonlight/Features/StoreSystem/Entities/Coupon.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Entities.Store;
+namespace Moonlight.Features.StoreSystem.Entities;
 
 public class Coupon
 {
diff --git a/Moonlight/App/Database/Entities/Store/CouponUse.cs b/Moonlight/Features/StoreSystem/Entities/CouponUse.cs
similarity index 63%
rename from Moonlight/App/Database/Entities/Store/CouponUse.cs
rename to Moonlight/Features/StoreSystem/Entities/CouponUse.cs
index d9ae6e5..54007ba 100644
--- a/Moonlight/App/Database/Entities/Store/CouponUse.cs
+++ b/Moonlight/Features/StoreSystem/Entities/CouponUse.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Entities.Store;
+namespace Moonlight.Features.StoreSystem.Entities;
 
 public class CouponUse
 {
diff --git a/Moonlight/App/Database/Entities/Store/GiftCode.cs b/Moonlight/Features/StoreSystem/Entities/GiftCode.cs
similarity index 75%
rename from Moonlight/App/Database/Entities/Store/GiftCode.cs
rename to Moonlight/Features/StoreSystem/Entities/GiftCode.cs
index d422f64..36a784c 100644
--- a/Moonlight/App/Database/Entities/Store/GiftCode.cs
+++ b/Moonlight/Features/StoreSystem/Entities/GiftCode.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Entities.Store;
+namespace Moonlight.Features.StoreSystem.Entities;
 
 public class GiftCode
 {
diff --git a/Moonlight/App/Database/Entities/Store/GiftCodeUse.cs b/Moonlight/Features/StoreSystem/Entities/GiftCodeUse.cs
similarity index 65%
rename from Moonlight/App/Database/Entities/Store/GiftCodeUse.cs
rename to Moonlight/Features/StoreSystem/Entities/GiftCodeUse.cs
index 950ba4d..4a129e7 100644
--- a/Moonlight/App/Database/Entities/Store/GiftCodeUse.cs
+++ b/Moonlight/Features/StoreSystem/Entities/GiftCodeUse.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Entities.Store;
+namespace Moonlight.Features.StoreSystem.Entities;
 
 public class GiftCodeUse
 {
diff --git a/Moonlight/App/Database/Entities/Store/Product.cs b/Moonlight/Features/StoreSystem/Entities/Product.cs
similarity index 83%
rename from Moonlight/App/Database/Entities/Store/Product.cs
rename to Moonlight/Features/StoreSystem/Entities/Product.cs
index df3d6c2..1650085 100644
--- a/Moonlight/App/Database/Entities/Store/Product.cs
+++ b/Moonlight/Features/StoreSystem/Entities/Product.cs
@@ -1,6 +1,6 @@
-using Moonlight.App.Database.Enums;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
 
-namespace Moonlight.App.Database.Entities.Store;
+namespace Moonlight.Features.StoreSystem.Entities;
 
 public class Product
 {
diff --git a/Moonlight/App/Database/Entities/Store/Transaction.cs b/Moonlight/Features/StoreSystem/Entities/Transaction.cs
similarity index 78%
rename from Moonlight/App/Database/Entities/Store/Transaction.cs
rename to Moonlight/Features/StoreSystem/Entities/Transaction.cs
index 53c39fb..feb531e 100644
--- a/Moonlight/App/Database/Entities/Store/Transaction.cs
+++ b/Moonlight/Features/StoreSystem/Entities/Transaction.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Entities.Store;
+namespace Moonlight.Features.StoreSystem.Entities;
 
 public class Transaction
 {
diff --git a/Moonlight/App/Models/Abstractions/PaymentGateway.cs b/Moonlight/Features/StoreSystem/Models/Abstractions/PaymentGateway.cs
similarity index 72%
rename from Moonlight/App/Models/Abstractions/PaymentGateway.cs
rename to Moonlight/Features/StoreSystem/Models/Abstractions/PaymentGateway.cs
index 0690761..1ceb232 100644
--- a/Moonlight/App/Models/Abstractions/PaymentGateway.cs
+++ b/Moonlight/Features/StoreSystem/Models/Abstractions/PaymentGateway.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Abstractions;
+namespace Moonlight.Features.StoreSystem.Models.Abstractions;
 
 public abstract class PaymentGateway
 {
diff --git a/Moonlight/App/Models/Forms/Store/AddCategoryForm.cs b/Moonlight/Features/StoreSystem/Models/Forms/AddCategoryForm.cs
similarity index 89%
rename from Moonlight/App/Models/Forms/Store/AddCategoryForm.cs
rename to Moonlight/Features/StoreSystem/Models/Forms/AddCategoryForm.cs
index 65a3d05..a6a67a4 100644
--- a/Moonlight/App/Models/Forms/Store/AddCategoryForm.cs
+++ b/Moonlight/Features/StoreSystem/Models/Forms/AddCategoryForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Store;
+namespace Moonlight.Features.StoreSystem.Models.Forms;
 
 public class AddCategoryForm
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Store/AddCouponForm.cs b/Moonlight/Features/StoreSystem/Models/Forms/AddCouponForm.cs
similarity index 90%
rename from Moonlight/App/Models/Forms/Admin/Store/AddCouponForm.cs
rename to Moonlight/Features/StoreSystem/Models/Forms/AddCouponForm.cs
index ad36369..7538d50 100644
--- a/Moonlight/App/Models/Forms/Admin/Store/AddCouponForm.cs
+++ b/Moonlight/Features/StoreSystem/Models/Forms/AddCouponForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Store;
+namespace Moonlight.Features.StoreSystem.Models.Forms;
 
 public class AddCouponForm
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Store/AddGiftCodeForm.cs b/Moonlight/Features/StoreSystem/Models/Forms/AddGiftCodeForm.cs
similarity index 90%
rename from Moonlight/App/Models/Forms/Admin/Store/AddGiftCodeForm.cs
rename to Moonlight/Features/StoreSystem/Models/Forms/AddGiftCodeForm.cs
index 29de4cd..e46d578 100644
--- a/Moonlight/App/Models/Forms/Admin/Store/AddGiftCodeForm.cs
+++ b/Moonlight/Features/StoreSystem/Models/Forms/AddGiftCodeForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Store;
+namespace Moonlight.Features.StoreSystem.Models.Forms;
 
 public class AddGiftCodeForm
 {
diff --git a/Moonlight/App/Models/Forms/Store/AddProductForm.cs b/Moonlight/Features/StoreSystem/Models/Forms/AddProductForm.cs
similarity index 87%
rename from Moonlight/App/Models/Forms/Store/AddProductForm.cs
rename to Moonlight/Features/StoreSystem/Models/Forms/AddProductForm.cs
index 5006dde..c8cd95a 100644
--- a/Moonlight/App/Models/Forms/Store/AddProductForm.cs
+++ b/Moonlight/Features/StoreSystem/Models/Forms/AddProductForm.cs
@@ -1,10 +1,10 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Enums;
-using Moonlight.App.Extensions.Attributes;
+using Moonlight.Core.Extensions.Attributes;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Models.Forms.Store;
+namespace Moonlight.Features.StoreSystem.Models.Forms;
 
 public class AddProductForm
 {
diff --git a/Moonlight/App/Models/Forms/Store/EditCategoryForm.cs b/Moonlight/Features/StoreSystem/Models/Forms/EditCategoryForm.cs
similarity index 89%
rename from Moonlight/App/Models/Forms/Store/EditCategoryForm.cs
rename to Moonlight/Features/StoreSystem/Models/Forms/EditCategoryForm.cs
index f53081c..f47a63a 100644
--- a/Moonlight/App/Models/Forms/Store/EditCategoryForm.cs
+++ b/Moonlight/Features/StoreSystem/Models/Forms/EditCategoryForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Store;
+namespace Moonlight.Features.StoreSystem.Models.Forms;
 
 public class EditCategoryForm
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Store/EditCouponForm.cs b/Moonlight/Features/StoreSystem/Models/Forms/EditCouponForm.cs
similarity index 90%
rename from Moonlight/App/Models/Forms/Admin/Store/EditCouponForm.cs
rename to Moonlight/Features/StoreSystem/Models/Forms/EditCouponForm.cs
index 89517f9..02dd8c2 100644
--- a/Moonlight/App/Models/Forms/Admin/Store/EditCouponForm.cs
+++ b/Moonlight/Features/StoreSystem/Models/Forms/EditCouponForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Store;
+namespace Moonlight.Features.StoreSystem.Models.Forms;
 
 public class EditCouponForm
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Store/EditGiftCodeForm.cs b/Moonlight/Features/StoreSystem/Models/Forms/EditGiftCodeForm.cs
similarity index 90%
rename from Moonlight/App/Models/Forms/Admin/Store/EditGiftCodeForm.cs
rename to Moonlight/Features/StoreSystem/Models/Forms/EditGiftCodeForm.cs
index 93bdb84..881cd24 100644
--- a/Moonlight/App/Models/Forms/Admin/Store/EditGiftCodeForm.cs
+++ b/Moonlight/Features/StoreSystem/Models/Forms/EditGiftCodeForm.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Store;
+namespace Moonlight.Features.StoreSystem.Models.Forms;
 
 public class EditGiftCodeForm
 {
diff --git a/Moonlight/App/Models/Forms/Store/EditProductForm.cs b/Moonlight/Features/StoreSystem/Models/Forms/EditProductForm.cs
similarity index 88%
rename from Moonlight/App/Models/Forms/Store/EditProductForm.cs
rename to Moonlight/Features/StoreSystem/Models/Forms/EditProductForm.cs
index 1ba410c..775a1b1 100644
--- a/Moonlight/App/Models/Forms/Store/EditProductForm.cs
+++ b/Moonlight/Features/StoreSystem/Models/Forms/EditProductForm.cs
@@ -1,8 +1,8 @@
 using System.ComponentModel.DataAnnotations;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Enums;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Models.Forms.Store;
+namespace Moonlight.Features.StoreSystem.Models.Forms;
 
 public class EditProductForm
 {
diff --git a/Moonlight/App/Services/Store/StoreAdminService.cs b/Moonlight/Features/StoreSystem/Services/StoreAdminService.cs
similarity index 92%
rename from Moonlight/App/Services/Store/StoreAdminService.cs
rename to Moonlight/Features/StoreSystem/Services/StoreAdminService.cs
index 61648a5..dcdc49b 100644
--- a/Moonlight/App/Services/Store/StoreAdminService.cs
+++ b/Moonlight/Features/StoreSystem/Services/StoreAdminService.cs
@@ -1,11 +1,12 @@
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Enums;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services.ServiceManage;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
+using Moonlight.Features.ServiceManagement.Services;
+using Moonlight.Features.StoreSystem.Entities;
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Services.Store;
+namespace Moonlight.Features.StoreSystem.Services;
 
 public class StoreAdminService
 {
diff --git a/Moonlight/App/Services/Store/StoreGiftService.cs b/Moonlight/Features/StoreSystem/Services/StoreGiftService.cs
similarity index 90%
rename from Moonlight/App/Services/Store/StoreGiftService.cs
rename to Moonlight/Features/StoreSystem/Services/StoreGiftService.cs
index 58f5900..34896da 100644
--- a/Moonlight/App/Services/Store/StoreGiftService.cs
+++ b/Moonlight/Features/StoreSystem/Services/StoreGiftService.cs
@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Services.Store;
+namespace Moonlight.Features.StoreSystem.Services;
 
 public class StoreGiftService
 {
diff --git a/Moonlight/App/Services/Store/StoreOrderService.cs b/Moonlight/Features/StoreSystem/Services/StoreOrderService.cs
similarity index 94%
rename from Moonlight/App/Services/Store/StoreOrderService.cs
rename to Moonlight/Features/StoreSystem/Services/StoreOrderService.cs
index ab5924a..39671f6 100644
--- a/Moonlight/App/Services/Store/StoreOrderService.cs
+++ b/Moonlight/Features/StoreSystem/Services/StoreOrderService.cs
@@ -1,13 +1,14 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Event;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Extensions;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services.ServiceManage;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Event;
+using Moonlight.Core.Exceptions;
+using Moonlight.Core.Extensions;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Services;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Services.Store;
+namespace Moonlight.Features.StoreSystem.Services;
 
 public class StoreOrderService
 {
diff --git a/Moonlight/App/Services/Store/StorePaymentService.cs b/Moonlight/Features/StoreSystem/Services/StorePaymentService.cs
similarity index 60%
rename from Moonlight/App/Services/Store/StorePaymentService.cs
rename to Moonlight/Features/StoreSystem/Services/StorePaymentService.cs
index ed3c5eb..b879f59 100644
--- a/Moonlight/App/Services/Store/StorePaymentService.cs
+++ b/Moonlight/Features/StoreSystem/Services/StorePaymentService.cs
@@ -1,6 +1,7 @@
-using Moonlight.App.Models.Abstractions;
+using Moonlight.Core.Models.Abstractions;
+using Moonlight.Features.StoreSystem.Models.Abstractions;
 
-namespace Moonlight.App.Services.Store;
+namespace Moonlight.Features.StoreSystem.Services;
 
 public class StorePaymentService
 {
diff --git a/Moonlight/App/Services/Store/StoreService.cs b/Moonlight/Features/StoreSystem/Services/StoreService.cs
similarity index 87%
rename from Moonlight/App/Services/Store/StoreService.cs
rename to Moonlight/Features/StoreSystem/Services/StoreService.cs
index 007db86..32e7383 100644
--- a/Moonlight/App/Services/Store/StoreService.cs
+++ b/Moonlight/Features/StoreSystem/Services/StoreService.cs
@@ -1,6 +1,4 @@
-using Moonlight.App.Models.Abstractions;
-
-namespace Moonlight.App.Services.Store;
+namespace Moonlight.Features.StoreSystem.Services;
 
 public class StoreService
 {
diff --git a/Moonlight/App/Services/Store/TransactionService.cs b/Moonlight/Features/StoreSystem/Services/TransactionService.cs
similarity index 79%
rename from Moonlight/App/Services/Store/TransactionService.cs
rename to Moonlight/Features/StoreSystem/Services/TransactionService.cs
index b514d2d..f71e4a6 100644
--- a/Moonlight/App/Services/Store/TransactionService.cs
+++ b/Moonlight/Features/StoreSystem/Services/TransactionService.cs
@@ -1,11 +1,10 @@
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Event;
-using Moonlight.App.Extensions;
-using Moonlight.App.Helpers;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Core.Event;
+using Moonlight.Core.Extensions;
+using Moonlight.Core.Repositories;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.App.Services.Store;
+namespace Moonlight.Features.StoreSystem.Services;
 
 public class TransactionService
 {
diff --git a/Moonlight/Shared/Components/Navigations/AdminStoreNavigation.razor b/Moonlight/Features/StoreSystem/UI/Components/AdminStoreNavigation.razor
similarity index 100%
rename from Moonlight/Shared/Components/Navigations/AdminStoreNavigation.razor
rename to Moonlight/Features/StoreSystem/UI/Components/AdminStoreNavigation.razor
diff --git a/Moonlight/Shared/Components/Store/StoreModals.razor b/Moonlight/Features/StoreSystem/UI/Components/StoreModals.razor
similarity index 97%
rename from Moonlight/Shared/Components/Store/StoreModals.razor
rename to Moonlight/Features/StoreSystem/UI/Components/StoreModals.razor
index dc4bac3..0e247ad 100644
--- a/Moonlight/Shared/Components/Store/StoreModals.razor
+++ b/Moonlight/Features/StoreSystem/UI/Components/StoreModals.razor
@@ -1,9 +1,10 @@
-@using Moonlight.App.Services.Store
-@using Moonlight.App.Models.Forms.Store
-@using Moonlight.App.Database.Enums
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Repositories
-@using Mappy.Net
+@using Mappy.Net
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.ServiceManagement.Entities.Enums
+@using Moonlight.Features.StoreSystem.Entities
+@using Moonlight.Features.StoreSystem.Models.Forms
+@using Moonlight.Features.StoreSystem.Services
 
 @inject StoreService StoreService
 @inject ToastService ToastService
diff --git a/Moonlight/Shared/Views/Admin/Store/Coupons.razor b/Moonlight/Features/StoreSystem/UI/Views/Admin/Coupons.razor
similarity index 83%
rename from Moonlight/Shared/Views/Admin/Store/Coupons.razor
rename to Moonlight/Features/StoreSystem/UI/Views/Admin/Coupons.razor
index a05305e..0c7f36a 100644
--- a/Moonlight/Shared/Views/Admin/Store/Coupons.razor
+++ b/Moonlight/Features/StoreSystem/UI/Views/Admin/Coupons.razor
@@ -1,11 +1,13 @@
 @page "/admin/store/coupons"
 
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Repositories
 @using BlazorTable
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Models.Forms.Admin.Store
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Features.StoreSystem.Entities
+@using Moonlight.Features.StoreSystem.Models.Forms
+@using Moonlight.Features.StoreSystem.UI.Components
 
 @attribute [RequirePermission(Permission.AdminStore)]
 
diff --git a/Moonlight/Shared/Views/Admin/Store/Expired.razor b/Moonlight/Features/StoreSystem/UI/Views/Admin/Expired.razor
similarity index 91%
rename from Moonlight/Shared/Views/Admin/Store/Expired.razor
rename to Moonlight/Features/StoreSystem/UI/Views/Admin/Expired.razor
index c1fb265..aee8f5d 100644
--- a/Moonlight/Shared/Views/Admin/Store/Expired.razor
+++ b/Moonlight/Features/StoreSystem/UI/Views/Admin/Expired.razor
@@ -1,11 +1,13 @@
 @page "/admin/store/expired"
 
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Database.Entities.Store
 @using BlazorTable
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Repositories
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.StoreSystem.UI.Components
 
 @attribute [RequirePermission(Permission.AdminStore)]
 
diff --git a/Moonlight/Shared/Views/Admin/Store/Gifts.razor b/Moonlight/Features/StoreSystem/UI/Views/Admin/Gifts.razor
similarity index 81%
rename from Moonlight/Shared/Views/Admin/Store/Gifts.razor
rename to Moonlight/Features/StoreSystem/UI/Views/Admin/Gifts.razor
index e3f88f6..39dfff1 100644
--- a/Moonlight/Shared/Views/Admin/Store/Gifts.razor
+++ b/Moonlight/Features/StoreSystem/UI/Views/Admin/Gifts.razor
@@ -1,11 +1,13 @@
 @page "/admin/store/gifts"
 
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Models.Forms.Admin.Store
-@using Moonlight.App.Repositories
 @using BlazorTable
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Features.StoreSystem.Entities
+@using Moonlight.Features.StoreSystem.Models.Forms
+@using Moonlight.Features.StoreSystem.UI.Components
 
 @attribute [RequirePermission(Permission.AdminStore)]
 
diff --git a/Moonlight/Features/StoreSystem/UI/Views/Admin/Index.razor b/Moonlight/Features/StoreSystem/UI/Views/Admin/Index.razor
new file mode 100644
index 0000000..be455d5
--- /dev/null
+++ b/Moonlight/Features/StoreSystem/UI/Views/Admin/Index.razor
@@ -0,0 +1,9 @@
+@page "/admin/store"
+
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Features.StoreSystem.UI.Components
+
+@attribute [RequirePermission(Permission.AdminStore)]
+
+<AdminStoreNavigation Index="0"/>
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Store/Index.razor b/Moonlight/Features/StoreSystem/UI/Views/Index.razor
similarity index 96%
rename from Moonlight/Shared/Views/Store/Index.razor
rename to Moonlight/Features/StoreSystem/UI/Views/Index.razor
index c3b1376..d95a947 100644
--- a/Moonlight/Shared/Views/Store/Index.razor
+++ b/Moonlight/Features/StoreSystem/UI/Views/Index.razor
@@ -1,11 +1,13 @@
 @page "/store"
 
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Repositories
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Store
-@using Moonlight.Shared.Components.Store
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.StoreSystem.Entities
+@using Moonlight.Features.StoreSystem.Services
+@using Moonlight.Features.StoreSystem.UI.Components
 
 @inject Repository<Category> CategoryRepository
 @inject Repository<Product> ProductRepository
diff --git a/Moonlight/Shared/Views/Store/Order.razor b/Moonlight/Features/StoreSystem/UI/Views/Order.razor
similarity index 97%
rename from Moonlight/Shared/Views/Store/Order.razor
rename to Moonlight/Features/StoreSystem/UI/Views/Order.razor
index dc08e4c..f49baae 100644
--- a/Moonlight/Shared/Views/Store/Order.razor
+++ b/Moonlight/Features/StoreSystem/UI/Views/Order.razor
@@ -1,9 +1,12 @@
 @page "/store/order/{slug}"
 
-@using Moonlight.App.Services.Store
-@using Moonlight.App.Services
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Repositories
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.StoreSystem.Entities
+@using Moonlight.Features.StoreSystem.Services
 
 @inject ConfigService ConfigService
 @inject StoreService StoreService
diff --git a/Moonlight/Features/Theming/Configuration/ThemeData.cs b/Moonlight/Features/Theming/Configuration/ThemeData.cs
new file mode 100644
index 0000000..cdc872b
--- /dev/null
+++ b/Moonlight/Features/Theming/Configuration/ThemeData.cs
@@ -0,0 +1,8 @@
+using Newtonsoft.Json;
+
+namespace Moonlight.Features.Theming.Configuration;
+
+public class ThemeData
+{
+    [JsonProperty("EnableDefault")] public bool EnableDefault { get; set; } = true;
+}
\ No newline at end of file
diff --git a/Moonlight/App/Database/Entities/Theme.cs b/Moonlight/Features/Theming/Entities/Theme.cs
similarity index 86%
rename from Moonlight/App/Database/Entities/Theme.cs
rename to Moonlight/Features/Theming/Entities/Theme.cs
index 81a17b3..099538b 100644
--- a/Moonlight/App/Database/Entities/Theme.cs
+++ b/Moonlight/Features/Theming/Entities/Theme.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Entities;
+namespace Moonlight.Features.Theming.Entities;
 
 public class Theme
 {
diff --git a/Moonlight/App/Models/Abstractions/ApplicationTheme.cs b/Moonlight/Features/Theming/Models/Abstractions/ApplicationTheme.cs
similarity index 84%
rename from Moonlight/App/Models/Abstractions/ApplicationTheme.cs
rename to Moonlight/Features/Theming/Models/Abstractions/ApplicationTheme.cs
index 60a20f1..5089069 100644
--- a/Moonlight/App/Models/Abstractions/ApplicationTheme.cs
+++ b/Moonlight/Features/Theming/Models/Abstractions/ApplicationTheme.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Abstractions;
+namespace Moonlight.Features.Theming.Models.Abstractions;
 
 public class ApplicationTheme
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Sys/Themes/AddThemeForm.cs b/Moonlight/Features/Theming/Models/Forms/AddThemeForm.cs
similarity index 93%
rename from Moonlight/App/Models/Forms/Admin/Sys/Themes/AddThemeForm.cs
rename to Moonlight/Features/Theming/Models/Forms/AddThemeForm.cs
index 7f048aa..d330146 100644
--- a/Moonlight/App/Models/Forms/Admin/Sys/Themes/AddThemeForm.cs
+++ b/Moonlight/Features/Theming/Models/Forms/AddThemeForm.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Sys.Themes;
+namespace Moonlight.Features.Theming.Models.Forms;
 
 public class AddThemeForm
 {
diff --git a/Moonlight/App/Models/Forms/Admin/Sys/Themes/EditThemeForm.cs b/Moonlight/Features/Theming/Models/Forms/EditThemeForm.cs
similarity index 94%
rename from Moonlight/App/Models/Forms/Admin/Sys/Themes/EditThemeForm.cs
rename to Moonlight/Features/Theming/Models/Forms/EditThemeForm.cs
index ac846b4..4f6435a 100644
--- a/Moonlight/App/Models/Forms/Admin/Sys/Themes/EditThemeForm.cs
+++ b/Moonlight/Features/Theming/Models/Forms/EditThemeForm.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.App.Models.Forms.Admin.Sys.Themes;
+namespace Moonlight.Features.Theming.Models.Forms;
 
 public class EditThemeForm
 {
diff --git a/Moonlight/App/Models/Json/Theme/ThemeExport.cs b/Moonlight/Features/Theming/Models/ThemeExport.cs
similarity index 84%
rename from Moonlight/App/Models/Json/Theme/ThemeExport.cs
rename to Moonlight/Features/Theming/Models/ThemeExport.cs
index fee81d6..75cda78 100644
--- a/Moonlight/App/Models/Json/Theme/ThemeExport.cs
+++ b/Moonlight/Features/Theming/Models/ThemeExport.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Json.Theme;
+namespace Moonlight.Features.Theming.Models;
 
 public class ThemeExport
 {
diff --git a/Moonlight/App/Models/Json/Theme/ThemeImport.cs b/Moonlight/Features/Theming/Models/ThemeImport.cs
similarity index 84%
rename from Moonlight/App/Models/Json/Theme/ThemeImport.cs
rename to Moonlight/Features/Theming/Models/ThemeImport.cs
index 370dbfc..956e5a8 100644
--- a/Moonlight/App/Models/Json/Theme/ThemeImport.cs
+++ b/Moonlight/Features/Theming/Models/ThemeImport.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Json.Theme;
+namespace Moonlight.Features.Theming.Models;
 
 public class ThemeImport
 {
diff --git a/Moonlight/App/Services/Sys/MoonlightThemeService.cs b/Moonlight/Features/Theming/Services/ThemeService.cs
similarity index 76%
rename from Moonlight/App/Services/Sys/MoonlightThemeService.cs
rename to Moonlight/Features/Theming/Services/ThemeService.cs
index 281e3f5..13a8c19 100644
--- a/Moonlight/App/Services/Sys/MoonlightThemeService.cs
+++ b/Moonlight/Features/Theming/Services/ThemeService.cs
@@ -1,16 +1,18 @@
 using Mappy.Net;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Models.Abstractions;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Models.Abstractions;
+using Moonlight.Core.Repositories;
+using Moonlight.Core.Services;
+using Moonlight.Features.Theming.Entities;
+using Moonlight.Features.Theming.Models.Abstractions;
 
-namespace Moonlight.App.Services.Sys;
+namespace Moonlight.Features.Theming.Services;
 
-public class MoonlightThemeService
+public class ThemeService
 {
     private readonly IServiceProvider ServiceProvider;
     private readonly ConfigService ConfigService;
 
-    public MoonlightThemeService(IServiceProvider serviceProvider, ConfigService configService)
+    public ThemeService(IServiceProvider serviceProvider, ConfigService configService)
     {
         ServiceProvider = serviceProvider;
         ConfigService = configService;
diff --git a/Moonlight/Shared/Views/Admin/Sys/Themes.razor b/Moonlight/Features/Theming/UI/Views/Admin/Themes.razor
similarity index 92%
rename from Moonlight/Shared/Views/Admin/Sys/Themes.razor
rename to Moonlight/Features/Theming/UI/Views/Admin/Themes.razor
index 132ed00..8c68446 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Themes.razor
+++ b/Moonlight/Features/Theming/UI/Views/Admin/Themes.razor
@@ -1,13 +1,16 @@
 @page "/admin/sys/themes"
 
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Models.Forms.Admin.Sys.Themes
-@using Moonlight.App.Repositories
 @using BlazorTable
 @using Mappy.Net
 @using Microsoft.AspNetCore.Components.Forms
-@using Moonlight.App.Models.Json.Theme
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.Theming.Entities
+@using Moonlight.Features.Theming.Models
+@using Moonlight.Features.Theming.Models.Forms
 @using Newtonsoft.Json
 
 @attribute [RequirePermission(Permission.AdminRoot)]
diff --git a/Moonlight/App/Database/Enums/TicketPriority.cs b/Moonlight/Features/Ticketing/Entities/Enums/TicketPriority.cs
similarity index 55%
rename from Moonlight/App/Database/Enums/TicketPriority.cs
rename to Moonlight/Features/Ticketing/Entities/Enums/TicketPriority.cs
index 4936372..9cd0d15 100644
--- a/Moonlight/App/Database/Enums/TicketPriority.cs
+++ b/Moonlight/Features/Ticketing/Entities/Enums/TicketPriority.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Database.Enums;
+namespace Moonlight.Features.Ticketing.Entities.Enums;
 
 public enum TicketPriority
 {
diff --git a/Moonlight/App/Database/Entities/Tickets/Ticket.cs b/Moonlight/Features/Ticketing/Entities/Ticket.cs
similarity index 72%
rename from Moonlight/App/Database/Entities/Tickets/Ticket.cs
rename to Moonlight/Features/Ticketing/Entities/Ticket.cs
index fb6e029..564f995 100644
--- a/Moonlight/App/Database/Entities/Tickets/Ticket.cs
+++ b/Moonlight/Features/Ticketing/Entities/Ticket.cs
@@ -1,7 +1,8 @@
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Enums;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.Ticketing.Entities.Enums;
 
-namespace Moonlight.App.Database.Entities.Tickets;
+namespace Moonlight.Features.Ticketing.Entities;
 
 public class Ticket
 {
diff --git a/Moonlight/App/Database/Entities/Tickets/TicketMessage.cs b/Moonlight/Features/Ticketing/Entities/TicketMessage.cs
similarity index 74%
rename from Moonlight/App/Database/Entities/Tickets/TicketMessage.cs
rename to Moonlight/Features/Ticketing/Entities/TicketMessage.cs
index 84caee3..ec7d2c0 100644
--- a/Moonlight/App/Database/Entities/Tickets/TicketMessage.cs
+++ b/Moonlight/Features/Ticketing/Entities/TicketMessage.cs
@@ -1,4 +1,6 @@
-namespace Moonlight.App.Database.Entities.Tickets;
+using Moonlight.Core.Database.Entities;
+
+namespace Moonlight.Features.Ticketing.Entities;
 
 public class TicketMessage
 {
diff --git a/Moonlight/App/Models/Forms/Ticketing/CreateTicketForm.cs b/Moonlight/Features/Ticketing/Models/Forms/CreateTicketForm.cs
similarity index 90%
rename from Moonlight/App/Models/Forms/Ticketing/CreateTicketForm.cs
rename to Moonlight/Features/Ticketing/Models/Forms/CreateTicketForm.cs
index 2c57b96..6a1091e 100644
--- a/Moonlight/App/Models/Forms/Ticketing/CreateTicketForm.cs
+++ b/Moonlight/Features/Ticketing/Models/Forms/CreateTicketForm.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using Moonlight.App.Database.Entities.Store;
+using Moonlight.Features.ServiceManagement.Entities;
 
-namespace Moonlight.App.Models.Forms.Ticketing;
+namespace Moonlight.Features.Ticketing.Models.Forms;
 
 public class CreateTicketForm
 {
diff --git a/Moonlight/App/Services/Ticketing/TicketChatService.cs b/Moonlight/Features/Ticketing/Services/TicketChatService.cs
similarity index 94%
rename from Moonlight/App/Services/Ticketing/TicketChatService.cs
rename to Moonlight/Features/Ticketing/Services/TicketChatService.cs
index e868f30..8025bbd 100644
--- a/Moonlight/App/Services/Ticketing/TicketChatService.cs
+++ b/Moonlight/Features/Ticketing/Services/TicketChatService.cs
@@ -1,12 +1,13 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities.Tickets;
-using Moonlight.App.Database.Enums;
-using Moonlight.App.Event;
-using Moonlight.App.Event.Args;
-using Moonlight.App.Extensions;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Event;
+using Moonlight.Core.Event.Args;
+using Moonlight.Core.Extensions;
+using Moonlight.Core.Repositories;
+using Moonlight.Core.Services;
+using Moonlight.Features.Ticketing.Entities;
+using Moonlight.Features.Ticketing.Entities.Enums;
 
-namespace Moonlight.App.Services.Ticketing;
+namespace Moonlight.Features.Ticketing.Services;
 
 public class TicketChatService
 {
diff --git a/Moonlight/App/Services/Ticketing/TicketCreateService.cs b/Moonlight/Features/Ticketing/Services/TicketCreateService.cs
similarity index 74%
rename from Moonlight/App/Services/Ticketing/TicketCreateService.cs
rename to Moonlight/Features/Ticketing/Services/TicketCreateService.cs
index 0a005fe..19b6f38 100644
--- a/Moonlight/App/Services/Ticketing/TicketCreateService.cs
+++ b/Moonlight/Features/Ticketing/Services/TicketCreateService.cs
@@ -1,11 +1,12 @@
-using Moonlight.App.Database.Entities.Store;
-using Moonlight.App.Database.Entities.Tickets;
-using Moonlight.App.Database.Enums;
-using Moonlight.App.Event;
-using Moonlight.App.Extensions;
-using Moonlight.App.Repositories;
+using Moonlight.Core.Event;
+using Moonlight.Core.Extensions;
+using Moonlight.Core.Repositories;
+using Moonlight.Core.Services;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.Ticketing.Entities;
+using Moonlight.Features.Ticketing.Entities.Enums;
 
-namespace Moonlight.App.Services.Ticketing;
+namespace Moonlight.Features.Ticketing.Services;
 
 public class TicketCreateService
 {
diff --git a/Moonlight/App/Services/Ticketing/TicketService.cs b/Moonlight/Features/Ticketing/Services/TicketService.cs
similarity index 88%
rename from Moonlight/App/Services/Ticketing/TicketService.cs
rename to Moonlight/Features/Ticketing/Services/TicketService.cs
index b3b16ca..53f645a 100644
--- a/Moonlight/App/Services/Ticketing/TicketService.cs
+++ b/Moonlight/Features/Ticketing/Services/TicketService.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Services.Ticketing;
+namespace Moonlight.Features.Ticketing.Services;
 
 public class TicketService
 {
diff --git a/Moonlight/Shared/Components/Forms/ChatFileSelect.razor b/Moonlight/Features/Ticketing/UI/Components/ChatFileSelect.razor
similarity index 95%
rename from Moonlight/Shared/Components/Forms/ChatFileSelect.razor
rename to Moonlight/Features/Ticketing/UI/Components/ChatFileSelect.razor
index 2256bc3..9c9dcde 100644
--- a/Moonlight/Shared/Components/Forms/ChatFileSelect.razor
+++ b/Moonlight/Features/Ticketing/UI/Components/ChatFileSelect.razor
@@ -1,4 +1,6 @@
 @using Microsoft.AspNetCore.Components.Forms
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Services.Interop
 
 @inject ToastService ToastService
 
diff --git a/Moonlight/Shared/Components/TicketPopup/TicketPopupCreate.razor b/Moonlight/Features/Ticketing/UI/Components/TicketPopupCreate.razor
similarity index 91%
rename from Moonlight/Shared/Components/TicketPopup/TicketPopupCreate.razor
rename to Moonlight/Features/Ticketing/UI/Components/TicketPopupCreate.razor
index 0746327..e25411d 100644
--- a/Moonlight/Shared/Components/TicketPopup/TicketPopupCreate.razor
+++ b/Moonlight/Features/Ticketing/UI/Components/TicketPopupCreate.razor
@@ -1,8 +1,9 @@
-@using Moonlight.App.Services
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Store
-@using Moonlight.App.Models.Forms.Ticketing
-@using Moonlight.App.Services.Ticketing
+@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.Ticketing.Models.Forms
+@using Moonlight.Features.Ticketing.Services
 
 @inject IdentityService IdentityService
 @inject Repository<Service> ServiceRepository
diff --git a/Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor b/Moonlight/Features/Ticketing/UI/Components/TicketPopupMain.razor
similarity index 96%
rename from Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor
rename to Moonlight/Features/Ticketing/UI/Components/TicketPopupMain.razor
index 1227dcb..32666ba 100644
--- a/Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor
+++ b/Moonlight/Features/Ticketing/UI/Components/TicketPopupMain.razor
@@ -1,4 +1,4 @@
-@using Moonlight.App.Database.Entities.Tickets
+@using Moonlight.Features.Ticketing.Entities
 <div class="mb-4 me-4 d-flex justify-content-end fixed-bottom" style="pointer-events: none;">
     <CascadingValue Value="this">
         @if (ViewIndex == 0)
diff --git a/Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor b/Moonlight/Features/Ticketing/UI/Components/TicketPopupOverview.razor
similarity index 93%
rename from Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor
rename to Moonlight/Features/Ticketing/UI/Components/TicketPopupOverview.razor
index 0441a21..874e4a9 100644
--- a/Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor
+++ b/Moonlight/Features/Ticketing/UI/Components/TicketPopupOverview.razor
@@ -1,9 +1,8 @@
-@using Moonlight.App.Services.Ticketing
-@using Moonlight.App.Database.Entities.Tickets
-@using Moonlight.App.Repositories
-@using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Database.Enums
-@using Moonlight.App.Services
+@using Microsoft.EntityFrameworkCore
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services
+@using Moonlight.Features.Ticketing.Entities
 
 @inject Repository<Ticket> TicketRepository
 @inject IdentityService IdentityService
diff --git a/Moonlight/Shared/Components/TicketPopup/TicketPopupView.razor b/Moonlight/Features/Ticketing/UI/Components/TicketPopupView.razor
similarity index 98%
rename from Moonlight/Shared/Components/TicketPopup/TicketPopupView.razor
rename to Moonlight/Features/Ticketing/UI/Components/TicketPopupView.razor
index 4875d6a..b6704bc 100644
--- a/Moonlight/Shared/Components/TicketPopup/TicketPopupView.razor
+++ b/Moonlight/Features/Ticketing/UI/Components/TicketPopupView.razor
@@ -1,5 +1,6 @@
-@using Moonlight.App.Services.Ticketing
-@using System.Text.RegularExpressions
+@using System.Text.RegularExpressions
+@using Moonlight.Core.Helpers
+@using Moonlight.Features.Ticketing.Services
 
 @implements IDisposable
 
diff --git a/Moonlight/Shared/Views/Admin/Tickets/Index.razor b/Moonlight/Features/Ticketing/UI/Views/Admin/Index.razor
similarity index 96%
rename from Moonlight/Shared/Views/Admin/Tickets/Index.razor
rename to Moonlight/Features/Ticketing/UI/Views/Admin/Index.razor
index fbe6729..9baf8d0 100644
--- a/Moonlight/Shared/Views/Admin/Tickets/Index.razor
+++ b/Moonlight/Features/Ticketing/UI/Views/Admin/Index.razor
@@ -1,14 +1,15 @@
 @page "/admin/tickets"
 
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Tickets
 @using BlazorTable
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Database.Enums
-@using Moonlight.App.Event
-@using Moonlight.App.Event.Args
+@using Moonlight.Core.Event
+@using Moonlight.Core.Event.Args
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Features.Ticketing.Entities
+@using Moonlight.Features.Ticketing.Entities.Enums
 
 @attribute [RequirePermission(Permission.AdminTickets)]
 
diff --git a/Moonlight/Shared/Views/Admin/Tickets/View.razor b/Moonlight/Features/Ticketing/UI/Views/Admin/View.razor
similarity index 97%
rename from Moonlight/Shared/Views/Admin/Tickets/View.razor
rename to Moonlight/Features/Ticketing/UI/Views/Admin/View.razor
index 23ee3f5..7b116ec 100644
--- a/Moonlight/Shared/Views/Admin/Tickets/View.razor
+++ b/Moonlight/Features/Ticketing/UI/Views/Admin/View.razor
@@ -1,13 +1,16 @@
 @page "/admin/tickets/view/{Id:int}"
 
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-@using Moonlight.App.Repositories
-@using Moonlight.App.Services.Ticketing
-@using Moonlight.App.Database.Entities.Tickets
 @using System.Text.RegularExpressions
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.App.Database.Enums
+@using Moonlight.Core.Extensions.Attributes
+@using Moonlight.Core.Helpers
+@using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Repositories
+@using Moonlight.Core.Services.Interop
+@using Moonlight.Features.Ticketing.Entities
+@using Moonlight.Features.Ticketing.Entities.Enums
+@using Moonlight.Features.Ticketing.Services
+@using Moonlight.Features.Ticketing.UI.Components
 
 @attribute [RequirePermission(Permission.AdminTickets)]
 
diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj
index 0e9b7ac..ba1edaa 100644
--- a/Moonlight/Moonlight.csproj
+++ b/Moonlight/Moonlight.csproj
@@ -14,11 +14,27 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="App\Database\Migrations\" />
-      <Folder Include="App\Http\Middleware\" />
-      <Folder Include="App\Http\Requests\" />
-      <Folder Include="App\Http\Resources\" />
-      <Folder Include="storage\logs\" />
+      <Folder Include="Core\Database\Migrations\" />
+      <Folder Include="Core\Http\Middleware\" />
+      <Folder Include="Core\Http\Requests\" />
+      <Folder Include="Core\Http\Resources\" />
+      <Folder Include="Core\UI\Components\" />
+      <Folder Include="Features\Dummy\Configuration\" />
+      <Folder Include="Features\Dummy\Entities\" />
+      <Folder Include="Features\Dummy\Exceptions\" />
+      <Folder Include="Features\Dummy\Extensions\" />
+      <Folder Include="Features\Dummy\Helpers\" />
+      <Folder Include="Features\Dummy\Http\Controllers\" />
+      <Folder Include="Features\Dummy\Http\Middleware\" />
+      <Folder Include="Features\Dummy\Http\Requests\" />
+      <Folder Include="Features\Dummy\Http\Resources\" />
+      <Folder Include="Features\Dummy\Models\Abstractions\" />
+      <Folder Include="Features\Dummy\Models\Forms\" />
+      <Folder Include="Features\Dummy\Services\" />
+      <Folder Include="Features\Dummy\UI\Components\" />
+      <Folder Include="Features\Dummy\UI\Views\" />
+      <Folder Include="Features\StoreSystem\Helpers\" />
+      <Folder Include="Features\Ticketing\Models\Abstractions\" />
     </ItemGroup>
 
     <ItemGroup>
@@ -45,4 +61,92 @@
       <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0-dev-00923" />
       <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00972" />
     </ItemGroup>
+
+    <ItemGroup>
+      <AdditionalFiles Include="Core\UI\Components\Alerts\NotFoundAlert.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Alerts\RestartAlert.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\ChangePassword.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\Login.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\MailVerify.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\PasswordReset.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\Register.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\AutoCrud.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\AutoForm.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\AutoProperty.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\ConfirmButton.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\DynamicTypedAutoForm.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\SmartCustomFileSelect.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\SmartDropdown.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\SmartEnumSelect.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\SmartFileSelect.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\SmartForm.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\SmartSelect.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\TextEditor.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Forms\WButton.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Navigations\AccountNavigation.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Navigations\AdminSysNavigation.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Navigations\AdminUsersNavigation.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Partials\ConnectionIndicator.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Partials\LazyLoader.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Partials\PageHeader.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Partials\PermissionChecker.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Partials\Sidebar.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Partials\SmartModal.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Partials\SoftErrorHandler.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Partials\Tooltip.razor" />
+      <AdditionalFiles Include="Core\UI\Layouts\DefaultLayout.razor" />
+      <AdditionalFiles Include="Core\UI\Layouts\MainLayout.razor" />
+      <AdditionalFiles Include="Core\UI\Layouts\OverlayLayout.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Account\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Account\Payments.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Account\Security.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Services\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Services\View.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Sys\Diagnose.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Sys\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Sys\Settings.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Users\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Users\Sessions.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Users\View.razor" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\AutoCrud.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\AutoForm.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\AutoProperty.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\ChatFileSelect.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\ConfirmButton.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\DynamicTypedAutoForm.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\SmartCustomFileSelect.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\SmartDropdown.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\SmartEnumSelect.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\SmartFileSelect.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\SmartForm.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\SmartSelect.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\TextEditor.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Forms\WButton.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Layouts\DefaultLayout.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Layouts\MainLayout.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Layouts\OverlayLayout.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\ChangePassword.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\Login.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\MailVerify.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\PasswordReset.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\Register.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Alerts\NotFoundAlert.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Alerts\RestartAlert.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Navigations\AccountNavigation.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Navigations\AdminSysNavigation.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Navigations\AdminUsersNavigation.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Index.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Services\Index.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Services\View.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Sys\Diagnose.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Sys\Index.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Sys\Settings.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Users\Index.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Users\Sessions.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Users\View.razor" />
+    </ItemGroup>
 </Project>
diff --git a/Moonlight/Pages/_Host.cshtml b/Moonlight/Pages/_Host.cshtml
index d738977..b011d18 100644
--- a/Moonlight/Pages/_Host.cshtml
+++ b/Moonlight/Pages/_Host.cshtml
@@ -1,13 +1,13 @@
 @page "/"
 @using Microsoft.AspNetCore.Components.Web
-@using Moonlight.App.Services.Sys
+@using Moonlight.Features.Theming.Services
 @namespace Moonlight.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
-@inject MoonlightThemeService MoonlightThemeService
+@inject ThemeService ThemeService
 
 @{
-    var themes = await MoonlightThemeService.GetEnabled();
+    var themes = await ThemeService.GetEnabled();
 }
 
 <!DOCTYPE html>
diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs
index 94009dd..d3d6a7f 100644
--- a/Moonlight/Program.cs
+++ b/Moonlight/Program.cs
@@ -1,21 +1,23 @@
 using BlazorTable;
-using Moonlight.App.Actions.Dummy;
-using Moonlight.App.Database;
-using Moonlight.App.Database.Enums;
-using Moonlight.App.Extensions;
-using Moonlight.App.Helpers;
-using Moonlight.App.Helpers.LogMigrator;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services;
-using Moonlight.App.Services.Background;
-using Moonlight.App.Services.Community;
-using Moonlight.App.Services.Interop;
-using Moonlight.App.Services.ServiceManage;
-using Moonlight.App.Services.Store;
-using Moonlight.App.Services.Ticketing;
-using Moonlight.App.Services.Sys;
-using Moonlight.App.Services.Users;
-using Moonlight.App.Services.Utils;
+using Moonlight.Core.Database;
+using Moonlight.Core.Actions.Dummy;
+using Moonlight.Core.Database;
+using Moonlight.Core.Extensions;
+using Moonlight.Core.Helpers;
+using Moonlight.Core.Helpers.LogMigrator;
+using Moonlight.Core.Repositories;
+using Moonlight.Core.Services;
+using Moonlight.Core.Services.Background;
+using Moonlight.Core.Services.Interop;
+using Moonlight.Core.Services.Users;
+using Moonlight.Core.Services.Utils;
+using Moonlight.Features.Advertisement.Services;
+using Moonlight.Features.Community.Services;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
+using Moonlight.Features.ServiceManagement.Services;
+using Moonlight.Features.StoreSystem.Services;
+using Moonlight.Features.Theming.Services;
+using Moonlight.Features.Ticketing.Services;
 using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -104,7 +106,7 @@ builder.Services.AddSingleton<SessionService>();
 builder.Services.AddSingleton<BucketService>();
 builder.Services.AddSingleton<MailService>();
 builder.Services.AddSingleton<MoonlightService>();
-builder.Services.AddSingleton<MoonlightThemeService>();
+builder.Services.AddSingleton<ThemeService>();
 
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();
diff --git a/Moonlight/Shared/Components/Modals/Store/AddCouponModal.razor b/Moonlight/Shared/Components/Modals/Store/AddCouponModal.razor
deleted file mode 100644
index 69b280a..0000000
--- a/Moonlight/Shared/Components/Modals/Store/AddCouponModal.razor
+++ /dev/null
@@ -1,60 +0,0 @@
-@using Moonlight.App.Models.Forms.Store
-@using Moonlight.App.Repositories
-@using Moonlight.App.Database.Entities.Store
-@using Mappy.Net
-@using Moonlight.App.Models.Forms.Admin.Store
-
-@inject Repository<Coupon> CouponRepository
-@inject ToastService ToastService
-
-<SmartModal @ref="Modal" CssClasses="modal-dialog-centered modal-lg">
-    <div class="modal-header">
-        <h5 class="modal-title fs-3">Add new modal</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-    </div>
-    <SmartForm Model="Form" OnValidSubmit="OnValidSubmit">
-        <div class="modal-body">
-            <div class="mb-3">
-                <label class="form-label">Code</label>
-                <input @bind="Form.Code" class="form-control" type="text"/>
-            </div>
-            <div class="mb-3">
-                <label class="form-label">Percent</label>
-                <input @bind="Form.Percent" class="form-control" type="number"/>
-            </div>
-            <div>
-                <label class="form-label">Amount</label>
-                <input @bind="Form.Amount" class="form-control" type="number"/>
-            </div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-            <button type="submit" class="btn btn-primary">Save changes</button>
-        </div>
-    </SmartForm>
-</SmartModal>
-
-@code
-{
-    [Parameter]
-    public Func<Task> OnUpdate { get; set; }
-
-    private SmartModal Modal;
-    private AddCouponForm Form = new();
-
-    public async Task Show()
-    {
-        await Modal.Show();
-    }
-    
-    private async Task OnValidSubmit()
-    {
-        var coupon = Mapper.Map<Coupon>(Form);
-        CouponRepository.Add(coupon);
-
-        Form = new();
-        await ToastService.Success("Successfully added new coupon");
-        await Modal.Hide();
-        await OnUpdate.Invoke();
-    }
-}
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Admin/Community/Index.razor b/Moonlight/Shared/Views/Admin/Community/Index.razor
deleted file mode 100644
index b4a9c1d..0000000
--- a/Moonlight/Shared/Views/Admin/Community/Index.razor
+++ /dev/null
@@ -1,8 +0,0 @@
-@page "/admin/community"
-
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-
-@attribute [RequirePermission(Permission.AdminCommunity)]
-
-<AdminCommunityNavigation Index="0" />
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Admin/Index.razor b/Moonlight/Shared/Views/Admin/Index.razor
deleted file mode 100644
index a91ce60..0000000
--- a/Moonlight/Shared/Views/Admin/Index.razor
+++ /dev/null
@@ -1,6 +0,0 @@
-@page "/admin"
-
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-
-@attribute [RequirePermission(Permission.AdminOverview)]
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Admin/Store/Index.razor b/Moonlight/Shared/Views/Admin/Store/Index.razor
deleted file mode 100644
index 23eb44b..0000000
--- a/Moonlight/Shared/Views/Admin/Store/Index.razor
+++ /dev/null
@@ -1,8 +0,0 @@
-@page "/admin/store"
-
-@using Moonlight.App.Extensions.Attributes
-@using Moonlight.App.Models.Enums
-
-@attribute [RequirePermission(Permission.AdminStore)]
-
-<AdminStoreNavigation Index="0"/>
\ No newline at end of file
diff --git a/Moonlight/_Imports.razor b/Moonlight/_Imports.razor
index 2d55684..2eee320 100644
--- a/Moonlight/_Imports.razor
+++ b/Moonlight/_Imports.razor
@@ -2,12 +2,7 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 
-@using Moonlight.App.Services.Interop
-@using Moonlight.App.Exceptions
-@using Moonlight.App.Database.Entities
-@using Moonlight.App.Helpers
-
-@using Moonlight.Shared.Components.Partials
-@using Moonlight.Shared.Components.Forms
-@using Moonlight.Shared.Components.Navigations
-@using Moonlight.Shared.Components.Alerts
\ No newline at end of file
+@using Moonlight.Core.UI.Components.Partials
+@using Moonlight.Core.UI.Components.Forms
+@using Moonlight.Core.UI.Components.Navigations
+@using Moonlight.Core.UI.Components.Alerts
\ No newline at end of file