diff --git a/Horizon/App.xaml.cs b/Horizon/App.xaml.cs
index 81536d7..53f2a11 100644
--- a/Horizon/App.xaml.cs
+++ b/Horizon/App.xaml.cs
@@ -1,4 +1,4 @@
-using Horizon.View;
+using Horizon.View.Windows;
 using ReactiveUI;
 using Serilog;
 using Serilog.Formatting.Compact;
@@ -54,7 +54,7 @@ public partial class App : Application
     /// <inheritdoc />
     protected override async void OnStartup(StartupEventArgs args)
     {
-        this.SetDebugFlag();
+        SetDebugFlag();
         this.InitializeLogging();
         base.OnStartup(args);
 
@@ -147,7 +147,7 @@ private void OnUnhandledException(object sender, DispatcherUnhandledExceptionEve
     /// <summary>
     /// Sets the debug flag.
     /// </summary>
-    private void SetDebugFlag()
+    private static void SetDebugFlag()
     {
 #if DEBUG
         IsDebug = true;
diff --git a/Horizon/View/LoadingSplash.xaml b/Horizon/View/Windows/LoadingSplash.xaml
similarity index 96%
rename from Horizon/View/LoadingSplash.xaml
rename to Horizon/View/Windows/LoadingSplash.xaml
index eec8543..6e0b101 100644
--- a/Horizon/View/LoadingSplash.xaml
+++ b/Horizon/View/Windows/LoadingSplash.xaml
@@ -1,4 +1,4 @@
-<rui:ReactiveWindow x:Class="Horizon.View.LoadingSplash" x:TypeArguments="vm:LoadingSplashViewModel"
+<rui:ReactiveWindow x:Class="Horizon.View.Windows.LoadingSplash" x:TypeArguments="vm:LoadingSplashViewModel"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:rui="http://reactiveui.net"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Horizon/View/LoadingSplash.xaml.cs b/Horizon/View/Windows/LoadingSplash.xaml.cs
similarity index 95%
rename from Horizon/View/LoadingSplash.xaml.cs
rename to Horizon/View/Windows/LoadingSplash.xaml.cs
index 0b3b4fc..7599c71 100644
--- a/Horizon/View/LoadingSplash.xaml.cs
+++ b/Horizon/View/Windows/LoadingSplash.xaml.cs
@@ -1,7 +1,7 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
 
-namespace Horizon.View;
+namespace Horizon.View.Windows;
 
 /// <summary>
 /// Interaction logic for LoadingSplash.xaml
diff --git a/Horizon/Workspace.xaml b/Horizon/View/Windows/Workspace.xaml
similarity index 82%
rename from Horizon/Workspace.xaml
rename to Horizon/View/Windows/Workspace.xaml
index 8279554..b6c7353 100644
--- a/Horizon/Workspace.xaml
+++ b/Horizon/View/Windows/Workspace.xaml
@@ -1,9 +1,8 @@
-<Window x:Class="Horizon.Workspace"
+<Window x:Class="Horizon.View.Windows.Workspace"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Horizon"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
     <Grid>
diff --git a/Horizon/Workspace.xaml.cs b/Horizon/View/Windows/Workspace.xaml.cs
similarity index 63%
rename from Horizon/Workspace.xaml.cs
rename to Horizon/View/Windows/Workspace.xaml.cs
index 5c3256f..f64bcad 100644
--- a/Horizon/Workspace.xaml.cs
+++ b/Horizon/View/Windows/Workspace.xaml.cs
@@ -1,11 +1,9 @@
-using System.Windows;
-
-namespace Horizon;
+namespace Horizon.View.Windows;
 
 /// <summary>
 /// Interaction logic for MainWindow.xaml
 /// </summary>
-public partial class Workspace : Window
+public partial class Workspace
 {
     public Workspace()
     {