diff --git a/app/.idea/.idea.DiscordHistoryTracker/.idea/avalonia.xml b/app/.idea/.idea.DiscordHistoryTracker/.idea/avalonia.xml
index 39aca8e..b063395 100644
--- a/app/.idea/.idea.DiscordHistoryTracker/.idea/avalonia.xml
+++ b/app/.idea/.idea.DiscordHistoryTracker/.idea/avalonia.xml
@@ -11,13 +11,13 @@
         <entry key="Desktop/Main/Controls/FilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/MainContentScreen.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/TrackingPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/ViewerPage.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/WelcomeScreen.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Screens/MainContentScreen.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Screens/WelcomeScreen.axaml" value="Desktop/Desktop.csproj" />
       </map>
     </option>
   </component>
diff --git a/app/Desktop/Main/MainWindowModel.cs b/app/Desktop/Main/MainWindowModel.cs
index 5ae5c94..667218a 100644
--- a/app/Desktop/Main/MainWindowModel.cs
+++ b/app/Desktop/Main/MainWindowModel.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Main.Screens;
 using DHT.Desktop.Server;
 using DHT.Server.Database;
 using DHT.Utils.Models;
diff --git a/app/Desktop/Main/MainContentScreen.axaml b/app/Desktop/Main/Screens/MainContentScreen.axaml
similarity index 96%
rename from app/Desktop/Main/MainContentScreen.axaml
rename to app/Desktop/Main/Screens/MainContentScreen.axaml
index 32cf416..cf6771c 100644
--- a/app/Desktop/Main/MainContentScreen.axaml
+++ b/app/Desktop/Main/Screens/MainContentScreen.axaml
@@ -2,13 +2,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:main="clr-namespace:DHT.Desktop.Main"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.MainContentScreen">
+             x:Class="DHT.Desktop.Main.Screens.MainContentScreen">
 
     <Design.DataContext>
-        <main:MainContentScreenModel />
+        <screens:MainContentScreenModel />
     </Design.DataContext>
 
     <UserControl.Styles>
diff --git a/app/Desktop/Main/MainContentScreen.axaml.cs b/app/Desktop/Main/Screens/MainContentScreen.axaml.cs
similarity index 90%
rename from app/Desktop/Main/MainContentScreen.axaml.cs
rename to app/Desktop/Main/Screens/MainContentScreen.axaml.cs
index 122b870..b0abb0d 100644
--- a/app/Desktop/Main/MainContentScreen.axaml.cs
+++ b/app/Desktop/Main/Screens/MainContentScreen.axaml.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main.Screens {
 	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
 	public sealed class MainContentScreen : UserControl {
 		public MainContentScreen() {
diff --git a/app/Desktop/Main/MainContentScreenModel.cs b/app/Desktop/Main/Screens/MainContentScreenModel.cs
similarity index 98%
rename from app/Desktop/Main/MainContentScreenModel.cs
rename to app/Desktop/Main/Screens/MainContentScreenModel.cs
index 45d9dbb..47a702f 100644
--- a/app/Desktop/Main/MainContentScreenModel.cs
+++ b/app/Desktop/Main/Screens/MainContentScreenModel.cs
@@ -9,7 +9,7 @@ using DHT.Server.Database;
 using DHT.Server.Service;
 using DHT.Utils.Logging;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main.Screens {
 	sealed class MainContentScreenModel : IDisposable {
 		private static readonly Log Log = Log.ForType<MainContentScreenModel>();
 
diff --git a/app/Desktop/Main/WelcomeScreen.axaml b/app/Desktop/Main/Screens/WelcomeScreen.axaml
similarity index 90%
rename from app/Desktop/Main/WelcomeScreen.axaml
rename to app/Desktop/Main/Screens/WelcomeScreen.axaml
index 3e1c08e..2c004fc 100644
--- a/app/Desktop/Main/WelcomeScreen.axaml
+++ b/app/Desktop/Main/Screens/WelcomeScreen.axaml
@@ -2,12 +2,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:main="clr-namespace:DHT.Desktop.Main"
+             xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.WelcomeScreen">
+             x:Class="DHT.Desktop.Main.Screens.WelcomeScreen">
 
     <Design.DataContext>
-        <main:WelcomeScreenModel />
+        <screens:WelcomeScreenModel />
     </Design.DataContext>
 
     <UserControl.Background>
diff --git a/app/Desktop/Main/WelcomeScreen.axaml.cs b/app/Desktop/Main/Screens/WelcomeScreen.axaml.cs
similarity index 90%
rename from app/Desktop/Main/WelcomeScreen.axaml.cs
rename to app/Desktop/Main/Screens/WelcomeScreen.axaml.cs
index f625578..6abeaf7 100644
--- a/app/Desktop/Main/WelcomeScreen.axaml.cs
+++ b/app/Desktop/Main/Screens/WelcomeScreen.axaml.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main.Screens {
 	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
 	public sealed class WelcomeScreen : UserControl {
 		public WelcomeScreen() {
diff --git a/app/Desktop/Main/WelcomeScreenModel.cs b/app/Desktop/Main/Screens/WelcomeScreenModel.cs
similarity index 97%
rename from app/Desktop/Main/WelcomeScreenModel.cs
rename to app/Desktop/Main/Screens/WelcomeScreenModel.cs
index 6a02c2e..fd799de 100644
--- a/app/Desktop/Main/WelcomeScreenModel.cs
+++ b/app/Desktop/Main/Screens/WelcomeScreenModel.cs
@@ -7,7 +7,7 @@ using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main.Screens {
 	sealed class WelcomeScreenModel : BaseModel, IDisposable {
 		public string Version => Program.Version;