diff --git a/Program.cs b/Program.cs
index d05d2ad..dbacdf2 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,7 +1,9 @@
-using Avalonia;
+namespace MercuryConverter;
+
+using Avalonia;
 using System;
 
-namespace MercuryConverter;
+using MercuryConverter.UI;
 
 class Program
 {
diff --git a/App.axaml b/UI/App.axaml
similarity index 98%
rename from App.axaml
rename to UI/App.axaml
index 2c0bf66..f0d2d3c 100644
--- a/App.axaml
+++ b/UI/App.axaml
@@ -1,6 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            x:Class="MercuryConverter.App"
+            x:Class="MercuryConverter.UI.App"
             RequestedThemeVariant="Default"> <!-- Dark Default Light -->
 
     <Application.Styles>
diff --git a/App.axaml.cs b/UI/App.axaml.cs
similarity index 94%
rename from App.axaml.cs
rename to UI/App.axaml.cs
index d138ab6..363ffb8 100644
--- a/App.axaml.cs
+++ b/UI/App.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
-namespace MercuryConverter;
+namespace MercuryConverter.UI;
 
 public partial class App : Application
 {
diff --git a/MainWindow.axaml b/UI/MainWindow.axaml
similarity index 92%
rename from MainWindow.axaml
rename to UI/MainWindow.axaml
index b437dee..6a58edf 100644
--- a/MainWindow.axaml
+++ b/UI/MainWindow.axaml
@@ -2,10 +2,10 @@
         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:local="clr-namespace:MercuryConverter"
+        xmlns:local="clr-namespace:MercuryConverter.UI"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
 
-        x:Class="MercuryConverter.MainWindow"
+        x:Class="MercuryConverter.UI.MainWindow"
         Title="MercuryConverter"
         Width="1024" Height="800"
         MinWidth="800" MinHeight="600"
diff --git a/MainWindow.axaml.cs b/UI/MainWindow.axaml.cs
similarity index 85%
rename from MainWindow.axaml.cs
rename to UI/MainWindow.axaml.cs
index ba07539..50eaa61 100644
--- a/MainWindow.axaml.cs
+++ b/UI/MainWindow.axaml.cs
@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using Avalonia.Styling;
 
-namespace MercuryConverter;
+namespace MercuryConverter.UI;
 
-using MercuryConverter.Views;
+using MercuryConverter.UI.Views;
 
 public partial class MainWindow : Window
 {
diff --git a/Overrides/Expander.axaml b/UI/Overrides/Expander.axaml
similarity index 100%
rename from Overrides/Expander.axaml
rename to UI/Overrides/Expander.axaml
diff --git a/Views/Selection/Selection.axaml b/UI/Views/Selection/Selection.axaml
similarity index 96%
rename from Views/Selection/Selection.axaml
rename to UI/Views/Selection/Selection.axaml
index 33cda69..b1265ce 100644
--- a/Views/Selection/Selection.axaml
+++ b/UI/Views/Selection/Selection.axaml
@@ -2,8 +2,8 @@
         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:local="clr-namespace:MercuryConverter.Views"
-        x:Class="MercuryConverter.Views.Selection"
+        xmlns:local="clr-namespace:MercuryConverter.UI.Views"
+        x:Class="MercuryConverter.UI.Views.Selection"
 >
     <DockPanel>
         <!-- Sidebar -->
diff --git a/Views/Selection/Selection.axaml.cs b/UI/Views/Selection/Selection.axaml.cs
similarity index 98%
rename from Views/Selection/Selection.axaml.cs
rename to UI/Views/Selection/Selection.axaml.cs
index 7bafac3..06dea31 100644
--- a/Views/Selection/Selection.axaml.cs
+++ b/UI/Views/Selection/Selection.axaml.cs
@@ -7,7 +7,7 @@ using Avalonia.Controls;
 using MercuryConverter.Data;
 using Avalonia;
 
-namespace MercuryConverter.Views;
+namespace MercuryConverter.UI.Views;
 
 public partial class Selection : Panel
 {