diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj
index f385aa37..2d0b5b39 100644
--- a/Source/AaxDecrypter/AaxDecrypter.csproj
+++ b/Source/AaxDecrypter/AaxDecrypter.csproj
@@ -16,7 +16,6 @@
 	  <PackageReference Include="AAXClean.Codecs" Version="0.2.12" />
 	</ItemGroup>
 
-
 	<ItemGroup>
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
diff --git a/Source/LibationAvalonia/AvaloniaUI/App.axaml b/Source/LibationAvalonia/App.axaml
similarity index 66%
rename from Source/LibationAvalonia/AvaloniaUI/App.axaml
rename to Source/LibationAvalonia/App.axaml
index 75ff7054..cbfd5ab2 100644
--- a/Source/LibationAvalonia/AvaloniaUI/App.axaml
+++ b/Source/LibationAvalonia/App.axaml
@@ -1,7 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="using:LibationAvalonia.AvaloniaUI"
-			 x:Class="LibationAvalonia.AvaloniaUI.App">
+             xmlns:local="using:LibationAvalonia"
+			 x:Class="LibationAvalonia.App">
 	
 	<Application.DataTemplates>
 		<local:ViewLocator/>
@@ -11,7 +11,7 @@
         <FluentTheme Mode="Light"/>
 		<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
 		<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-		<StyleInclude Source="/AvaloniaUI/Assets/DataGridTheme.xaml"/>
-		<StyleInclude Source="/AvaloniaUI/Assets/LibationStyles.xaml"/>
+		<StyleInclude Source="/Assets/DataGridTheme.xaml"/>
+		<StyleInclude Source="/Assets/LibationStyles.xaml"/>
 	</Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/Source/LibationAvalonia/AvaloniaUI/App.axaml.cs b/Source/LibationAvalonia/App.axaml.cs
similarity index 90%
rename from Source/LibationAvalonia/AvaloniaUI/App.axaml.cs
rename to Source/LibationAvalonia/App.axaml.cs
index 978c33c4..a064ac39 100644
--- a/Source/LibationAvalonia/AvaloniaUI/App.axaml.cs
+++ b/Source/LibationAvalonia/App.axaml.cs
@@ -3,14 +3,15 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using LibationFileManager;
-using LibationAvalonia.AvaloniaUI.Views;
+using LibationAvalonia.Views;
 using System;
 using Avalonia.Platform;
 
