diff --git a/CHANGELIST.md b/CHANGELIST.md
index c4a11142..53a0d4f9 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -108,6 +108,7 @@
 - Move Aaru CICM code to Core
 - Clean up Core dependencies
 - Move Aaru CICM code to Processors
+- Merge UI.Core into main application
 
 ### 3.1.9a (2024-05-21)
 
diff --git a/MPF.UI.Core/MPF.UI.Core.csproj b/MPF.UI.Core/MPF.UI.Core.csproj
deleted file mode 100644
index 63848704..00000000
--- a/MPF.UI.Core/MPF.UI.Core.csproj
+++ /dev/null
@@ -1,61 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <!-- Assembly Properties -->
-    <TargetFrameworks>net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-    <ImportFrameworkWinFXTargets Condition="$(TargetFramework.StartsWith(`net3`))">true</ImportFrameworkWinFXTargets>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <UseWindowsForms>true</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-    <VersionPrefix>3.1.9</VersionPrefix>
-
-    <!-- Package Properties -->
-    <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Description>Common code for all MPF UI implementations</Description>
-    <Copyright>Copyright (c) Matt Nadareski 2019-2024</Copyright>
-    <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Resource Include="Images\ring-code-guide-1-layer.png" />
-    <Resource Include="Images\ring-code-guide-2-layer.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
-    <ProjectReference Include="..\MPF.Frontend\MPF.Frontend.csproj" />
-  </ItemGroup>
-
-  <!-- Support for old .NET versions -->
-  <ItemGroup Condition="$(TargetFramework.StartsWith(`net3`))">
-    <Reference Include="PresentationBuildTasks" HintPath="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\PresentationBuildTasks.dll" />
-    <Reference Include="PresentationCore" HintPath="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\PresentationCore.dll" />
-    <Reference Include="PresentationFramework" HintPath="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\PresentationFramework.dll" />
-    <Reference Include="WindowsBase" HintPath="$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\v3.0\WindowsBase.dll" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.8" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="UserControls\UserInput.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="Windows\DiscInformationWindow.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="Windows\RingCodeGuideWindow.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-  </ItemGroup>
-</Project>
diff --git a/MPF.sln b/MPF.sln
index ed5b49f8..068d0f65 100644
--- a/MPF.sln
+++ b/MPF.sln
@@ -20,8 +20,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Core", "MPF.Core\MPF.Core.csproj", "{70B1265D-FE49-472A-A83D-0B462152D37A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.UI.Core", "MPF.UI.Core\MPF.UI.Core.csproj", "{EA3768DB-694A-4653-82E4-9FF71B8963F3}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{ADC5FDD7-F43F-4F9C-B222-19AA1D64D3D4}"
 	ProjectSection(SolutionItems) = preProject
 		.github\ISSUE_TEMPLATE\feature-request.md = .github\ISSUE_TEMPLATE\feature-request.md
@@ -64,10 +62,6 @@ Global
 		{70B1265D-FE49-472A-A83D-0B462152D37A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70B1265D-FE49-472A-A83D-0B462152D37A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70B1265D-FE49-472A-A83D-0B462152D37A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{92515FC1-2B4E-423F-AE8B-7B7C599C5F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92515FC1-2B4E-423F-AE8B-7B7C599C5F70}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92515FC1-2B4E-423F-AE8B-7B7C599C5F70}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/MPF/App.xaml b/MPF/App.xaml
index cda9095d..50fbbd04 100644
--- a/MPF/App.xaml
+++ b/MPF/App.xaml
@@ -1,7 +1,7 @@
 <Application
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:windows="clr-namespace:MPF.UI.Core.Windows;assembly=MPF.UI.Core"
+             xmlns:windows="clr-namespace:MPF.UI.Windows"
              x:Class="MPF.App">
     <Application.MainWindow>
         <windows:MainWindow Visibility="Visible"/>
diff --git a/MPF.UI.Core/Constants.cs b/MPF/Constants.cs
similarity index 98%
rename from MPF.UI.Core/Constants.cs
rename to MPF/Constants.cs
index 6fddd767..c6549b54 100644
--- a/MPF.UI.Core/Constants.cs
+++ b/MPF/Constants.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Windows.Media;
 using static MPF.Frontend.InterfaceConstants;
 
-namespace MPF.UI.Core
+namespace MPF.UI
 {
     /// <summary>
     /// Variables for UI elements
diff --git a/MPF.UI.Core/ElementConverter.cs b/MPF/ElementConverter.cs
similarity index 98%
rename from MPF.UI.Core/ElementConverter.cs
rename to MPF/ElementConverter.cs
index 712cb8d8..356d18c2 100644
--- a/MPF.UI.Core/ElementConverter.cs
+++ b/MPF/ElementConverter.cs
@@ -5,7 +5,7 @@ using MPF.Core;
 using MPF.Frontend.ComboBoxItems;
 using SabreTools.RedumpLib.Data;
 
-namespace MPF.UI.Core
+namespace MPF.UI
 {
     internal class ElementConverter: IValueConverter
     {
diff --git a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBox.cs b/MPF/External/WPFCustomMessageBox/CustomMessageBox.cs
similarity index 100%
rename from MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBox.cs
rename to MPF/External/WPFCustomMessageBox/CustomMessageBox.cs
diff --git a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml b/MPF/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml
similarity index 100%
rename from MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml
rename to MPF/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml
diff --git a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs b/MPF/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs
similarity index 99%
rename from MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs
rename to MPF/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs
index b893b3f5..3f060615 100644
--- a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs
+++ b/MPF/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs
@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MPF.UI.Core;
+using MPF.UI;
 
 #pragma warning disable IDE1006 // Naming Styles
 
diff --git a/MPF.UI.Core/External/WPFCustomMessageBox/LICENSE b/MPF/External/WPFCustomMessageBox/LICENSE
similarity index 100%
rename from MPF.UI.Core/External/WPFCustomMessageBox/LICENSE
rename to MPF/External/WPFCustomMessageBox/LICENSE
diff --git a/MPF.UI.Core/External/WPFCustomMessageBox/Util.cs b/MPF/External/WPFCustomMessageBox/Util.cs
similarity index 100%
rename from MPF.UI.Core/External/WPFCustomMessageBox/Util.cs
rename to MPF/External/WPFCustomMessageBox/Util.cs
diff --git a/MPF.UI.Core/Images/ring-code-guide-1-layer.png b/MPF/Images/ring-code-guide-1-layer.png
similarity index 100%
rename from MPF.UI.Core/Images/ring-code-guide-1-layer.png
rename to MPF/Images/ring-code-guide-1-layer.png
diff --git a/MPF.UI.Core/Images/ring-code-guide-2-layer.png b/MPF/Images/ring-code-guide-2-layer.png
similarity index 100%
rename from MPF.UI.Core/Images/ring-code-guide-2-layer.png
rename to MPF/Images/ring-code-guide-2-layer.png
diff --git a/MPF.UI.Core/ItemHelper.cs b/MPF/ItemHelper.cs
similarity index 99%
rename from MPF.UI.Core/ItemHelper.cs
rename to MPF/ItemHelper.cs
index afee7f23..62525379 100644
--- a/MPF.UI.Core/ItemHelper.cs
+++ b/MPF/ItemHelper.cs
@@ -2,7 +2,7 @@
 using System.Windows.Media;
 using System.Windows;
 
-namespace MPF.UI.Core
+namespace MPF.UI
 {
     internal static class ItemHelper
     {
diff --git a/MPF/MPF.csproj b/MPF/MPF.csproj
index 21a3be61..04b3c165 100644
--- a/MPF/MPF.csproj
+++ b/MPF/MPF.csproj
@@ -51,11 +51,13 @@
 
   <ItemGroup>
     <Resource Include="Images\Icon.ico" />
+    <Resource Include="Images\ring-code-guide-1-layer.png" />
+    <Resource Include="Images\ring-code-guide-2-layer.png" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
-    <ProjectReference Include="..\MPF.UI.Core\MPF.UI.Core.csproj" />
+    <ProjectReference Include="..\MPF.Frontend\MPF.Frontend.csproj" />
   </ItemGroup>
 
   <!-- Support for old .NET versions -->
@@ -80,6 +82,18 @@
     <Content Include="$(PkgBinaryObjectScanner)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Update="UserControls\UserInput.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="Windows\DiscInformationWindow.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="Windows\RingCodeGuideWindow.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+  </ItemGroup>
+
   <!-- Special handling for Aero2 on non-Framework .NET -->
   <Target Name="SelectWpfThemeAssembly" AfterTargets="ResolveAssemblyReferences" Condition="'$(ReferenceWpfAeroTheme)' == 'true' OR '$(ReferenceWpfAero2Theme)' == 'true' OR '$(ReferenceWpfAeroLiteTheme)' == 'true' OR '$(ReferenceWpfClassicTheme)' == 'true' OR '$(ReferenceWpfLunaTheme)' == 'true' OR '$(ReferenceWpfRoyaleTheme)' == 'true'">
     <ItemGroup>
diff --git a/MPF.UI.Core/Theme.cs b/MPF/Theme.cs
similarity index 99%
rename from MPF.UI.Core/Theme.cs
rename to MPF/Theme.cs
index f395ab99..c6093403 100644
--- a/MPF.UI.Core/Theme.cs
+++ b/MPF/Theme.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace MPF.UI.Core
+namespace MPF.UI
 {
     /// <summary>
     /// Represents all required mapping values for the UI
diff --git a/MPF.UI.Core/UserControls/LogOutput.xaml b/MPF/UserControls/LogOutput.xaml
similarity index 96%
rename from MPF.UI.Core/UserControls/LogOutput.xaml
rename to MPF/UserControls/LogOutput.xaml
index 85f68610..abd491bb 100644
--- a/MPF.UI.Core/UserControls/LogOutput.xaml
+++ b/MPF/UserControls/LogOutput.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="MPF.UI.Core.UserControls.LogOutput"
+<UserControl x:Class="MPF.UI.UserControls.LogOutput"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/MPF.UI.Core/UserControls/LogOutput.xaml.cs b/MPF/UserControls/LogOutput.xaml.cs
similarity index 99%
rename from MPF.UI.Core/UserControls/LogOutput.xaml.cs
rename to MPF/UserControls/LogOutput.xaml.cs
index 92e2e226..1afa373e 100644
--- a/MPF.UI.Core/UserControls/LogOutput.xaml.cs
+++ b/MPF/UserControls/LogOutput.xaml.cs
@@ -9,7 +9,7 @@ using MPF.Core;
 
 #pragma warning disable IDE1006 // Naming Styles
 
-namespace MPF.UI.Core.UserControls
+namespace MPF.UI.UserControls
 {
     public partial class LogOutput : UserControl
     {
diff --git a/MPF.UI.Core/UserControls/UserInput.xaml b/MPF/UserControls/UserInput.xaml
similarity index 96%
rename from MPF.UI.Core/UserControls/UserInput.xaml
rename to MPF/UserControls/UserInput.xaml
index 1f3272ef..cdb9f5a5 100644
--- a/MPF.UI.Core/UserControls/UserInput.xaml
+++ b/MPF/UserControls/UserInput.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="MPF.UI.Core.UserControls.UserInput"
+<UserControl x:Class="MPF.UI.UserControls.UserInput"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/MPF.UI.Core/UserControls/UserInput.xaml.cs b/MPF/UserControls/UserInput.xaml.cs
similarity index 99%
rename from MPF.UI.Core/UserControls/UserInput.xaml.cs
rename to MPF/UserControls/UserInput.xaml.cs
index 05ffec18..ab1289b3 100644
--- a/MPF.UI.Core/UserControls/UserInput.xaml.cs
+++ b/MPF/UserControls/UserInput.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace MPF.UI.Core.UserControls
+namespace MPF.UI.UserControls
 {
     /// <summary>
     /// Interaction logic for UserInput.xaml
diff --git a/MPF.UI.Core/Windows/CheckDumpWindow.xaml b/MPF/Windows/CheckDumpWindow.xaml
similarity index 98%
rename from MPF.UI.Core/Windows/CheckDumpWindow.xaml
rename to MPF/Windows/CheckDumpWindow.xaml
index 2b927061..f6062cc6 100644
--- a/MPF.UI.Core/Windows/CheckDumpWindow.xaml
+++ b/MPF/Windows/CheckDumpWindow.xaml
@@ -1,10 +1,10 @@
-<coreWindows:WindowBase x:Class="MPF.UI.Core.Windows.CheckDumpWindow"
+<coreWindows:WindowBase x:Class="MPF.UI.Windows.CheckDumpWindow"
                         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                        xmlns:core="clr-namespace:MPF.UI.Core"
-                        xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
+                        xmlns:core="clr-namespace:MPF.UI"
+                        xmlns:coreWindows="clr-namespace:MPF.UI.Windows"
                         xmlns:viewModels="clr-namespace:MPF.Frontend.ViewModels;assembly=MPF.Frontend"
                         mc:Ignorable="d"
                         Title="Check Existing Dump" Width="600" WindowStyle="None"
diff --git a/MPF.UI.Core/Windows/CheckDumpWindow.xaml.cs b/MPF/Windows/CheckDumpWindow.xaml.cs
similarity index 99%
rename from MPF.UI.Core/Windows/CheckDumpWindow.xaml.cs
rename to MPF/Windows/CheckDumpWindow.xaml.cs
index c11888f8..8ceab781 100644
--- a/MPF.UI.Core/Windows/CheckDumpWindow.xaml.cs
+++ b/MPF/Windows/CheckDumpWindow.xaml.cs
@@ -9,7 +9,7 @@ using WinForms = System.Windows.Forms;
 
 #pragma warning disable IDE1006 // Naming Styles
 
-namespace MPF.UI.Core.Windows
+namespace MPF.UI.Windows
 {
     /// <summary>
     /// Interaction logic for CheckDumpWindow.xaml
diff --git a/MPF.UI.Core/Windows/CreateIRDWindow.xaml b/MPF/Windows/CreateIRDWindow.xaml
similarity index 98%
rename from MPF.UI.Core/Windows/CreateIRDWindow.xaml
rename to MPF/Windows/CreateIRDWindow.xaml
index a05a955d..0e64883a 100644
--- a/MPF.UI.Core/Windows/CreateIRDWindow.xaml
+++ b/MPF/Windows/CreateIRDWindow.xaml
@@ -1,10 +1,10 @@
-<coreWindows:WindowBase x:Class="MPF.UI.Core.Windows.CreateIRDWindow"
+<coreWindows:WindowBase x:Class="MPF.UI.Windows.CreateIRDWindow"
                         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                        xmlns:core="clr-namespace:MPF.UI.Core"
-                        xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
+                        xmlns:core="clr-namespace:MPF.UI"
+                        xmlns:coreWindows="clr-namespace:MPF.UI.Windows"
                         xmlns:viewModels="clr-namespace:MPF.Frontend.ViewModels;assembly=MPF.Frontend"
                         mc:Ignorable="d"
                         Title="Create PS3 IRD" Width="600" WindowStyle="None"
diff --git a/MPF.UI.Core/Windows/CreateIRDWindow.xaml.cs b/MPF/Windows/CreateIRDWindow.xaml.cs
similarity index 99%
rename from MPF.UI.Core/Windows/CreateIRDWindow.xaml.cs
rename to MPF/Windows/CreateIRDWindow.xaml.cs
index f9f2009b..c55f2b4d 100644
--- a/MPF.UI.Core/Windows/CreateIRDWindow.xaml.cs
+++ b/MPF/Windows/CreateIRDWindow.xaml.cs
@@ -8,7 +8,7 @@ using WinForms = System.Windows.Forms;
 
 #pragma warning disable IDE1006 // Naming Styles
 
-namespace MPF.UI.Core.Windows
+namespace MPF.UI.Windows
 {
     /// <summary>
     /// Interaction logic for CreateIRDWindow.xaml
diff --git a/MPF.UI.Core/Windows/DiscInformationWindow.xaml b/MPF/Windows/DiscInformationWindow.xaml
similarity index 99%
rename from MPF.UI.Core/Windows/DiscInformationWindow.xaml
rename to MPF/Windows/DiscInformationWindow.xaml
index ed06fd0d..0ecc0299 100644
--- a/MPF.UI.Core/Windows/DiscInformationWindow.xaml
+++ b/MPF/Windows/DiscInformationWindow.xaml
@@ -1,12 +1,12 @@
-<windows:WindowBase x:Class="MPF.UI.Core.Windows.DiscInformationWindow"
+<windows:WindowBase x:Class="MPF.UI.Windows.DiscInformationWindow"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:controls="clr-namespace:MPF.UI.Core.UserControls"
-        xmlns:core="clr-namespace:MPF.UI.Core"
+        xmlns:controls="clr-namespace:MPF.UI.UserControls"
+        xmlns:core="clr-namespace:MPF.UI"
         xmlns:redump="clr-namespace:SabreTools.RedumpLib.Data;assembly=SabreTools.RedumpLib"
-        xmlns:windows="clr-namespace:MPF.UI.Core.Windows"
+        xmlns:windows="clr-namespace:MPF.UI.Windows"
         mc:Ignorable="d"
         Title="Disc Information" Width="515" WindowStyle="None"
         WindowStartupLocation="CenterOwner" ResizeMode="CanMinimize" SizeToContent="Height"
diff --git a/MPF.UI.Core/Windows/DiscInformationWindow.xaml.cs b/MPF/Windows/DiscInformationWindow.xaml.cs
similarity index 99%
rename from MPF.UI.Core/Windows/DiscInformationWindow.xaml.cs
rename to MPF/Windows/DiscInformationWindow.xaml.cs
index 9b6db7e3..aedc4f17 100644
--- a/MPF.UI.Core/Windows/DiscInformationWindow.xaml.cs
+++ b/MPF/Windows/DiscInformationWindow.xaml.cs
@@ -4,12 +4,12 @@ using System.Windows.Controls;
 using MPF.Core;
 using MPF.Frontend.ViewModels;
 using MPF.Core.Utilities;
-using MPF.UI.Core.UserControls;
+using MPF.UI.UserControls;
 using SabreTools.RedumpLib.Data;
 
 #pragma warning disable IDE1006 // Naming Styles
 
-namespace MPF.UI.Core.Windows
+namespace MPF.UI.Windows
 {
     /// <summary>
     /// Interaction logic for DiscInformationWindow.xaml
diff --git a/MPF.UI.Core/Windows/MainWindow.xaml b/MPF/Windows/MainWindow.xaml
similarity index 98%
rename from MPF.UI.Core/Windows/MainWindow.xaml
rename to MPF/Windows/MainWindow.xaml
index 6795b19e..6ce595f8 100644
--- a/MPF.UI.Core/Windows/MainWindow.xaml
+++ b/MPF/Windows/MainWindow.xaml
@@ -1,11 +1,11 @@
-<coreWindows:WindowBase x:Class="MPF.UI.Core.Windows.MainWindow"
+<coreWindows:WindowBase x:Class="MPF.UI.Windows.MainWindow"
                         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                        xmlns:controls="clr-namespace:MPF.UI.Core.UserControls"
-                        xmlns:core="clr-namespace:MPF.UI.Core"
-                        xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
+                        xmlns:controls="clr-namespace:MPF.UI.UserControls"
+                        xmlns:core="clr-namespace:MPF.UI"
+                        xmlns:coreWindows="clr-namespace:MPF.UI.Windows"
                         xmlns:viewModels="clr-namespace:MPF.Frontend.ViewModels;assembly=MPF.Frontend"
                         mc:Ignorable="d"
                         Title="Media Preservation Frontend" Width="600" WindowStyle="None"
diff --git a/MPF.UI.Core/Windows/MainWindow.xaml.cs b/MPF/Windows/MainWindow.xaml.cs
similarity index 99%
rename from MPF.UI.Core/Windows/MainWindow.xaml.cs
rename to MPF/Windows/MainWindow.xaml.cs
index d48e1c59..99c17309 100644
--- a/MPF.UI.Core/Windows/MainWindow.xaml.cs
+++ b/MPF/Windows/MainWindow.xaml.cs
@@ -3,7 +3,7 @@ using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 using MPF.Frontend.ViewModels;
-using MPF.UI.Core.UserControls;
+using MPF.UI.UserControls;
 using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
 using WPFCustomMessageBox;
@@ -11,7 +11,7 @@ using WinForms = System.Windows.Forms;
 
 #pragma warning disable IDE1006 // Naming Styles
 
-namespace MPF.UI.Core.Windows
+namespace MPF.UI.Windows
 {
     public partial class MainWindow : WindowBase
     {
diff --git a/MPF.UI.Core/Windows/OptionsWindow.xaml b/MPF/Windows/OptionsWindow.xaml
similarity index 99%
rename from MPF.UI.Core/Windows/OptionsWindow.xaml
rename to MPF/Windows/OptionsWindow.xaml
index 0873cb7b..d1f28087 100644
--- a/MPF.UI.Core/Windows/OptionsWindow.xaml
+++ b/MPF/Windows/OptionsWindow.xaml
@@ -1,10 +1,10 @@
-<coreWindows:WindowBase x:Class="MPF.UI.Core.Windows.OptionsWindow"
+<coreWindows:WindowBase x:Class="MPF.UI.Windows.OptionsWindow"
                         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                        xmlns:core="clr-namespace:MPF.UI.Core"
-                        xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows"
+                        xmlns:core="clr-namespace:MPF.UI"
+                        xmlns:coreWindows="clr-namespace:MPF.UI.Windows"
                         xmlns:viewModels="clr-namespace:MPF.Frontend.ViewModels;assembly=MPF.Frontend"
                         mc:Ignorable="d"
                         Width="515.132" WindowStyle="None"
diff --git a/MPF.UI.Core/Windows/OptionsWindow.xaml.cs b/MPF/Windows/OptionsWindow.xaml.cs
similarity index 99%
rename from MPF.UI.Core/Windows/OptionsWindow.xaml.cs
rename to MPF/Windows/OptionsWindow.xaml.cs
index 8e5f3a81..d1ee2aa7 100644
--- a/MPF.UI.Core/Windows/OptionsWindow.xaml.cs
+++ b/MPF/Windows/OptionsWindow.xaml.cs
@@ -10,7 +10,7 @@ using WPFCustomMessageBox;
 
 #pragma warning disable IDE1006 // Naming Styles
 
-namespace MPF.UI.Core.Windows
+namespace MPF.UI.Windows
 {
     /// <summary>
     /// Interaction logic for OptionsWindow.xaml
diff --git a/MPF.UI.Core/Windows/RingCodeGuideWindow.xaml b/MPF/Windows/RingCodeGuideWindow.xaml
similarity index 98%
rename from MPF.UI.Core/Windows/RingCodeGuideWindow.xaml
rename to MPF/Windows/RingCodeGuideWindow.xaml
index c8a3653e..7a8e7656 100644
--- a/MPF.UI.Core/Windows/RingCodeGuideWindow.xaml
+++ b/MPF/Windows/RingCodeGuideWindow.xaml
@@ -1,10 +1,10 @@
-<windows:WindowBase x:Class="MPF.UI.Core.Windows.RingCodeGuideWindow"
+<windows:WindowBase x:Class="MPF.UI.Windows.RingCodeGuideWindow"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:controls="clr-namespace:MPF.UI.Core.UserControls"
-        xmlns:windows="clr-namespace:MPF.UI.Core.Windows"
+        xmlns:controls="clr-namespace:MPF.UI.UserControls"
+        xmlns:windows="clr-namespace:MPF.UI.Windows"
         mc:Ignorable="d"
         Title="Ring Code Guide" Width="500" WindowStyle="None"
         WindowStartupLocation="CenterOwner" ResizeMode="CanMinimize" SizeToContent="Height"
diff --git a/MPF.UI.Core/Windows/RingCodeGuideWindow.xaml.cs b/MPF/Windows/RingCodeGuideWindow.xaml.cs
similarity index 94%
rename from MPF.UI.Core/Windows/RingCodeGuideWindow.xaml.cs
rename to MPF/Windows/RingCodeGuideWindow.xaml.cs
index db1c49bf..9756860b 100644
--- a/MPF.UI.Core/Windows/RingCodeGuideWindow.xaml.cs
+++ b/MPF/Windows/RingCodeGuideWindow.xaml.cs
@@ -1,4 +1,4 @@
-namespace MPF.UI.Core.Windows
+namespace MPF.UI.Windows
 {
     /// <summary>
     /// Interaction logic for RingCodeGuideWindow.xaml
diff --git a/MPF.UI.Core/Windows/WindowBase.cs b/MPF/Windows/WindowBase.cs
similarity index 97%
rename from MPF.UI.Core/Windows/WindowBase.cs
rename to MPF/Windows/WindowBase.cs
index e48de1a9..ccc83fa9 100644
--- a/MPF.UI.Core/Windows/WindowBase.cs
+++ b/MPF/Windows/WindowBase.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace MPF.UI.Core.Windows
+namespace MPF.UI.Windows
 {
     public class WindowBase : Window
     {