diff --git a/Source/FileLiberator/_InternalsVisible.cs b/Source/FileLiberator/_InternalsVisible.cs
deleted file mode 100644
index b5e38212..00000000
--- a/Source/FileLiberator/_InternalsVisible.cs
+++ /dev/null
@@ -1 +0,0 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileLiberator) + ".Tests")]
\ No newline at end of file
diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj
index 7059f5fa..0d324e4b 100644
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -9,9 +9,7 @@
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<ApplicationIcon>libation.ico</ApplicationIcon>
 		<AssemblyName>Libation</AssemblyName>
-
 		<IsPublishable>true</IsPublishable>
-
 		<PublishReadyToRun>true</PublishReadyToRun>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -82,12 +80,6 @@
 		<None Remove="Assets\up.png" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
 			<DesignTime>True</DesignTime>
@@ -117,10 +109,13 @@
 		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview4 " />
 		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
 		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview4" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview4" />
 		<PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\LibationUiBase\LibationUiBase.csproj" />
+	</ItemGroup>
+
 
 	<ItemGroup>
 		<None Update="glass-with-glow_256.svg">
diff --git a/Source/LibationAvalonia/ViewModels/GridEntry.cs b/Source/LibationAvalonia/ViewModels/GridEntry.cs
index 571a7037..cfe0180c 100644
--- a/Source/LibationAvalonia/ViewModels/GridEntry.cs
+++ b/Source/LibationAvalonia/ViewModels/GridEntry.cs
@@ -1,10 +1,10 @@
 using ApplicationServices;
-using AppScaffolding;
 using Avalonia.Media;
 using DataLayer;
 using Dinah.Core;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;
 using System;
 using System.Collections;
diff --git a/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs b/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
index 5d536349..f4597741 100644
--- a/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ApplicationServices;
-using AppScaffolding;
 using AudibleApi;
 using AudibleApi.Common;
 using Avalonia.Media;
@@ -13,6 +12,7 @@ using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;
 
 namespace LibationAvalonia.ViewModels
diff --git a/Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs b/Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
index d1531eba..0b2f23fb 100644
--- a/Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
@@ -1,9 +1,9 @@
 using ApplicationServices;
-using AppScaffolding;
 using Avalonia.Controls;
 using Avalonia.Threading;
 using DataLayer;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;
diff --git a/Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs b/Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
index d13c66a0..59367b52 100644
--- a/Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
@@ -1,11 +1,10 @@
-using Avalonia;
 using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using LibationAvalonia.ViewModels;
 using ApplicationServices;
 using DataLayer;
-using AppScaffolding;
+using LibationUiBase;
 
 namespace LibationAvalonia.Views
 {
diff --git a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
index f90d453b..66673914 100644
--- a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
@@ -1,11 +1,11 @@
 using ApplicationServices;
-using AppScaffolding;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 using DataLayer;
 using LibationAvalonia.ViewModels;
+using LibationUiBase;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/Source/AppScaffolding/ILogForm.cs b/Source/LibationUiBase/ILogForm.cs
similarity index 70%
rename from Source/AppScaffolding/ILogForm.cs
rename to Source/LibationUiBase/ILogForm.cs
index 7486eded..a0553fba 100644
--- a/Source/AppScaffolding/ILogForm.cs
+++ b/Source/LibationUiBase/ILogForm.cs
@@ -1,4 +1,4 @@
-namespace AppScaffolding
+namespace LibationUiBase
 {
 	public interface ILogForm
 	{
diff --git a/Source/LibationUiBase/LibationUiBase.csproj b/Source/LibationUiBase/LibationUiBase.csproj
new file mode 100644
index 00000000..5cbb0af1
--- /dev/null
+++ b/Source/LibationUiBase/LibationUiBase.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	<TargetFramework>net7.0</TargetFramework>
+	  <IsPublishable>true</IsPublishable>
+	  <PublishReadyToRun>true</PublishReadyToRun>
+	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+	  <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+	<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+	<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+  </ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+	
+</Project>
diff --git a/Source/AppScaffolding/LogMe.cs b/Source/LibationUiBase/LogMe.cs
similarity index 98%
rename from Source/AppScaffolding/LogMe.cs
rename to Source/LibationUiBase/LogMe.cs
index 692140c7..08e6dfad 100644
--- a/Source/AppScaffolding/LogMe.cs
+++ b/Source/LibationUiBase/LogMe.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace AppScaffolding
+namespace LibationUiBase
 {
 	// decouple serilog and form. include convenience factory method
 	public class LogMe
diff --git a/Source/AppScaffolding/ObjectComparer[T].cs b/Source/LibationUiBase/ObjectComparer[T].cs
similarity index 88%
rename from Source/AppScaffolding/ObjectComparer[T].cs
rename to Source/LibationUiBase/ObjectComparer[T].cs
index 88a257f9..cacd3044 100644
--- a/Source/AppScaffolding/ObjectComparer[T].cs
+++ b/Source/LibationUiBase/ObjectComparer[T].cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 
-namespace AppScaffolding
+namespace LibationUiBase
 {
 	public class ObjectComparer<T> : IComparer where T : IComparable
 	{
diff --git a/Source/LibationWinForms/GridView/GridEntry.cs b/Source/LibationWinForms/GridView/GridEntry.cs
index f487fc88..026c5ad5 100644
--- a/Source/LibationWinForms/GridView/GridEntry.cs
+++ b/Source/LibationWinForms/GridView/GridEntry.cs
@@ -1,11 +1,11 @@
 using ApplicationServices;
-using AppScaffolding;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.DataBinding;
 using Dinah.Core.WindowsDesktop.Drawing;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/Source/LibationWinForms/LibationWinForms.csproj b/Source/LibationWinForms/LibationWinForms.csproj
index 7c025399..f676ada6 100644
--- a/Source/LibationWinForms/LibationWinForms.csproj
+++ b/Source/LibationWinForms/LibationWinForms.csproj
@@ -49,9 +49,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+	  <ProjectReference Include="..\LibationUiBase\LibationUiBase.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Form1.*.cs">
diff --git a/Source/LibationWinForms/ProcessQueue/ProcessBook.cs b/Source/LibationWinForms/ProcessQueue/ProcessBook.cs
index 7573c654..d06c0da4 100644
--- a/Source/LibationWinForms/ProcessQueue/ProcessBook.cs
+++ b/Source/LibationWinForms/ProcessQueue/ProcessBook.cs
@@ -15,7 +15,7 @@ using Dinah.Core.ErrorHandling;
 using Dinah.Core.WindowsDesktop.Drawing;
 using FileLiberator;
 using LibationFileManager;
-using AppScaffolding;
+using LibationUiBase;
 
 namespace LibationWinForms.ProcessQueue
 {
diff --git a/Source/LibationWinForms/ProcessQueue/ProcessQueueControl.cs b/Source/LibationWinForms/ProcessQueue/ProcessQueueControl.cs
index 8e223811..af788041 100644
--- a/Source/LibationWinForms/ProcessQueue/ProcessQueueControl.cs
+++ b/Source/LibationWinForms/ProcessQueue/ProcessQueueControl.cs
@@ -6,8 +6,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
-using AppScaffolding;
 using LibationFileManager;
+using LibationUiBase;
 
 namespace LibationWinForms.ProcessQueue
 {