diff --git a/Frontend/Components/App.razor b/Frontend/Components/App.razor
new file mode 100644
index 0000000..f4146d6
--- /dev/null
+++ b/Frontend/Components/App.razor
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ An error has occurred. This application may not response until reloaded.
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Frontend/Shared/ChatZone.razor b/Frontend/Components/ChatZone.razor
similarity index 100%
rename from Frontend/Shared/ChatZone.razor
rename to Frontend/Components/ChatZone.razor
diff --git a/Frontend/Shared/ChatZone.razor.css b/Frontend/Components/ChatZone.razor.css
similarity index 100%
rename from Frontend/Shared/ChatZone.razor.css
rename to Frontend/Components/ChatZone.razor.css
diff --git a/Frontend/Shared/GrammarHelp.razor b/Frontend/Components/GrammarHelp.razor
similarity index 100%
rename from Frontend/Shared/GrammarHelp.razor
rename to Frontend/Components/GrammarHelp.razor
diff --git a/Frontend/Shared/MainLayout.razor b/Frontend/Components/MainLayout.razor
similarity index 97%
rename from Frontend/Shared/MainLayout.razor
rename to Frontend/Components/MainLayout.razor
index a4efa78..d0b0de1 100644
--- a/Frontend/Shared/MainLayout.razor
+++ b/Frontend/Components/MainLayout.razor
@@ -30,4 +30,6 @@
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/Frontend/Shared/MainLayout.razor.css b/Frontend/Components/MainLayout.razor.css
similarity index 100%
rename from Frontend/Shared/MainLayout.razor.css
rename to Frontend/Components/MainLayout.razor.css
diff --git a/Frontend/Shared/MessageBubble.razor b/Frontend/Components/MessageBubble.razor
similarity index 100%
rename from Frontend/Shared/MessageBubble.razor
rename to Frontend/Components/MessageBubble.razor
diff --git a/Frontend/Shared/MessageBubble.razor.css b/Frontend/Components/MessageBubble.razor.css
similarity index 100%
rename from Frontend/Shared/MessageBubble.razor.css
rename to Frontend/Components/MessageBubble.razor.css
diff --git a/Frontend/Pages/Editor.razor b/Frontend/Components/Pages/Editor.razor
similarity index 100%
rename from Frontend/Pages/Editor.razor
rename to Frontend/Components/Pages/Editor.razor
diff --git a/Frontend/Pages/Editor.razor.css b/Frontend/Components/Pages/Editor.razor.css
similarity index 100%
rename from Frontend/Pages/Editor.razor.css
rename to Frontend/Components/Pages/Editor.razor.css
diff --git a/Frontend/Pages/Index.razor b/Frontend/Components/Pages/Index.razor
similarity index 100%
rename from Frontend/Pages/Index.razor
rename to Frontend/Components/Pages/Index.razor
diff --git a/Frontend/Pages/Index.razor.css b/Frontend/Components/Pages/Index.razor.css
similarity index 100%
rename from Frontend/Pages/Index.razor.css
rename to Frontend/Components/Pages/Index.razor.css
diff --git a/Frontend/App.razor b/Frontend/Components/Routes.razor
similarity index 84%
rename from Frontend/App.razor
rename to Frontend/Components/Routes.razor
index a211e1e..fc38567 100644
--- a/Frontend/App.razor
+++ b/Frontend/Components/Routes.razor
@@ -1,4 +1,4 @@
-
+
@@ -9,6 +9,4 @@
Sorry, there's nothing at this address.
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Frontend/_Imports.razor b/Frontend/Components/_Imports.razor
similarity index 75%
rename from Frontend/_Imports.razor
rename to Frontend/Components/_Imports.razor
index dee7fe5..dab17ff 100644
--- a/Frontend/_Imports.razor
+++ b/Frontend/Components/_Imports.razor
@@ -2,10 +2,10 @@
@using System.Net.Http.Json
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
@using Microsoft.JSInterop
@using AntDesign
@using BlazorMonaco
@using BlazorMonaco.Editor
@using BlazorMonaco.Languages
-@using Frontend
-@using Frontend.Shared
\ No newline at end of file
+@using Frontend.Components
\ No newline at end of file
diff --git a/Frontend/Frontend.csproj b/Frontend/Frontend.csproj
index 4fbc6c6..0365a96 100644
--- a/Frontend/Frontend.csproj
+++ b/Frontend/Frontend.csproj
@@ -1,7 +1,7 @@
- net7.0
+ net8.0enableenable
diff --git a/Frontend/Pages/_Host.cshtml b/Frontend/Pages/_Host.cshtml
deleted file mode 100644
index b1bedca..0000000
--- a/Frontend/Pages/_Host.cshtml
+++ /dev/null
@@ -1,37 +0,0 @@
-@page "/"
-@using Microsoft.AspNetCore.Components.Web
-@namespace Frontend.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- An error has occurred. This application may no longer respond until reloaded.
-
-
- An unhandled exception has occurred. See browser dev tools for details.
-
- Reload
- 🗙
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Frontend/Program.cs b/Frontend/Program.cs
index 10ffe88..25cb1b5 100644
--- a/Frontend/Program.cs
+++ b/Frontend/Program.cs
@@ -1,11 +1,12 @@
using Blazored.LocalStorage;
+using Frontend.Components;
using Katheryne;
using Frontend.Services;
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
-builder.Services.AddRazorPages();
-builder.Services.AddServerSideBlazor();
+builder.Services.AddRazorComponents()
+ .AddInteractiveServerComponents();
builder.Services.AddAntDesign();
builder.Services.AddBlazoredLocalStorage();
@@ -16,7 +17,9 @@ WebApplication app = builder.Build();
app.UseStaticFiles();
app.UseRouting();
-app.MapBlazorHub();
-app.MapFallbackToPage("/_Host");
+app.UseAntiforgery();
+
+app.MapRazorComponents()
+ .AddInteractiveServerRenderMode();
await app.RunAsync();
\ No newline at end of file
diff --git a/Katheryne.Tests/Katheryne.Tests.csproj b/Katheryne.Tests/Katheryne.Tests.csproj
index 596f8e3..8a45476 100644
--- a/Katheryne.Tests/Katheryne.Tests.csproj
+++ b/Katheryne.Tests/Katheryne.Tests.csproj
@@ -1,7 +1,7 @@
- net7.0
+ net8.0enableenable
diff --git a/Katheryne/Katheryne.csproj b/Katheryne/Katheryne.csproj
index 4615fc9..bd670ce 100644
--- a/Katheryne/Katheryne.csproj
+++ b/Katheryne/Katheryne.csproj
@@ -1,14 +1,14 @@
- net7.0
+ net8.0enableenable
-
-
+
+