Refactor

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -16,7 +16,6 @@
 	  <PackageReference Include="AAXClean.Codecs" Version="0.2.12" />
 	</ItemGroup>
 
-
 	<ItemGroup>
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>

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>

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);
 
 

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
 	{

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 >

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
 	{

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"

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
 	{

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" />

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
 	{

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>

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
 	{

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"/>

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
 	{

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"/>

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
 	{

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>

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
 	{

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>

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
 	{

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">	
 		

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
 	{

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
 	{

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>

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
 	{

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

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
 	{

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>

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
 	{

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>

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
 	{

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">

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
 	{

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">
 

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
 	{

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,*">
 

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
 	{

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
 	{

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
 	{

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
 	{

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,*"

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
 	{

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">

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
 	{

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">
 		

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
 	{

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">
 

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
 	{

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">
 

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
 	{

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,*">
 		

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
 	{

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"

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
 	{

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}" />

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

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">
 		

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
 	{

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"

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
 	{