-namespace LibationAvalonia.AvaloniaUI
+namespace LibationAvalonia
 {
 	public class App : Application
 	{
+		public static readonly PlatformID PlatformID = Environment.OSVersion.Platform;
 		public static IBrush ProcessQueueBookFailedBrush { get; private set; }
 		public static IBrush ProcessQueueBookCompletedBrush { get; private set; }
 		public static IBrush ProcessQueueBookCancelledBrush { get; private set; }
@@ -19,10 +20,11 @@ namespace LibationAvalonia.AvaloniaUI
 
 		public static IAssetLoader AssetLoader { get; private set; }
 
-		public static readonly Uri AssetUriBase = new Uri("avares://Libation/AvaloniaUI/Assets/");
+		public static readonly Uri AssetUriBase = new Uri("avares://Libation/Assets/");
 		public static System.IO.Stream OpenAsset(string assetRelativePath)
 			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
 
+
 		public override void Initialize()
 		{
 			AvaloniaXamlLoader.Load(this);
@@ -33,7 +35,7 @@ namespace LibationAvalonia.AvaloniaUI
 		{
 			LoadStyles();
 
-			var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/AvaloniaUI/Assets/WINGDING.TTF"), "SEGOEUI_Local"));
+			var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/Assets/WINGDING.TTF"), "SEGOEUI_Local"));
 			var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI);
 
 
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/1x1.png b/Source/LibationAvalonia/Assets/1x1.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/1x1.png
rename to Source/LibationAvalonia/Assets/1x1.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/DataGridTheme.xaml b/Source/LibationAvalonia/Assets/DataGridTheme.xaml
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/DataGridTheme.xaml
rename to Source/LibationAvalonia/Assets/DataGridTheme.xaml
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/LibationStyles.xaml b/Source/LibationAvalonia/Assets/LibationStyles.xaml
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/LibationStyles.xaml
rename to Source/LibationAvalonia/Assets/LibationStyles.xaml
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Asterisk.png b/Source/LibationAvalonia/Assets/MBIcons/Asterisk.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Asterisk.png
rename to Source/LibationAvalonia/Assets/MBIcons/Asterisk.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Exclamation.png b/Source/LibationAvalonia/Assets/MBIcons/Exclamation.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Exclamation.png
rename to Source/LibationAvalonia/Assets/MBIcons/Exclamation.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Question.png b/Source/LibationAvalonia/Assets/MBIcons/Question.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/Question.png
rename to Source/LibationAvalonia/Assets/MBIcons/Question.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/error.png b/Source/LibationAvalonia/Assets/MBIcons/error.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/MBIcons/error.png
rename to Source/LibationAvalonia/Assets/MBIcons/error.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/SEGOEUI.TTF b/Source/LibationAvalonia/Assets/SEGOEUI.TTF
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/SEGOEUI.TTF
rename to Source/LibationAvalonia/Assets/SEGOEUI.TTF
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/WINGDING.TTF b/Source/LibationAvalonia/Assets/WINGDING.TTF
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/WINGDING.TTF
rename to Source/LibationAvalonia/Assets/WINGDING.TTF
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/cancel.png b/Source/LibationAvalonia/Assets/cancel.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/cancel.png
rename to Source/LibationAvalonia/Assets/cancel.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/completed.png b/Source/LibationAvalonia/Assets/completed.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/completed.png
rename to Source/LibationAvalonia/Assets/completed.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/down.png b/Source/LibationAvalonia/Assets/down.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/down.png
rename to Source/LibationAvalonia/Assets/down.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/download-arrow.png b/Source/LibationAvalonia/Assets/download-arrow.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/download-arrow.png
rename to Source/LibationAvalonia/Assets/download-arrow.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/edit-tags-25x25.png b/Source/LibationAvalonia/Assets/edit-tags-25x25.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/edit-tags-25x25.png
rename to Source/LibationAvalonia/Assets/edit-tags-25x25.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/edit-tags-50x50.png b/Source/LibationAvalonia/Assets/edit-tags-50x50.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/edit-tags-50x50.png
rename to Source/LibationAvalonia/Assets/edit-tags-50x50.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/edit_25x25.png b/Source/LibationAvalonia/Assets/edit_25x25.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/edit_25x25.png
rename to Source/LibationAvalonia/Assets/edit_25x25.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/edit_64x64.png b/Source/LibationAvalonia/Assets/edit_64x64.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/edit_64x64.png
rename to Source/LibationAvalonia/Assets/edit_64x64.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/error.png b/Source/LibationAvalonia/Assets/error.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/error.png
rename to Source/LibationAvalonia/Assets/error.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/errored.png b/Source/LibationAvalonia/Assets/errored.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/errored.png
rename to Source/LibationAvalonia/Assets/errored.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/first.png b/Source/LibationAvalonia/Assets/first.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/first.png
rename to Source/LibationAvalonia/Assets/first.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/glass-with-glow_16.png b/Source/LibationAvalonia/Assets/glass-with-glow_16.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/glass-with-glow_16.png
rename to Source/LibationAvalonia/Assets/glass-with-glow_16.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_300x300.jpg b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_300x300.jpg
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_300x300.jpg
rename to Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_300x300.jpg
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_500x500.jpg b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_500x500.jpg
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_500x500.jpg
rename to Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_500x500.jpg
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_80x80.jpg b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_80x80.jpg
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/img-coverart-prod-unavailable_80x80.jpg
rename to Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_80x80.jpg
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/import_16x16.png b/Source/LibationAvalonia/Assets/import_16x16.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/import_16x16.png
rename to Source/LibationAvalonia/Assets/import_16x16.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/last.png b/Source/LibationAvalonia/Assets/last.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/last.png
rename to Source/LibationAvalonia/Assets/last.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/libation.ico b/Source/LibationAvalonia/Assets/libation.ico
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/libation.ico
rename to Source/LibationAvalonia/Assets/libation.ico
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green.png b/Source/LibationAvalonia/Assets/liberate_green.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green.png
rename to Source/LibationAvalonia/Assets/liberate_green.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_green_pdf_no.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green_pdf_no.png
rename to Source/LibationAvalonia/Assets/liberate_green_pdf_no.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_green_pdf_yes.png
rename to Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red.png b/Source/LibationAvalonia/Assets/liberate_red.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red.png
rename to Source/LibationAvalonia/Assets/liberate_red.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_red_pdf_no.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red_pdf_no.png
rename to Source/LibationAvalonia/Assets/liberate_red_pdf_no.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_red_pdf_yes.png
rename to Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow.png b/Source/LibationAvalonia/Assets/liberate_yellow.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow.png
rename to Source/LibationAvalonia/Assets/liberate_yellow.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow_pdf_no.png
rename to Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/liberate_yellow_pdf_yes.png
rename to Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/minus.png b/Source/LibationAvalonia/Assets/minus.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/minus.png
rename to Source/LibationAvalonia/Assets/minus.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/plus.png b/Source/LibationAvalonia/Assets/plus.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/plus.png
rename to Source/LibationAvalonia/Assets/plus.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/queued.png b/Source/LibationAvalonia/Assets/queued.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/queued.png
rename to Source/LibationAvalonia/Assets/queued.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/Assets/up.png b/Source/LibationAvalonia/Assets/up.png
similarity index 100%
rename from Source/LibationAvalonia/AvaloniaUI/Assets/up.png
rename to Source/LibationAvalonia/Assets/up.png
diff --git a/Source/LibationAvalonia/AvaloniaUI/AvaloniaUtils.cs b/Source/LibationAvalonia/AvaloniaUtils.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/AvaloniaUtils.cs
rename to Source/LibationAvalonia/AvaloniaUtils.cs
index 2117f8bb..7ade8b9a 100644
--- a/Source/LibationAvalonia/AvaloniaUI/AvaloniaUtils.cs
+++ b/Source/LibationAvalonia/AvaloniaUtils.cs
@@ -3,7 +3,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI
+namespace LibationAvalonia
 {
 	internal static class AvaloniaUtils
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml b/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml
similarity index 65%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml
rename to Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml
index b5eb1864..d51e730d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml
+++ b/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml
@@ -1,5 +1,5 @@
 <DataGridCheckBoxColumn xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="LibationAvalonia.AvaloniaUI.Controls.DataGridCheckBoxColumnExt">
+        x:Class="LibationAvalonia.Controls.DataGridCheckBoxColumnExt">
 
 </DataGridCheckBoxColumn >
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml.cs b/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml.cs
similarity index 83%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml.cs
rename to Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml.cs
index cb94668f..2c686498 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml.cs
+++ b/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml.cs
@@ -1,8 +1,8 @@
 using Avalonia.Controls;
-using LibationAvalonia.AvaloniaUI.ViewModels;
+using LibationAvalonia.ViewModels;
 using System;
 
-namespace LibationAvalonia.AvaloniaUI.Controls
+namespace LibationAvalonia.Controls
 {
 	public partial class DataGridCheckBoxColumnExt : DataGridCheckBoxColumn
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml b/Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml
similarity index 87%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml
rename to Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml
index 5eefc960..f10b1767 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml
+++ b/Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml
@@ -2,9 +2,9 @@
              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:LibationAvalonia.AvaloniaUI.Controls"
+             xmlns:controls="clr-namespace:LibationAvalonia.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="LibationAvalonia.AvaloniaUI.Controls.DirectoryOrCustomSelectControl">
+             x:Class="LibationAvalonia.Controls.DirectoryOrCustomSelectControl">
 	<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
 	<controls:DirectorySelectControl
 		Grid.Column="1"
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml.cs b/Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml.cs
rename to Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs
index 5fa29afb..6002753d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectoryOrCustomSelectControl.axaml.cs
+++ b/Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs
@@ -6,7 +6,7 @@ using LibationFileManager;
 using System.Collections.Generic;
 using ReactiveUI;
 
-namespace LibationAvalonia.AvaloniaUI.Controls
+namespace LibationAvalonia.Controls
 {
 	public partial class DirectoryOrCustomSelectControl : UserControl
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml b/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml
similarity index 89%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml
rename to Source/LibationAvalonia/Controls/DirectorySelectControl.axaml
index 5aa5a0c4..45f6fe02 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml
+++ b/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml
@@ -2,9 +2,9 @@
              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:LibationAvalonia.AvaloniaUI.Controls"
+			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="LibationAvalonia.AvaloniaUI.Controls.DirectorySelectControl">
+             x:Class="LibationAvalonia.Controls.DirectorySelectControl">
 	
 	<UserControl.Resources>
 		<controls:KnownDirectoryConverter x:Key="KnownDirectoryConverter" />
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml.cs b/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml.cs
rename to Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs
index 165733bd..f9dae279 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/DirectorySelectControl.axaml.cs
+++ b/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs
@@ -11,7 +11,7 @@ using Avalonia.Data;
 using System.IO;
 using System.Reactive.Subjects;
 
-namespace LibationAvalonia.AvaloniaUI.Controls
+namespace LibationAvalonia.Controls
 {
 	public class KnownDirectoryConverter : IValueConverter
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml b/Source/LibationAvalonia/Controls/GroupBox.axaml
similarity index 91%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml
rename to Source/LibationAvalonia/Controls/GroupBox.axaml
index 316b227e..f8c2b755 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml
+++ b/Source/LibationAvalonia/Controls/GroupBox.axaml
@@ -2,9 +2,9 @@
              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:LibationAvalonia.AvaloniaUI.Controls"
+			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="LibationAvalonia.AvaloniaUI.Controls.GroupBox">
+             x:Class="LibationAvalonia.Controls.GroupBox">
 
 	<Design.DataContext>
 	</Design.DataContext>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml.cs b/Source/LibationAvalonia/Controls/GroupBox.axaml.cs
similarity index 94%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml.cs
rename to Source/LibationAvalonia/Controls/GroupBox.axaml.cs
index b55aea47..41bf2e2f 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/GroupBox.axaml.cs
+++ b/Source/LibationAvalonia/Controls/GroupBox.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace LibationAvalonia.AvaloniaUI.Controls
+namespace LibationAvalonia.Controls
 {
 	public partial class GroupBox : ContentControl
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml b/Source/LibationAvalonia/Controls/LinkLabel.axaml
similarity index 88%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml
rename to Source/LibationAvalonia/Controls/LinkLabel.axaml
index 07f61366..e1043dfc 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml
+++ b/Source/LibationAvalonia/Controls/LinkLabel.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="LibationAvalonia.AvaloniaUI.Controls.LinkLabel">
+             x:Class="LibationAvalonia.Controls.LinkLabel">
 	<TextBlock.Styles>
 		<Style Selector="TextBlock">
 			<Setter Property="Foreground" Value="Blue"/>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml.cs b/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs
similarity index 93%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml.cs
rename to Source/LibationAvalonia/Controls/LinkLabel.axaml.cs
index 298090bc..0d75021e 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/LinkLabel.axaml.cs
+++ b/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 using System;
 
-namespace LibationAvalonia.AvaloniaUI.Controls
+namespace LibationAvalonia.Controls
 {
 	public partial class LinkLabel : TextBlock, IStyleable
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/WheelComboBox.axaml b/Source/LibationAvalonia/Controls/WheelComboBox.axaml
similarity index 78%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/WheelComboBox.axaml
rename to Source/LibationAvalonia/Controls/WheelComboBox.axaml
index 80632072..bf8f10ee 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/WheelComboBox.axaml
+++ b/Source/LibationAvalonia/Controls/WheelComboBox.axaml
@@ -1,6 +1,6 @@
 <ComboBox xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="LibationAvalonia.AvaloniaUI.Controls.WheelComboBox">
+             x:Class="LibationAvalonia.Controls.WheelComboBox">
 	<ComboBox.Styles>
 		<Style Selector="ItemsPresenter#PART_ItemsPresenter">
 			<Setter Property="Height" Value="NaN"/>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Controls/WheelComboBox.axaml.cs b/Source/LibationAvalonia/Controls/WheelComboBox.axaml.cs
similarity index 93%
rename from Source/LibationAvalonia/AvaloniaUI/Controls/WheelComboBox.axaml.cs
rename to Source/LibationAvalonia/Controls/WheelComboBox.axaml.cs
index 136ae8ea..0af4d398 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Controls/WheelComboBox.axaml.cs
+++ b/Source/LibationAvalonia/Controls/WheelComboBox.axaml.cs
@@ -7,7 +7,7 @@ using System;
 using System.Collections;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Controls
+namespace LibationAvalonia.Controls
 {
 	public partial class WheelComboBox : ComboBox, IStyleable
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/AccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
similarity index 96%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/AccountsDialog.axaml
rename to Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
index 0bf81c2d..024ec246 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/AccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
@@ -4,9 +4,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         Width="800" Height="450"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.AccountsDialog"
+        x:Class="LibationAvalonia.Dialogs.AccountsDialog"
         Title="Audible Accounts"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 	<Grid RowDefinitions="*,Auto">
 
 		<Grid.Styles>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/AccountsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/AccountsDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs
index 097bb7bf..eb2e466c 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/AccountsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using ReactiveUI;
 using AudibleApi;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class AccountsDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/BookDetailsDialog.axaml b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/BookDetailsDialog.axaml
rename to Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
index 1804cb71..a8544aaa 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/BookDetailsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
@@ -5,10 +5,10 @@
         mc:Ignorable="d" d:DesignWidth="550" d:DesignHeight="450"
 		MinWidth="550" MinHeight="450"
 		Width="650" Height="500"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.BookDetailsDialog"
-		xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls"
+        x:Class="LibationAvalonia.Dialogs.BookDetailsDialog"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         Title="Book Details" Name="BookDetails"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid RowDefinitions="*,Auto,Auto,40">
 		<Grid.Styles>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/BookDetailsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/BookDetailsDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
index 4e7622d4..91fcc3f5 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/BookDetailsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
@@ -6,12 +6,12 @@ using Avalonia.Media.Imaging;
 using DataLayer;
 using Dinah.Core;
 using LibationFileManager;
-using LibationAvalonia.AvaloniaUI.ViewModels;
+using LibationAvalonia.ViewModels;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class BookDetailsDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DescriptionDisplayDialog.axaml b/Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml
similarity index 88%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DescriptionDisplayDialog.axaml
rename to Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml
index 46933ff9..17962b60 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DescriptionDisplayDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml
@@ -3,7 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="540" d:DesignHeight="140"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.DescriptionDisplayDialog"
+        x:Class="LibationAvalonia.Dialogs.DescriptionDisplayDialog"
 		SystemDecorations="None"
         Title="DescriptionDisplay">	
 		
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DescriptionDisplayDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DescriptionDisplayDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml.cs
index 0d2a2d2c..a891b98f 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DescriptionDisplayDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using System;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class DescriptionDisplayDialog : Window
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DialogWindow.cs b/Source/LibationAvalonia/Dialogs/DialogWindow.cs
similarity index 96%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DialogWindow.cs
rename to Source/LibationAvalonia/Dialogs/DialogWindow.cs
index 6b654a15..f6d86c90 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/DialogWindow.cs
+++ b/Source/LibationAvalonia/Dialogs/DialogWindow.cs
@@ -4,7 +4,7 @@ using LibationFileManager;
 using System;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public abstract class DialogWindow : Window
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditQuickFilters.axaml b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditQuickFilters.axaml
rename to Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
index 6403fa41..b4811e46 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditQuickFilters.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
@@ -4,9 +4,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="350"
         Width="800" Height="450"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.EditQuickFilters"
+        x:Class="LibationAvalonia.Dialogs.EditQuickFilters"
         Title="Audible Accounts"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 	<Grid RowDefinitions="*,Auto">
 
 		<Grid.Styles>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditQuickFilters.axaml.cs b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditQuickFilters.axaml.cs
rename to Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml.cs
index 344349d1..52b65df1 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditQuickFilters.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml.cs
@@ -5,7 +5,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using ReactiveUI;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class EditQuickFilters : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
similarity index 96%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml
rename to Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
index 1e5ccd9a..84d7a3e5 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
@@ -3,7 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.EditReplacementChars"
+        x:Class="LibationAvalonia.Dialogs.EditReplacementChars"
         Title="EditReplacementChars">
 
 	<DataGrid
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml.cs b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml.cs
rename to Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs
index e7388a94..698e8f7a 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditReplacementChars.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs
@@ -8,7 +8,7 @@ using System.Collections.ObjectModel;
 using ReactiveUI;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class EditReplacementChars : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
similarity index 93%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml
rename to Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
index b31d0d82..749f1718 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
@@ -3,9 +3,9 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.EditTemplateDialog"
-		xmlns:dialogs="clr-namespace:LibationAvalonia.AvaloniaUI.Views.Dialogs"
-		Icon="/AvaloniaUI/Assets/libation.ico"
+        x:Class="LibationAvalonia.Dialogs.EditTemplateDialog"
+		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
+		Icon="/Assets/libation.ico"
         Title="EditTemplateDialog">
 
 	<Window.Resources>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs
index 33d4f8e4..f5846da3 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/EditTemplateDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs
@@ -15,7 +15,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using ReactiveUI;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	class BracketEscapeConverter : IValueConverter
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ImageDisplayDialog.axaml b/Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml
similarity index 84%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ImageDisplayDialog.axaml
rename to Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml
index 3bb07bdf..a6f0cfd7 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ImageDisplayDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml
@@ -3,11 +3,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="500"		
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.ImageDisplayDialog"
+        x:Class="LibationAvalonia.Dialogs.ImageDisplayDialog"
 		MinWidth="500" MinHeight="500"
         Title="Cover"
 		WindowStartupLocation="CenterOwner"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Image Stretch="Uniform" Source="{Binding CoverImage}">
 		<Image.ContextMenu>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ImageDisplayDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ImageDisplayDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs
index 1a8b0def..847abeeb 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ImageDisplayDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs
@@ -8,7 +8,7 @@ using System.ComponentModel;
 using System.IO;
 using ReactiveUI;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class ImageDisplayDialog : DialogWindow, INotifyPropertyChanged
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LibationFilesDialog.axaml b/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
similarity index 79%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LibationFilesDialog.axaml
rename to Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
index 0a1ddc8c..9f0e5c94 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LibationFilesDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
@@ -5,10 +5,10 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="165"
 		MinHeight="165" MaxHeight="165"
 		MinWidth="800" MaxWidth="800"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.LibationFilesDialog"
-        xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls"
+        x:Class="LibationAvalonia.Dialogs.LibationFilesDialog"
+        xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         Title="Book Details"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 	
 	<Grid
 		RowDefinitions="Auto,Auto">
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LibationFilesDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs
similarity index 93%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LibationFilesDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs
index 16aa4e16..7bd575d9 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LibationFilesDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs
@@ -2,11 +2,11 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using LibationFileManager;
-using LibationAvalonia.AvaloniaUI.Controls;
+using LibationAvalonia.Controls;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class LibationFilesDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LiberatedStatusBatchDialog.axaml b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchDialog.axaml
similarity index 88%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LiberatedStatusBatchDialog.axaml
rename to Source/LibationAvalonia/Dialogs/LiberatedStatusBatchDialog.axaml
index cd20cb30..826f322c 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LiberatedStatusBatchDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchDialog.axaml
@@ -3,13 +3,13 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="120"
-		xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.LiberatedStatusBatchDialog"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        x:Class="LibationAvalonia.Dialogs.LiberatedStatusBatchDialog"
         Title="Liberated status: Whether the book has been downloaded"
 		MinWidth="400" MinHeight="120"
 		MaxWidth="400" MaxHeight="120"
 		WindowStartupLocation="CenterOwner"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid RowDefinitions="Auto,Auto,Auto">
 
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LiberatedStatusBatchDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchDialog.axaml.cs
similarity index 96%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LiberatedStatusBatchDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/LiberatedStatusBatchDialog.axaml.cs
index 317706d0..2cc28d67 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/LiberatedStatusBatchDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/LiberatedStatusBatchDialog.axaml.cs
@@ -3,7 +3,7 @@ using DataLayer;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class LiberatedStatusBatchDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/ApprovalNeededDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml
similarity index 87%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/ApprovalNeededDialog.axaml
rename to Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml
index d90498ce..b092792e 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/ApprovalNeededDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml
@@ -5,9 +5,9 @@
         mc:Ignorable="d" d:DesignWidth="240" d:DesignHeight="120"
 		MinWidth="240" MinHeight="120"
 		MaxWidth="240" MaxHeight="120"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.Login.ApprovalNeededDialog"
+        x:Class="LibationAvalonia.Dialogs.Login.ApprovalNeededDialog"
         Title="Approval Alert Detected"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid RowDefinitions="Auto,Auto,*">
 
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/ApprovalNeededDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml.cs
similarity index 91%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/ApprovalNeededDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml.cs
index 05d2e871..914ee0fc 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/ApprovalNeededDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class ApprovalNeededDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginBase.cs b/Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginBase.cs
similarity index 91%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginBase.cs
rename to Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginBase.cs
index f27092c9..2ebfae9e 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginBase.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginBase.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using System;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public abstract class AvaloniaLoginBase
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginCallback.cs b/Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginCallback.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginCallback.cs
rename to Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginCallback.cs
index 3244dfd9..c703349c 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginCallback.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginCallback.cs
@@ -2,7 +2,7 @@
 using AudibleApi;
 using AudibleUtilities;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public class AvaloniaLoginCallback : AvaloniaLoginBase, ILoginCallback
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginChoiceEager.cs b/Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginChoiceEager.cs
rename to Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs
index 586794f8..4ab3afb9 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/AvaloniaLoginChoiceEager.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using AudibleApi;
 using AudibleUtilities;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public class AvaloniaLoginChoiceEager : AvaloniaLoginBase, ILoginChoiceEager
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/CaptchaDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml
similarity index 90%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/CaptchaDialog.axaml
rename to Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml
index 9b81c4e2..5fa498fe 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/CaptchaDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml
@@ -5,9 +5,9 @@
         mc:Ignorable="d" d:DesignWidth="220" d:DesignHeight="180"
 		MinWidth="220" MinHeight="180"
 		MaxWidth="220" MaxHeight="180"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.Login.CaptchaDialog"
+        x:Class="LibationAvalonia.Dialogs.Login.CaptchaDialog"
         Title="CAPTCHA"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid
 		RowDefinitions="Auto,Auto,*"
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/CaptchaDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml.cs
similarity index 93%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/CaptchaDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml.cs
index 6c0319dc..ad796d97 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/CaptchaDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Media.Imaging;
 using System.IO;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class CaptchaDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginCallbackDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml
similarity index 90%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginCallbackDialog.axaml
rename to Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml
index d3523375..0a27e987 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginCallbackDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml
@@ -5,9 +5,9 @@
         mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="120"
 		MinWidth="300" MinHeight="120"
 		Width="300" Height="120"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.Login.LoginCallbackDialog"
+        x:Class="LibationAvalonia.Dialogs.Login.LoginCallbackDialog"
         Title="Audible Login" 
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 
 	<Grid RowDefinitions="Auto,Auto,Auto,*" ColumnDefinitions="*" Margin="5">
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginCallbackDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginCallbackDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml.cs
index c5cf5fb2..a37c25e0 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginCallbackDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml.cs
@@ -6,7 +6,7 @@ using Dinah.Core;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class LoginCallbackDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginChoiceEagerDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml
similarity index 88%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginChoiceEagerDialog.axaml
rename to Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml
index e14bef2b..e84e40c4 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginChoiceEagerDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml
@@ -6,10 +6,10 @@
 		MinWidth="350" MinHeight="200"
 		Width="350" Height="200"
 		WindowStartupLocation="CenterOwner"
-		xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.Login.LoginChoiceEagerDialog"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        x:Class="LibationAvalonia.Dialogs.Login.LoginChoiceEagerDialog"
         Title="Audible Login"
-		Icon="/AvaloniaUI/Assets/libation.ico" >
+		Icon="/Assets/libation.ico" >
 
 	<Grid RowDefinitions="Auto,Auto,Auto,*" ColumnDefinitions="*" Margin="5">
 		
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs
similarity index 94%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs
index 1af1c81d..4871ab16 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class LoginChoiceEagerDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginExternalDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginExternalDialog.axaml
rename to Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
index a304791b..be84a3f6 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginExternalDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
@@ -5,9 +5,9 @@
         mc:Ignorable="d" d:DesignWidth="650" d:DesignHeight="500"
 		Width="650" Height="500"
 		WindowStartupLocation="CenterOwner"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.Login.LoginExternalDialog"
+        x:Class="LibationAvalonia.Dialogs.Login.LoginExternalDialog"
         Title="Audible Login External"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid RowDefinitions="Auto,Auto,*,Auto,*" ColumnDefinitions="*" Margin="5">
 
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginExternalDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs
similarity index 96%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginExternalDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs
index 2bbe514c..7021772a 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/LoginExternalDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs
@@ -8,7 +8,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class LoginExternalDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/MfaDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml
similarity index 85%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/MfaDialog.axaml
rename to Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml
index 9fc5be74..a9a7df6b 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/MfaDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml
@@ -5,9 +5,9 @@
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="160"
 		MinWidth="400" MinHeight="160"
 		MaxWidth="400" MaxHeight="160"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.Login.MfaDialog"
+        x:Class="LibationAvalonia.Dialogs.Login.MfaDialog"
         Title="Two-Step Verification"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid RowDefinitions="*,Auto">
 
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/MfaDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/MfaDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml.cs
index 5b08b3fd..ccbd129e 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/MfaDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Data;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class MfaDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/_2faCodeDialog.axaml b/Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml
similarity index 86%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/_2faCodeDialog.axaml
rename to Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml
index 04dd26a3..325bfb9d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/_2faCodeDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml
@@ -5,9 +5,9 @@
         mc:Ignorable="d" d:DesignWidth="140" d:DesignHeight="100"
 		MinWidth="140" MinHeight="100"
 		MaxWidth="140" MaxHeight="100"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.Login._2faCodeDialog"
+        x:Class="LibationAvalonia.Dialogs.Login._2faCodeDialog"
         Title="2FA Code"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 	
 	<Grid RowDefinitions="Auto,Auto,*">
 		
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/_2faCodeDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml.cs
similarity index 91%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/_2faCodeDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml.cs
index 919f7da6..4e82bce9 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/Login/_2faCodeDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs.Login
+namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class _2faCodeDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxAlertAdminDialog.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
similarity index 86%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxAlertAdminDialog.axaml
rename to Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
index 1273f788..85ad861d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxAlertAdminDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
@@ -5,11 +5,11 @@
         mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450"
 		MinWidth="600" MinHeight="450"
 		MaxWidth="600" MaxHeight="450"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.MessageBoxAlertAdminDialog"
-		xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls"
+        x:Class="LibationAvalonia.Dialogs.MessageBoxAlertAdminDialog"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         Title="MessageBoxAlertAdminDialog"
 		WindowStartupLocation="CenterOwner"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid RowDefinitions="Auto,*,Auto,Auto">
 
@@ -18,7 +18,7 @@
 			Margin="10,10,10,0"
 			ColumnDefinitions="Auto,*">
 			
-			<Image Grid.Column="0" Width="64" Height="64" Source="/AvaloniaUI/Assets/MBIcons/error.png" />
+			<Image Grid.Column="0" Width="64" Height="64" Source="/Assets/MBIcons/error.png" />
 			<TextBlock
 				Grid.Column="1"
 				Margin="10"
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxAlertAdminDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxAlertAdminDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs
index 7f450b70..6de5f6bd 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxAlertAdminDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs
@@ -4,7 +4,7 @@ using Dinah.Core;
 using FileManager;
 using System;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class MessageBoxAlertAdminDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
similarity index 86%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml
rename to Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
index b21d4bba..416eebb8 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
@@ -1,13 +1,13 @@
 <Window xmlns="https://github.com/avaloniaui"
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:vm="clr-namespace:LibationAvalonia.AvaloniaUI.ViewModels"
+		xmlns:vm="clr-namespace:LibationAvalonia.ViewModels"
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         mc:Ignorable="d" d:DesignWidth="265" d:DesignHeight="110"
 		MinWidth="265" MinHeight="110"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.MessageBoxWindow"
+        x:Class="LibationAvalonia.Dialogs.MessageBoxWindow"
         Title="{Binding Caption}" HasSystemDecorations="True" ShowInTaskbar="True"
-		Icon="/AvaloniaUI/Assets/1x1.png">
+		Icon="/Assets/1x1.png">
 	<Grid ColumnDefinitions="*" RowDefinitions="*,Auto">
 		
 		<DockPanel Margin="5,10,10,20" Grid.Row="0" Background="White">
@@ -15,10 +15,10 @@
 				VerticalAlignment="Top">
 			
 				<Panel Grid.Column="0" Margin="5,0,5,0" VerticalAlignment="Top">				
-					<Image IsVisible="{Binding IsAsterisk}" Stretch="None" Source="/AvaloniaUI/Assets/MBIcons/Asterisk.png"/>
-					<Image IsVisible="{Binding IsError}" Stretch="None" Source="/AvaloniaUI/Assets/MBIcons/error.png"/>
-					<Image IsVisible="{Binding IsQuestion}" Stretch="None" Source="/AvaloniaUI/Assets/MBIcons/Question.png"/>
-					<Image IsVisible="{Binding IsExclamation}" Stretch="None" Source="/AvaloniaUI/Assets/MBIcons/Exclamation.png"/>
+					<Image IsVisible="{Binding IsAsterisk}" Stretch="None" Source="/Assets/MBIcons/Asterisk.png"/>
+					<Image IsVisible="{Binding IsError}" Stretch="None" Source="/Assets/MBIcons/error.png"/>
+					<Image IsVisible="{Binding IsQuestion}" Stretch="None" Source="/Assets/MBIcons/Question.png"/>
+					<Image IsVisible="{Binding IsExclamation}" Stretch="None" Source="/Assets/MBIcons/Exclamation.png"/>
 				</Panel>
 			
 				<TextBlock Margin="5,0,0,0" Name="messageTextBlock" MinHeight="45" MinWidth="193" TextWrapping="WrapWithOverflow" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="12" Text="{Binding Message}" />
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml.cs b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml.cs
rename to Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml.cs
index 96e40b08..129082ee 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/MessageBoxWindow.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml.cs
@@ -1,9 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using LibationAvalonia.AvaloniaUI.ViewModels.Dialogs;
+using LibationAvalonia.ViewModels.Dialogs;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 
 	public partial class MessageBoxWindow : DialogWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ScanAccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
similarity index 94%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ScanAccountsDialog.axaml
rename to Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
index 73534ca1..a7cf73a3 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ScanAccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
@@ -3,12 +3,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="185"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.ScanAccountsDialog"
+        x:Class="LibationAvalonia.Dialogs.ScanAccountsDialog"
 		MinWidth="500" MinHeight="160"
 		MaxWidth="500" MaxHeight="185"
         Title="Which Accounts?"
 		WindowStartupLocation="CenterOwner"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto,Auto">
 		
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ScanAccountsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ScanAccountsDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml.cs
index fde547a9..492481c5 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/ScanAccountsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class ScanAccountsDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SearchSyntaxDialog.axaml b/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml
similarity index 93%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SearchSyntaxDialog.axaml
rename to Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml
index 62356e43..d3ad7aa9 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SearchSyntaxDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml
@@ -5,10 +5,10 @@
         mc:Ignorable="d" d:DesignWidth="950" d:DesignHeight="550"
 		MinWidth="950" MinHeight="550"
 		MaxWidth="950" MaxHeight="550"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.SearchSyntaxDialog"
+        x:Class="LibationAvalonia.Dialogs.SearchSyntaxDialog"
         Title="Filter Options"
 		WindowStartupLocation="CenterOwner"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid
 		Margin="10,0,10,10"
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SearchSyntaxDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SearchSyntaxDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs
index 22674ef4..7ea20a55 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SearchSyntaxDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Markup.Xaml;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class SearchSyntaxDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml
rename to Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
index 4b1c420b..defadc87 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
@@ -4,10 +4,10 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
 		MinWidth="800" MinHeight="600"
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.SettingsDialog"
-        xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls"
+        x:Class="LibationAvalonia.Dialogs.SettingsDialog"
+        xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         Title="Edit Settings"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid RowDefinitions="*,Auto">
 
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs
index 2477695a..369f7491 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/SettingsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs
@@ -10,7 +10,7 @@ using Dinah.Core;
 using System.Linq;
 using FileManager;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class SettingsDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/TagsBatchDialog.axaml b/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
similarity index 89%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/TagsBatchDialog.axaml
rename to Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
index 8376283f..d501024b 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/TagsBatchDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
@@ -3,12 +3,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="630" d:DesignHeight="110"		
-        x:Class="LibationAvalonia.AvaloniaUI.Views.Dialogs.TagsBatchDialog"
+        x:Class="LibationAvalonia.Dialogs.TagsBatchDialog"
 		MinWidth="630" MinHeight="110"
 		MaxWidth="630" MaxHeight="110"
         Title="Replace Tags"
 		WindowStartupLocation="CenterOwner"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Grid RowDefinitions="Auto,Auto,Auto">
 		<TextBlock
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/TagsBatchDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml.cs
similarity index 90%
rename from Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/TagsBatchDialog.axaml.cs
rename to Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml.cs
index a4a06fd7..aa850fa3 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/Dialogs/TagsBatchDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace LibationAvalonia.AvaloniaUI.Views.Dialogs
+namespace LibationAvalonia.Dialogs
 {
 	public partial class TagsBatchDialog : DialogWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/FormSaveExtension2.cs b/Source/LibationAvalonia/FormSaveExtension.cs
similarity index 94%
rename from Source/LibationAvalonia/AvaloniaUI/FormSaveExtension2.cs
rename to Source/LibationAvalonia/FormSaveExtension.cs
index efed554a..a986da4d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/FormSaveExtension2.cs
+++ b/Source/LibationAvalonia/FormSaveExtension.cs
@@ -5,12 +5,12 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using LibationFileManager;
 
-namespace LibationAvalonia.AvaloniaUI
+namespace LibationAvalonia
 {
-	public static class FormSaveExtension2
+	public static class FormSaveExtension
 	{
 		static readonly WindowIcon WindowIcon;
-		static FormSaveExtension2()
+		static FormSaveExtension()
 		{
 			if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 				WindowIcon = desktop.MainWindow.Icon;
@@ -99,18 +99,14 @@ namespace LibationAvalonia.AvaloniaUI
 
 		public static void HideMinMaxBtns(this Window form)
 		{
-
-			if (Design.IsDesignMode)
+			if (Design.IsDesignMode && App.PlatformID is not PlatformID.Win32NT)
 				return;
-#if WINDOWS7_0_OR_GREATER
 			var handle = form.PlatformImpl.Handle.Handle;
 			var currentStyle = GetWindowLong(handle, GWL_STYLE);
 
 			SetWindowLong(handle, GWL_STYLE, currentStyle & ~WS_MAXIMIZEBOX & ~WS_MINIMIZEBOX);
-#endif
 		}
 
-#if WINDOWS7_0_OR_GREATER
 		const long WS_MINIMIZEBOX = 0x00020000L;
 		const long WS_MAXIMIZEBOX = 0x10000L;
 		const int GWL_STYLE = -16;
@@ -118,6 +114,5 @@ namespace LibationAvalonia.AvaloniaUI
 		static extern long GetWindowLong(IntPtr hWnd, int nIndex);
 		[System.Runtime.InteropServices.DllImport("user32.dll")]
 		static extern int SetWindowLong(IntPtr hWnd, int nIndex, long dwNewLong);
-#endif
 	}
 }
diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj
index 3ed812e0..9ef599fb 100644
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<OutputType>Exe</OutputType>
+		<OutputType>WinExe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
 		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 		<TrimMode>copyused</TrimMode>
@@ -27,51 +27,50 @@
   </PropertyGroup>
 	
 <ItemGroup>
-    <AvaloniaResource Include="AvaloniaUI\Assets\**" />
-    <AvaloniaResource Remove="AvaloniaUI\Assets\SEGOEUI.TTF" />
+    <AvaloniaResource Include="Assets\**" />
+    <AvaloniaResource Remove="Assets\SEGOEUI.TTF" />
     <None Remove=".gitignore" />
-    <None Remove="AvaloniaUI\App.axaml.cs~RFba0ca3a.TMP" />
-    <None Remove="AvaloniaUI\Assets\Asterisk.png" />
-    <None Remove="AvaloniaUI\Assets\cancel.png" />
-    <None Remove="AvaloniaUI\Assets\completed.png" />
-    <None Remove="AvaloniaUI\Assets\down.png" />
-    <None Remove="AvaloniaUI\Assets\download-arrow.png" />
-    <None Remove="AvaloniaUI\Assets\edit-tags-25x25.png" />
-    <None Remove="AvaloniaUI\Assets\edit-tags-50x50.png" />
-    <None Remove="AvaloniaUI\Assets\edit_25x25.png" />
-    <None Remove="AvaloniaUI\Assets\edit_64x64.png" />
-    <None Remove="AvaloniaUI\Assets\error.png" />
-    <None Remove="AvaloniaUI\Assets\errored.png" />
-    <None Remove="AvaloniaUI\Assets\Exclamation.png" />
-    <None Remove="AvaloniaUI\Assets\first.png" />
-    <None Remove="AvaloniaUI\Assets\glass-with-glow_16.png" />
-    <None Remove="AvaloniaUI\Assets\img-coverart-prod-unavailable_300x300.jpg" />
-    <None Remove="AvaloniaUI\Assets\img-coverart-prod-unavailable_500x500.jpg" />
-    <None Remove="AvaloniaUI\Assets\img-coverart-prod-unavailable_80x80.jpg" />
-    <None Remove="AvaloniaUI\Assets\import_16x16.png" />
-    <None Remove="AvaloniaUI\Assets\last.png" />
-    <None Remove="AvaloniaUI\Assets\libation.ico" />
-    <None Remove="AvaloniaUI\Assets\LibationStyles.xaml" />
-    <None Remove="AvaloniaUI\Assets\liberate_green.png" />
-    <None Remove="AvaloniaUI\Assets\liberate_green_pdf_no.png" />
-    <None Remove="AvaloniaUI\Assets\liberate_green_pdf_yes.png" />
-    <None Remove="AvaloniaUI\Assets\liberate_red.png" />
-    <None Remove="AvaloniaUI\Assets\liberate_red_pdf_no.png" />
-    <None Remove="AvaloniaUI\Assets\liberate_red_pdf_yes.png" />
-    <None Remove="AvaloniaUI\Assets\liberate_yellow.png" />
-    <None Remove="AvaloniaUI\Assets\liberate_yellow_pdf_no.png" />
-    <None Remove="AvaloniaUI\Assets\liberate_yellow_pdf_yes.png" />
-    <None Remove="AvaloniaUI\Assets\MBIcons\Asterisk.png" />
-    <None Remove="AvaloniaUI\Assets\MBIcons\error.png" />
-    <None Remove="AvaloniaUI\Assets\MBIcons\Exclamation.png" />
-    <None Remove="AvaloniaUI\Assets\MBIcons\Question.png" />
-    <None Remove="AvaloniaUI\Assets\minus.png" />
-    <None Remove="AvaloniaUI\Assets\plus.png" />
-    <None Remove="AvaloniaUI\Assets\Question.png" />
-    <None Remove="AvaloniaUI\Assets\queued.png" />
-    <None Remove="AvaloniaUI\Assets\SEGOEUI.TTF" />
-    <None Remove="AvaloniaUI\Assets\up.png" />
-    <None Remove="AvaloniaUI\Assets\WINGDING.TTF" />
+    <None Remove="Assets\Asterisk.png" />
+    <None Remove="Assets\cancel.png" />
+    <None Remove="Assets\completed.png" />
+    <None Remove="Assets\down.png" />
+    <None Remove="Assets\download-arrow.png" />
+    <None Remove="Assets\edit-tags-25x25.png" />
+    <None Remove="Assets\edit-tags-50x50.png" />
+    <None Remove="Assets\edit_25x25.png" />
+    <None Remove="Assets\edit_64x64.png" />
+    <None Remove="Assets\error.png" />
+    <None Remove="Assets\errored.png" />
+    <None Remove="Assets\Exclamation.png" />
+    <None Remove="Assets\first.png" />
+    <None Remove="Assets\glass-with-glow_16.png" />
+    <None Remove="Assets\img-coverart-prod-unavailable_300x300.jpg" />
+    <None Remove="Assets\img-coverart-prod-unavailable_500x500.jpg" />
+    <None Remove="Assets\img-coverart-prod-unavailable_80x80.jpg" />
+    <None Remove="Assets\import_16x16.png" />
+    <None Remove="Assets\last.png" />
+    <None Remove="Assets\libation.ico" />
+    <None Remove="Assets\LibationStyles.xaml" />
+    <None Remove="Assets\liberate_green.png" />
+    <None Remove="Assets\liberate_green_pdf_no.png" />
+    <None Remove="Assets\liberate_green_pdf_yes.png" />
+    <None Remove="Assets\liberate_red.png" />
+    <None Remove="Assets\liberate_red_pdf_no.png" />
+    <None Remove="Assets\liberate_red_pdf_yes.png" />
+    <None Remove="Assets\liberate_yellow.png" />
+    <None Remove="Assets\liberate_yellow_pdf_no.png" />
+    <None Remove="Assets\liberate_yellow_pdf_yes.png" />
+    <None Remove="Assets\MBIcons\Asterisk.png" />
+    <None Remove="Assets\MBIcons\error.png" />
+    <None Remove="Assets\MBIcons\Exclamation.png" />
+    <None Remove="Assets\MBIcons\Question.png" />
+    <None Remove="Assets\minus.png" />
+    <None Remove="Assets\plus.png" />
+    <None Remove="Assets\Question.png" />
+    <None Remove="Assets\queued.png" />
+    <None Remove="Assets\SEGOEUI.TTF" />
+    <None Remove="Assets\up.png" />
+    <None Remove="Assets\WINGDING.TTF" />
   </ItemGroup>
 
   <ItemGroup>
@@ -79,20 +78,15 @@
     <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>
-	
-	<ItemGroup>
-    <AvaloniaResource Update="AvaloniaUI\Assets\LibationStyles.xaml">
-    </AvaloniaResource>
-  </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="AvaloniaUI\Views\ProcessBookControl.axaml.cs">
+    <Compile Update="Views\ProcessBookControl.axaml.cs">
       <DependentUpon>ProcessBookControl.axaml</DependentUpon>
     </Compile>
-    <Compile Update="AvaloniaUI\Views\ProcessQueueControl.axaml.cs">
+    <Compile Update="Views\ProcessQueueControl.axaml.cs">
       <DependentUpon>ProcessQueueControl.axaml</DependentUpon>
     </Compile>
-    <Compile Update="AvaloniaUI\Views\ProductsDisplay.axaml.cs">
+    <Compile Update="Views\ProductsDisplay.axaml.cs">
       <DependentUpon>ProductsDisplay.axaml</DependentUpon>
     </Compile>
     <Compile Update="Properties\Resources.Designer.cs">
@@ -110,11 +104,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <UpToDateCheckInput Remove="AvaloniaUI\Controls\GroupBox.axaml" />
+    <UpToDateCheckInput Remove="Controls\GroupBox.axaml" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="AvaloniaUI\Assets\SEGOEUI.TTF" />
+    <EmbeddedResource Include="Assets\SEGOEUI.TTF" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/LibationAvalonia/AvaloniaUI/LogMe.cs b/Source/LibationAvalonia/LogMe.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/LogMe.cs
rename to Source/LibationAvalonia/LogMe.cs
index 68bef1b3..19d1304c 100644
--- a/Source/LibationAvalonia/AvaloniaUI/LogMe.cs
+++ b/Source/LibationAvalonia/LogMe.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI
+namespace LibationAvalonia
 {
 	public interface ILogForm
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/MessageBox.cs b/Source/LibationAvalonia/MessageBox.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/MessageBox.cs
rename to Source/LibationAvalonia/MessageBox.cs
index 2421b2cf..81749201 100644
--- a/Source/LibationAvalonia/AvaloniaUI/MessageBox.cs
+++ b/Source/LibationAvalonia/MessageBox.cs
@@ -3,14 +3,14 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using DataLayer;
 using Dinah.Core.Logging;
-using LibationAvalonia.AvaloniaUI.ViewModels.Dialogs;
-using LibationAvalonia.AvaloniaUI.Views.Dialogs;
+using LibationAvalonia.ViewModels.Dialogs;
+using LibationAvalonia.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI
+namespace LibationAvalonia
 {
 	public enum DialogResult
 	{
diff --git a/Source/LibationAvalonia/Program.cs b/Source/LibationAvalonia/Program.cs
index 541e40c6..00b80f30 100644
--- a/Source/LibationAvalonia/Program.cs
+++ b/Source/LibationAvalonia/Program.cs
@@ -14,28 +14,25 @@ namespace LibationAvalonia
 {
 	static class Program
 	{
-		static void Main()
+		private static string EXE_DIR = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+
+		static async Task Main()
 		{
-			var sw = System.Diagnostics.Stopwatch.StartNew();
-			var config = LoadLibationConfig();
-
-			if (config is null) return;
-
 			//Start as much work in parallel as possible.
-			var runDbMigrationsTask = Task.Run(() => RunDbMigrations(config));
+			var runDbMigrationsTask = Task.Run(() => RunDbMigrations());
 			var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
 			var appBuilderTask = Task.Run(BuildAvaloniaApp);
 
-			if (!runDbMigrationsTask.GetAwaiter().GetResult())
+			if (!await runDbMigrationsTask)
 				return;
 
 			var dbLibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
 
-			appBuilderTask.GetAwaiter().GetResult().SetupWithLifetime(classicLifetimeTask.GetAwaiter().GetResult());
+			(await appBuilderTask).SetupWithLifetime(await classicLifetimeTask);
 
-			var form1 = (AvaloniaUI.Views.MainWindow)classicLifetimeTask.Result.MainWindow;
+			var form1 = (Views.MainWindow)classicLifetimeTask.Result.MainWindow;
 
-			form1.OnLibraryLoaded(dbLibraryTask.GetAwaiter().GetResult());
+			form1.OnLibraryLoaded(await dbLibraryTask);
 
 			var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
 
@@ -43,12 +40,12 @@ namespace LibationAvalonia
 		}
 
 		public static AppBuilder BuildAvaloniaApp()
-			=> AppBuilder.Configure<AvaloniaUI.App>()
+			=> AppBuilder.Configure<App>()
 			.UsePlatformDetect()
 			.LogToTrace()
 			.UseReactiveUI();
 
-		private static Configuration LoadLibationConfig()
+		private static bool RunDbMigrations()
 		{
 			try
 			{
@@ -60,19 +57,7 @@ namespace LibationAvalonia
 				// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
 				var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
 				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-				return config;
-			}
-			catch (Exception ex)
-			{
 
-				return null;
-			}
-		}
-
-		private static bool RunDbMigrations(Configuration config)
-		{
-			try
-			{
 				// most migrations go in here
 				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
 				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 00000000..32cb4d79
--- /dev/null
+++ b/Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Release\publish\linux-x64\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewLocator.cs b/Source/LibationAvalonia/ViewLocator.cs
similarity index 85%
rename from Source/LibationAvalonia/AvaloniaUI/ViewLocator.cs
rename to Source/LibationAvalonia/ViewLocator.cs
index 328e18d1..c972d6f1 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewLocator.cs
+++ b/Source/LibationAvalonia/ViewLocator.cs
@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using LibationAvalonia.AvaloniaUI.ViewModels;
+using LibationAvalonia.ViewModels;
 using System;
 
-namespace LibationAvalonia.AvaloniaUI
+namespace LibationAvalonia
 {
 	public class ViewLocator : IDataTemplate
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/BookTags.cs b/Source/LibationAvalonia/ViewModels/BookTags.cs
similarity index 79%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/BookTags.cs
rename to Source/LibationAvalonia/ViewModels/BookTags.cs
index 839f8d67..0f24941d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/BookTags.cs
+++ b/Source/LibationAvalonia/ViewModels/BookTags.cs
@@ -1,4 +1,4 @@
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public class BookTags
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/Dialogs/MessageBoxViewModel.cs b/Source/LibationAvalonia/ViewModels/Dialogs/MessageBoxViewModel.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/Dialogs/MessageBoxViewModel.cs
rename to Source/LibationAvalonia/ViewModels/Dialogs/MessageBoxViewModel.cs
index 8c91254f..c28bccb0 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/Dialogs/MessageBoxViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/Dialogs/MessageBoxViewModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels.Dialogs
+namespace LibationAvalonia.ViewModels.Dialogs
 {
 	public class MessageBoxViewModel
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/GridEntry.cs b/Source/LibationAvalonia/ViewModels/GridEntry.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/GridEntry.cs
rename to Source/LibationAvalonia/ViewModels/GridEntry.cs
index 4bc5c401..4f055750 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/GridEntry.cs
+++ b/Source/LibationAvalonia/ViewModels/GridEntry.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public enum RemoveStatus
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/GridEntryCollection.cs b/Source/LibationAvalonia/ViewModels/GridEntryCollection.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/GridEntryCollection.cs
rename to Source/LibationAvalonia/ViewModels/GridEntryCollection.cs
index 646597aa..38427e3e 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/GridEntryCollection.cs
+++ b/Source/LibationAvalonia/ViewModels/GridEntryCollection.cs
@@ -6,7 +6,7 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	/*
 	 * Allows filtering of the underlying ObservableCollection<GridEntry>
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/LiberateButtonStatus.cs b/Source/LibationAvalonia/ViewModels/LiberateButtonStatus.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/LiberateButtonStatus.cs
rename to Source/LibationAvalonia/ViewModels/LiberateButtonStatus.cs
index d5867f46..6d2e4f58 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/LiberateButtonStatus.cs
+++ b/Source/LibationAvalonia/ViewModels/LiberateButtonStatus.cs
@@ -4,7 +4,7 @@ using ReactiveUI;
 using System;
 using System.Collections.Generic;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public class LiberateButtonStatus : ViewModelBase, IComparable
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/LibraryBookEntry.cs b/Source/LibationAvalonia/ViewModels/LibraryBookEntry.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/LibraryBookEntry.cs
rename to Source/LibationAvalonia/ViewModels/LibraryBookEntry.cs
index b63be997..54dc7fb8 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/LibraryBookEntry.cs
+++ b/Source/LibationAvalonia/ViewModels/LibraryBookEntry.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	/// <summary>The View Model for a LibraryBook that is ContentType.Product or ContentType.Episode</summary>
 	public class LibraryBookEntry : GridEntry
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/MainWindowViewModel.cs b/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/MainWindowViewModel.cs
rename to Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs
index d14e0842..f1656ae7 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/MainWindowViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs
@@ -3,7 +3,7 @@ using Dinah.Core;
 using LibationFileManager;
 using ReactiveUI;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public class MainWindowViewModel : ViewModelBase
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/ProcessBookViewModel.cs b/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/ProcessBookViewModel.cs
rename to Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
index 88ad85b4..c2b673a0 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/ProcessBookViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
@@ -11,7 +11,7 @@ using FileLiberator;
 using LibationFileManager;
 using ReactiveUI;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public enum ProcessBookResult
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/ProcessQueueViewModel.cs b/Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/ProcessQueueViewModel.cs
rename to Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
index 5e790a6e..93521f6d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/ProcessQueueViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
@@ -9,7 +9,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public class ProcessQueueViewModel : ViewModelBase, ILogForm
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs
rename to Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs
index 9c506562..26858ca4 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs
@@ -11,9 +11,10 @@ using System.Collections;
 using Avalonia.Threading;
 using ApplicationServices;
 using AudibleUtilities;
-using LibationAvalonia.AvaloniaUI.Views;
+using LibationAvalonia.Views;
+using LibationAvalonia.Dialogs.Login;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public class ProductsDisplayViewModel : ViewModelBase
 	{
@@ -307,7 +308,7 @@ namespace LibationAvalonia.AvaloniaUI.ViewModels
 					.Select(lbe => lbe.LibraryBook)
 					.Where(lb => !lb.Book.HasLiberated());
 
-				var removedBooks = await LibraryCommands.FindInactiveBooks(Views.Dialogs.Login.AvaloniaLoginChoiceEager.ApiExtendedFunc, lib, accounts);
+				var removedBooks = await LibraryCommands.FindInactiveBooks(AvaloniaLoginChoiceEager.ApiExtendedFunc, lib, accounts);
 
 				var removable = allBooks.Where(lbe => removedBooks.Any(rb => rb.Book.AudibleProductId == lbe.AudibleProductId)).ToList();
 
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/QueryExtensions.cs b/Source/LibationAvalonia/ViewModels/QueryExtensions.cs
similarity index 96%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/QueryExtensions.cs
rename to Source/LibationAvalonia/ViewModels/QueryExtensions.cs
index 0639d28a..91357a45 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/QueryExtensions.cs
+++ b/Source/LibationAvalonia/ViewModels/QueryExtensions.cs
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 #nullable enable
 	internal static class QueryExtensions
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/RowComparer.cs b/Source/LibationAvalonia/ViewModels/RowComparer.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/RowComparer.cs
rename to Source/LibationAvalonia/ViewModels/RowComparer.cs
index a20779a3..73effeea 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/RowComparer.cs
+++ b/Source/LibationAvalonia/ViewModels/RowComparer.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	/// <summary>
 	/// This compare class ensures that all top-level grid entries (standalone books or series parents)
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/SeriesEntry.cs b/Source/LibationAvalonia/ViewModels/SeriesEntry.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/SeriesEntry.cs
rename to Source/LibationAvalonia/ViewModels/SeriesEntry.cs
index 944372fd..7589b3a2 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/SeriesEntry.cs
+++ b/Source/LibationAvalonia/ViewModels/SeriesEntry.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	/// <summary>The View Model for a LibraryBook that is ContentType.Parent</summary>
 	public class SeriesEntry : GridEntry
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/TrackedQueue[T].cs b/Source/LibationAvalonia/ViewModels/TrackedQueue[T].cs
similarity index 99%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/TrackedQueue[T].cs
rename to Source/LibationAvalonia/ViewModels/TrackedQueue[T].cs
index d6a096c6..f4889a77 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/TrackedQueue[T].cs
+++ b/Source/LibationAvalonia/ViewModels/TrackedQueue[T].cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public enum QueuePosition
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/ViewModels/ViewModelBase.cs b/Source/LibationAvalonia/ViewModels/ViewModelBase.cs
similarity index 77%
rename from Source/LibationAvalonia/AvaloniaUI/ViewModels/ViewModelBase.cs
rename to Source/LibationAvalonia/ViewModels/ViewModelBase.cs
index c3825f6d..4dd106c2 100644
--- a/Source/LibationAvalonia/AvaloniaUI/ViewModels/ViewModelBase.cs
+++ b/Source/LibationAvalonia/ViewModels/ViewModelBase.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace LibationAvalonia.AvaloniaUI.ViewModels
+namespace LibationAvalonia.ViewModels
 {
 	public class ViewModelBase : ReactiveObject
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.BackupCounts.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.BackupCounts.axaml.cs
similarity index 96%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.BackupCounts.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.BackupCounts.axaml.cs
index 51839017..50521969 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.BackupCounts.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.BackupCounts.axaml.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using Avalonia.Threading;
 using Dinah.Core;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs
index e61c012e..18aabeab 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls;
 using System;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Filter.axaml.cs
similarity index 88%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.Filter.axaml.cs
index 1de20e01..ea4ba592 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Filter.axaml.cs
@@ -3,7 +3,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
@@ -11,7 +11,7 @@ namespace LibationAvalonia.AvaloniaUI.Views
 		protected void Configure_Filter() { }
 
 		public async void filterHelpBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> await (new LibationAvalonia.AvaloniaUI.Views.Dialogs.SearchSyntaxDialog()).ShowDialog(this);
+			=> await (new LibationAvalonia.Dialogs.SearchSyntaxDialog()).ShowDialog(this);
 		
 		public async void filterSearchTb_KeyPress(object sender, KeyEventArgs e)
 		{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Liberate.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.Liberate.axaml.cs
index 9fad28f4..171f4c55 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Liberate.axaml.cs
@@ -3,7 +3,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs
index 89d2aba6..fb1a167e 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs
@@ -4,7 +4,7 @@ using LibationFileManager;
 using System;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.QuickFilters.axaml.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.QuickFilters.axaml.cs
index 32d58af5..9a4ddb5a 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.QuickFilters.axaml.cs
@@ -3,7 +3,7 @@ using LibationFileManager;
 using System;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs
index 4bbe5a45..85e3b135 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanAuto.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanAuto.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanAuto.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanAuto.axaml.cs
index 367a49c2..37cb09a2 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanAuto.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanAuto.axaml.cs
@@ -7,7 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanManual.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanManual.axaml.cs
index 8f0a8285..d42c983c 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanManual.axaml.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanNotification.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanNotification.axaml.cs
similarity index 92%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanNotification.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanNotification.axaml.cs
index f48a1aa4..08f39e8d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.ScanNotification.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanNotification.axaml.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs
similarity index 94%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs
index bfb5f29b..d59ba480 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs
index 00964b4e..18cc6068 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs
@@ -5,7 +5,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	//DONE
 	public partial class MainWindow
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow._NoUI.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow._NoUI.axaml.cs
similarity index 94%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow._NoUI.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow._NoUI.axaml.cs
index f185f20c..d04623e5 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow._NoUI.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow._NoUI.axaml.cs
@@ -3,7 +3,7 @@ using System;
 using System.IO;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	public partial class MainWindow
 	{
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.axaml b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.axaml
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml
index 3f343f40..3b1f59dc 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.axaml
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml
@@ -2,15 +2,15 @@
 <Window xmlns="https://github.com/avaloniaui"
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:vm="clr-namespace:LibationAvalonia.AvaloniaUI.ViewModels"
+		xmlns:vm="clr-namespace:LibationAvalonia.ViewModels"
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-		xmlns:views="clr-namespace:LibationAvalonia.AvaloniaUI.Views"
-		xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls"
+		xmlns:views="clr-namespace:LibationAvalonia.Views"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
 		mc:Ignorable="d" d:DesignWidth="1850" d:DesignHeight="700"
-		x:Class="LibationAvalonia.AvaloniaUI.Views.MainWindow"
+		x:Class="LibationAvalonia.Views.MainWindow"
 		Title="Libation"
 		Name="Form1"
-		Icon="/AvaloniaUI/Assets/libation.ico">
+		Icon="/Assets/libation.ico">
 
 	<Border BorderBrush="{DynamicResource DataGridGridLinesBrush}" BorderThickness="2" Padding="15">
 		<Grid RowDefinitions="Auto,Auto,*,Auto">
@@ -130,7 +130,7 @@
 					</MenuItem>
 				</Menu>
 				<StackPanel IsVisible="{Binding ActivelyScanning}" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-					<Image Width="16" Height="16" Source="/AvaloniaUI/Assets/import_16x16.png" />
+					<Image Width="16" Height="16" Source="/Assets/import_16x16.png" />
 					<TextBlock Margin="5,0,5,0" VerticalAlignment="Center" Text="{Binding ScanningText}"/>
 				</StackPanel>
 			</Grid>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs
index 0a1ccc19..b01c9e5d 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs
@@ -4,14 +4,14 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using System;
 using Avalonia.ReactiveUI;
-using LibationAvalonia.AvaloniaUI.ViewModels;
+using LibationAvalonia.ViewModels;
 using LibationFileManager;
 using DataLayer;
 using System.Collections.Generic;
 using System.Linq;
-using LibationAvalonia.AvaloniaUI.Views.Dialogs;
+using LibationAvalonia.Dialogs;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
 	{
@@ -67,11 +67,9 @@ namespace LibationAvalonia.AvaloniaUI.Views
 
 		private async void MainWindow_Opened(object sender, EventArgs e)
 		{
-			/*
 			var charReplace = new EditReplacementChars();
 
 			await charReplace.ShowDialog(this);
-			*/
 		}
 
 		public void ProductsDisplay_Initialized1(object sender, EventArgs e)
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/ProcessBookControl.axaml b/Source/LibationAvalonia/Views/ProcessBookControl.axaml
similarity index 79%
rename from Source/LibationAvalonia/AvaloniaUI/Views/ProcessBookControl.axaml
rename to Source/LibationAvalonia/Views/ProcessBookControl.axaml
index 29494daf..e9bf30ac 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/ProcessBookControl.axaml
+++ b/Source/LibationAvalonia/Views/ProcessBookControl.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="90" MaxHeight="90" MinHeight="90" MinWidth="300"
-             x:Class="LibationAvalonia.AvaloniaUI.Views.ProcessBookControl" Background="{Binding BackgroundColor}">
+             x:Class="LibationAvalonia.Views.ProcessBookControl" Background="{Binding BackgroundColor}">
 	
 	<Border BorderBrush="{DynamicResource ProcessQueueBookBorderBrush}" BorderThickness="2">
 		<Grid ColumnDefinitions="Auto,*,Auto">
@@ -30,21 +30,21 @@
 			<Grid Margin="3" Grid.Column="2" HorizontalAlignment="Right" ColumnDefinitions="Auto,Auto">
 				<StackPanel IsVisible="{Binding Queued}" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Vertical">
 					<Button Height="20" Width="30" Click="MoveFirst_Click">
-						<Image Height="20" Width="30" Source="/AvaloniaUI/Assets/first.png" Stretch="Uniform" VerticalAlignment="Bottom"/>
+						<Image Height="20" Width="30" Source="/Assets/first.png" Stretch="Uniform" VerticalAlignment="Bottom"/>
 					</Button>
 					<Button Height="20" Width="30" Click="MoveUp_Click">
-						<Image Height="20" Width="30" Source="/AvaloniaUI/Assets/up.png" Stretch="Uniform" VerticalAlignment="Bottom" />
+						<Image Height="20" Width="30" Source="/Assets/up.png" Stretch="Uniform" VerticalAlignment="Bottom" />
 					</Button>
 					<Button Height="20" Width="30" Click="MoveDown_Click">
-						<Image Height="20" Width="30" Source="/AvaloniaUI/Assets/down.png" Stretch="Uniform" VerticalAlignment="Top" />
+						<Image Height="20" Width="30" Source="/Assets/down.png" Stretch="Uniform" VerticalAlignment="Top" />
 					</Button>
 					<Button Height="20" Width="30" Click="MoveLast_Click">
-						<Image Height="20" Width="30" Source="/AvaloniaUI/Assets/last.png" Stretch="Uniform" VerticalAlignment="Top"/>
+						<Image Height="20" Width="30" Source="/Assets/last.png" Stretch="Uniform" VerticalAlignment="Top"/>
 					</Button>
 				</StackPanel>
 				<Panel Margin="3" Grid.Column="1" VerticalAlignment="Top">
 					<Button Height="32" Width="22" IsVisible="{Binding !IsFinished}" CornerRadius="11" Click="Cancel_Click">
-						<Image Width="20" Height="20" Source="/AvaloniaUI/Assets/cancel.png" Stretch="Uniform" />
+						<Image Width="20" Height="20" Source="/Assets/cancel.png" Stretch="Uniform" />
 					</Button>
 				</Panel>
 			</Grid>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/ProcessBookControl.axaml.cs b/Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
similarity index 95%
rename from Source/LibationAvalonia/AvaloniaUI/Views/ProcessBookControl.axaml.cs
rename to Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
index 28794e5c..62ec2c25 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/ProcessBookControl.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
@@ -2,11 +2,11 @@ using Avalonia;
 using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using LibationAvalonia.AvaloniaUI.ViewModels;
+using LibationAvalonia.ViewModels;
 using ApplicationServices;
 using DataLayer;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	public delegate void QueueItemPositionButtonClicked(ProcessBookViewModel item, QueuePosition queueButton);
 	public delegate void QueueItemCancelButtonClicked(ProcessBookViewModel item);
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/ProcessQueueControl.axaml b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml
similarity index 94%
rename from Source/LibationAvalonia/AvaloniaUI/Views/ProcessQueueControl.axaml
rename to Source/LibationAvalonia/Views/ProcessQueueControl.axaml
index a515c97f..e090119c 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/ProcessQueueControl.axaml
+++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml
@@ -3,10 +3,10 @@
 	xmlns="https://github.com/avaloniaui"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:views="clr-namespace:LibationAvalonia.AvaloniaUI.Views"
+	xmlns:views="clr-namespace:LibationAvalonia.Views"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	mc:Ignorable="d" d:DesignWidth="450" d:DesignHeight="850"
-	x:Class="LibationAvalonia.AvaloniaUI.Views.ProcessQueueControl">
+	x:Class="LibationAvalonia.Views.ProcessQueueControl">
 
 	<UserControl.Resources>
 		<RecyclePool x:Key="RecyclePool" />
@@ -95,15 +95,15 @@
 			</Panel>
 			<StackPanel Orientation="Horizontal" Grid.Column="1">
 				<StackPanel Margin="5,0,0,0" Orientation="Horizontal">
-					<Image IsVisible="{Binding AnyQueued}" Width="20" Height="20" Source="/AvaloniaUI/Assets/queued.png" />
+					<Image IsVisible="{Binding AnyQueued}" Width="20" Height="20" Source="/Assets/queued.png" />
 					<TextBlock IsVisible="{Binding AnyQueued}" VerticalAlignment="Center" Text="{Binding QueuedCount}" />
 				</StackPanel>
 				<StackPanel Margin="5,0,0,0" Orientation="Horizontal">
-					<Image IsVisible="{Binding AnyCompleted}" Width="20" Height="20" Source="/AvaloniaUI/Assets/completed.png" />
+					<Image IsVisible="{Binding AnyCompleted}" Width="20" Height="20" Source="/Assets/completed.png" />
 					<TextBlock IsVisible="{Binding AnyCompleted}" VerticalAlignment="Center" Text="{Binding CompletedCount}" />
 				</StackPanel>
 				<StackPanel Margin="5,0,0,0" Orientation="Horizontal">
-					<Image IsVisible="{Binding AnyErrors}" Width="20" Height="20" Source="/AvaloniaUI/Assets/errored.png" />
+					<Image IsVisible="{Binding AnyErrors}" Width="20" Height="20" Source="/Assets/errored.png" />
 					<TextBlock IsVisible="{Binding AnyErrors}" VerticalAlignment="Center" Text="{Binding ErrorCount}" />
 				</StackPanel>
 			</StackPanel>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/ProcessQueueControl.axaml.cs b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
similarity index 97%
rename from Source/LibationAvalonia/AvaloniaUI/Views/ProcessQueueControl.axaml.cs
rename to Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
index 51634ee9..7a4c3aef 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/ProcessQueueControl.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
@@ -3,12 +3,12 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using DataLayer;
-using LibationAvalonia.AvaloniaUI.ViewModels;
+using LibationAvalonia.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	public partial class ProcessQueueControl : UserControl
     {
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/ProductsDisplay.axaml b/Source/LibationAvalonia/Views/ProductsDisplay.axaml
similarity index 96%
rename from Source/LibationAvalonia/AvaloniaUI/Views/ProductsDisplay.axaml
rename to Source/LibationAvalonia/Views/ProductsDisplay.axaml
index 767f1b73..65fade99 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/ProductsDisplay.axaml
+++ b/Source/LibationAvalonia/Views/ProductsDisplay.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:views="clr-namespace:LibationAvalonia.AvaloniaUI.Views"
-			 xmlns:controls="clr-namespace:LibationAvalonia.AvaloniaUI.Controls"
+			 xmlns:views="clr-namespace:LibationAvalonia.Views"
+			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
              mc:Ignorable="d" d:DesignWidth="1560" d:DesignHeight="400"
-             x:Class="LibationAvalonia.AvaloniaUI.Views.ProductsDisplay">
+             x:Class="LibationAvalonia.Views.ProductsDisplay">
 
 	<Grid>
 
@@ -189,7 +189,7 @@
 							<StackPanel Orientation="Horizontal">
 								<Button IsVisible="{Binding !IsSeries}" Width="100" Height="80" Click="OnTagsButtonClick" ToolTip.Tip="Click to edit tags" >
 									<Panel>
-										<Image IsVisible="{Binding !BookTags.HasTags}" Stretch="None" Source="/AvaloniaUI/Assets/edit_25x25.png" />
+										<Image IsVisible="{Binding !BookTags.HasTags}" Stretch="None" Source="/Assets/edit_25x25.png" />
 										<TextBlock IsVisible="{Binding BookTags.HasTags}" FontSize="12" TextWrapping="WrapWithOverflow" Text="{Binding BookTags.Tags}"/>
 									</Panel>
 								</Button>
diff --git a/Source/LibationAvalonia/AvaloniaUI/Views/ProductsDisplay.axaml.cs b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs
similarity index 98%
rename from Source/LibationAvalonia/AvaloniaUI/Views/ProductsDisplay.axaml.cs
rename to Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs
index 57c2dfe1..b5a7c532 100644
--- a/Source/LibationAvalonia/AvaloniaUI/Views/ProductsDisplay.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs
@@ -5,13 +5,13 @@ using Avalonia.Markup.Xaml;
 using DataLayer;
 using FileLiberator;
 using LibationFileManager;
-using LibationAvalonia.AvaloniaUI.ViewModels;
-using LibationAvalonia.AvaloniaUI.Views.Dialogs;
+using LibationAvalonia.ViewModels;
+using LibationAvalonia.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LibationAvalonia.AvaloniaUI.Views
+namespace LibationAvalonia.Views
 {
 	public partial class ProductsDisplay : UserControl
 	{