diff --git a/AppScaffolding/AppScaffolding.csproj b/AppScaffolding/AppScaffolding.csproj
index d797e839..de90058b 100644
--- a/AppScaffolding/AppScaffolding.csproj
+++ b/AppScaffolding/AppScaffolding.csproj
@@ -3,7 +3,7 @@
net5.0
- 6.2.7.1
+ 6.2.7.3
@@ -15,7 +15,7 @@
-
+
diff --git a/AppScaffolding/LibationScaffolding.cs b/AppScaffolding/LibationScaffolding.cs
index c3674657..4088a059 100644
--- a/AppScaffolding/LibationScaffolding.cs
+++ b/AppScaffolding/LibationScaffolding.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
+using AudibleUtilities;
using Dinah.Core;
using Dinah.Core.IO;
using Dinah.Core.Logging;
-using InternalUtilities;
using LibationFileManager;
using Newtonsoft.Json.Linq;
using Serilog;
diff --git a/ApplicationServices/LibraryCommands.cs b/ApplicationServices/LibraryCommands.cs
index 5437f8f2..29f413f2 100644
--- a/ApplicationServices/LibraryCommands.cs
+++ b/ApplicationServices/LibraryCommands.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using AudibleApi;
+using AudibleUtilities;
using DataLayer;
using Dinah.Core;
using DtoImporterService;
-using InternalUtilities;
using LibationFileManager;
using Serilog;
using static DtoImporterService.PerfLogger;
diff --git a/InternalUtilities/Account.cs b/AudibleUtilities/Account.cs
similarity index 98%
rename from InternalUtilities/Account.cs
rename to AudibleUtilities/Account.cs
index b350f01f..25727724 100644
--- a/InternalUtilities/Account.cs
+++ b/AudibleUtilities/Account.cs
@@ -6,7 +6,7 @@ using AudibleApi.Authorization;
using Dinah.Core;
using Newtonsoft.Json;
-namespace InternalUtilities
+namespace AudibleUtilities
{
public class Account : IUpdatable
{
diff --git a/InternalUtilities/AccountsSettings.cs b/AudibleUtilities/AccountsSettings.cs
similarity index 99%
rename from InternalUtilities/AccountsSettings.cs
rename to AudibleUtilities/AccountsSettings.cs
index d1614be0..83a07b6f 100644
--- a/InternalUtilities/AccountsSettings.cs
+++ b/AudibleUtilities/AccountsSettings.cs
@@ -6,7 +6,7 @@ using AudibleApi.Authorization;
using Dinah.Core;
using Newtonsoft.Json;
-namespace InternalUtilities
+namespace AudibleUtilities
{
// 'AccountsSettings' is intentionally NOT IEnumerable<> so that properties can be added/extended
// from newtonsoft (https://www.newtonsoft.com/json/help/html/SerializationGuide.htm):
diff --git a/InternalUtilities/AccountsSettingsPersister.cs b/AudibleUtilities/AccountsSettingsPersister.cs
similarity index 96%
rename from InternalUtilities/AccountsSettingsPersister.cs
rename to AudibleUtilities/AccountsSettingsPersister.cs
index 1368b614..f3c95d38 100644
--- a/InternalUtilities/AccountsSettingsPersister.cs
+++ b/AudibleUtilities/AccountsSettingsPersister.cs
@@ -3,7 +3,7 @@ using AudibleApi.Authorization;
using Dinah.Core.IO;
using Newtonsoft.Json;
-namespace InternalUtilities
+namespace AudibleUtilities
{
public class AccountsSettingsPersister : JsonFilePersister
{
diff --git a/InternalUtilities/ApiExtended.cs b/AudibleUtilities/ApiExtended.cs
similarity index 99%
rename from InternalUtilities/ApiExtended.cs
rename to AudibleUtilities/ApiExtended.cs
index 56c4d055..6862407e 100644
--- a/InternalUtilities/ApiExtended.cs
+++ b/AudibleUtilities/ApiExtended.cs
@@ -8,7 +8,7 @@ using Dinah.Core;
using Polly;
using Polly.Retry;
-namespace InternalUtilities
+namespace AudibleUtilities
{
/// USE THIS from within Libation. It wraps the call with correct JSONPath
public class ApiExtended
diff --git a/InternalUtilities/AudibleApiStorage.cs b/AudibleUtilities/AudibleApiStorage.cs
similarity index 98%
rename from InternalUtilities/AudibleApiStorage.cs
rename to AudibleUtilities/AudibleApiStorage.cs
index b6224264..ff96b812 100644
--- a/InternalUtilities/AudibleApiStorage.cs
+++ b/AudibleUtilities/AudibleApiStorage.cs
@@ -3,7 +3,7 @@ using System.IO;
using LibationFileManager;
using Newtonsoft.Json;
-namespace InternalUtilities
+namespace AudibleUtilities
{
public static class AudibleApiStorage
{
diff --git a/InternalUtilities/AudibleApiValidators.cs b/AudibleUtilities/AudibleApiValidators.cs
similarity index 99%
rename from InternalUtilities/AudibleApiValidators.cs
rename to AudibleUtilities/AudibleApiValidators.cs
index ff55ce27..cae6e812 100644
--- a/InternalUtilities/AudibleApiValidators.cs
+++ b/AudibleUtilities/AudibleApiValidators.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using AudibleApi.Common;
-namespace InternalUtilities
+namespace AudibleUtilities
{
public interface IValidator
{
diff --git a/InternalUtilities/InternalUtilities.csproj b/AudibleUtilities/AudibleUtilities.csproj
similarity index 100%
rename from InternalUtilities/InternalUtilities.csproj
rename to AudibleUtilities/AudibleUtilities.csproj
diff --git a/DtoImporterService/BookImporter.cs b/DtoImporterService/BookImporter.cs
index 9c365823..89de6cbb 100644
--- a/DtoImporterService/BookImporter.cs
+++ b/DtoImporterService/BookImporter.cs
@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using AudibleApi.Common;
+using AudibleUtilities;
using DataLayer;
-using InternalUtilities;
namespace DtoImporterService
{
diff --git a/DtoImporterService/CategoryImporter.cs b/DtoImporterService/CategoryImporter.cs
index 5980ee85..32bd3a8b 100644
--- a/DtoImporterService/CategoryImporter.cs
+++ b/DtoImporterService/CategoryImporter.cs
@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using AudibleApi.Common;
+using AudibleUtilities;
using DataLayer;
-using InternalUtilities;
namespace DtoImporterService
{
diff --git a/DtoImporterService/ContributorImporter.cs b/DtoImporterService/ContributorImporter.cs
index c74d76c3..da90d7f8 100644
--- a/DtoImporterService/ContributorImporter.cs
+++ b/DtoImporterService/ContributorImporter.cs
@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using AudibleApi.Common;
+using AudibleUtilities;
using DataLayer;
-using InternalUtilities;
namespace DtoImporterService
{
diff --git a/DtoImporterService/DtoImporterService.csproj b/DtoImporterService/DtoImporterService.csproj
index 4fa64420..94d100ba 100644
--- a/DtoImporterService/DtoImporterService.csproj
+++ b/DtoImporterService/DtoImporterService.csproj
@@ -5,8 +5,8 @@
+
-
diff --git a/DtoImporterService/ImporterBase.cs b/DtoImporterService/ImporterBase.cs
index d5714cba..5b4984fe 100644
--- a/DtoImporterService/ImporterBase.cs
+++ b/DtoImporterService/ImporterBase.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using AudibleUtilities;
using DataLayer;
using Dinah.Core;
-using InternalUtilities;
namespace DtoImporterService
{
diff --git a/DtoImporterService/LibraryBookImporter.cs b/DtoImporterService/LibraryBookImporter.cs
index 673a1988..aa9c4198 100644
--- a/DtoImporterService/LibraryBookImporter.cs
+++ b/DtoImporterService/LibraryBookImporter.cs
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using AudibleUtilities;
using DataLayer;
-using InternalUtilities;
namespace DtoImporterService
{
diff --git a/DtoImporterService/SeriesImporter.cs b/DtoImporterService/SeriesImporter.cs
index 75e6f048..de42e02d 100644
--- a/DtoImporterService/SeriesImporter.cs
+++ b/DtoImporterService/SeriesImporter.cs
@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using AudibleApi.Common;
+using AudibleUtilities;
using DataLayer;
-using InternalUtilities;
namespace DtoImporterService
{
diff --git a/FileLiberator/DownloadDecryptBook.cs b/FileLiberator/DownloadDecryptBook.cs
index 2b2cbdb1..2ce82168 100644
--- a/FileLiberator/DownloadDecryptBook.cs
+++ b/FileLiberator/DownloadDecryptBook.cs
@@ -59,7 +59,6 @@ namespace FileLiberator
FilePathCache.Removed -= FilePathCache_Removed;
}
-
// decrypt failed
if (!success)
return new StatusHandler { "Decrypt failed" };
@@ -134,7 +133,6 @@ namespace FileLiberator
// REAL WORK DONE HERE
var success = await Task.Run(abDownloader.Run);
-
return success;
}
finally
diff --git a/FileLiberator/FileLiberator.csproj b/FileLiberator/FileLiberator.csproj
index 467c460c..65ffabc7 100644
--- a/FileLiberator/FileLiberator.csproj
+++ b/FileLiberator/FileLiberator.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/FileLiberator/UtilityExtensions.cs b/FileLiberator/UtilityExtensions.cs
index df4d6834..08bf8c6c 100644
--- a/FileLiberator/UtilityExtensions.cs
+++ b/FileLiberator/UtilityExtensions.cs
@@ -19,7 +19,7 @@ namespace FileLiberator
public static async Task GetApiAsync(this LibraryBook libraryBook)
{
- var apiExtended = await InternalUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
+ var apiExtended = await AudibleUtilities.ApiExtended.CreateAsync(libraryBook.Account, libraryBook.Book.Locale);
return apiExtended.Api;
}
}
diff --git a/Libation.sln b/Libation.sln
index 12810992..15c1b43b 100644
--- a/Libation.sln
+++ b/Libation.sln
@@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataLayer", "DataLayer\Data
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLiberator", "FileLiberator\FileLiberator.csproj", "{393B5B27-D15C-4F77-9457-FA14BA8F3C73}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities", "InternalUtilities\InternalUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleUtilities", "AudibleUtilities\AudibleUtilities.csproj", "{06882742-27A6-4347-97D9-56162CEC9C11}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain Internal Utilities (db ignorant)", "3 Domain Internal Utilities (db ignorant)", "{F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}"
EndProject
@@ -46,8 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationServices", "Appl
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Tests", "_Tests", "{67E66E82-5532-4440-AFB3-9FB1DF9DEF53}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InternalUtilities.Tests", "_Tests\InternalUtilities.Tests\InternalUtilities.Tests.csproj", "{8447C956-B03E-4F59-9DD4-877793B849D9}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine.Tests", "_Tests\LibationSearchEngine.Tests\LibationSearchEngine.Tests.csproj", "{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hoopla", "Hoopla\Hoopla.csproj", "{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F}"
@@ -56,9 +54,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationCli", "LibationCli\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppScaffolding", "AppScaffolding\AppScaffolding.csproj", "{595E7C4D-506D-486D-98B7-5FDDF398D033}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileManager", "FileManager\FileManager.csproj", "{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager", "FileManager\FileManager.csproj", "{E86014F9-E4B3-4CD4-A210-2B3DB571DD86}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileManager.Tests", "FileManager.Tests\FileManager.Tests.csproj", "{3B58450C-FBDA-4D48-8418-A3C750596D7D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileManager.Tests", "FileManager.Tests\FileManager.Tests.csproj", "{3B58450C-FBDA-4D48-8418-A3C750596D7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudibleUtilities.Tests", "_Tests\AudibleUtilities.Tests\AudibleUtilities.Tests.csproj", "{788294BE-0D8E-40D4-9CEE-67896FBB52CE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -102,10 +102,6 @@ Global
{B95650EA-25F0-449E-BA5D-99126BC5D730}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B95650EA-25F0-449E-BA5D-99126BC5D730}.Release|Any CPU.Build.0 = Release|Any CPU
- {8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8447C956-B03E-4F59-9DD4-877793B849D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8447C956-B03E-4F59-9DD4-877793B849D9}.Release|Any CPU.Build.0 = Release|Any CPU
{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5B21768-C7C9-4FCB-AC1E-187B223D5A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -130,6 +126,10 @@ Global
{3B58450C-FBDA-4D48-8418-A3C750596D7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B58450C-FBDA-4D48-8418-A3C750596D7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B58450C-FBDA-4D48-8418-A3C750596D7D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {788294BE-0D8E-40D4-9CEE-67896FBB52CE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -144,13 +144,13 @@ Global
{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
- {8447C956-B03E-4F59-9DD4-877793B849D9} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
{D8F56E5A-3E65-41A6-B7E7-C4515A264B1F} = {7FBBB086-0807-4998-85BF-6D1A49C8AD05}
{428163C3-D558-4914-B570-A92069521877} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
{595E7C4D-506D-486D-98B7-5FDDF398D033} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
{E86014F9-E4B3-4CD4-A210-2B3DB571DD86} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
{3B58450C-FBDA-4D48-8418-A3C750596D7D} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
+ {788294BE-0D8E-40D4-9CEE-67896FBB52CE} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}
diff --git a/LibationCli/Options/ExportOptions.cs b/LibationCli/Options/ExportOptions.cs
index 625663b6..fbd0ffb5 100644
--- a/LibationCli/Options/ExportOptions.cs
+++ b/LibationCli/Options/ExportOptions.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using ApplicationServices;
+using AudibleUtilities;
using CommandLine;
-using InternalUtilities;
namespace LibationCli
{
diff --git a/LibationCli/Options/ScanOptions.cs b/LibationCli/Options/ScanOptions.cs
index 87daca99..58ee3d81 100644
--- a/LibationCli/Options/ScanOptions.cs
+++ b/LibationCli/Options/ScanOptions.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using ApplicationServices;
+using AudibleUtilities;
using CommandLine;
-using InternalUtilities;
namespace LibationCli
{
diff --git a/LibationWinForms/Dialogs/AccountsDialog.cs b/LibationWinForms/Dialogs/AccountsDialog.cs
index cfc5988e..1ed043eb 100644
--- a/LibationWinForms/Dialogs/AccountsDialog.cs
+++ b/LibationWinForms/Dialogs/AccountsDialog.cs
@@ -1,9 +1,9 @@
-using AudibleApi;
-using InternalUtilities;
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
+using AudibleApi;
+using AudibleUtilities;
namespace LibationWinForms.Dialogs
{
diff --git a/LibationWinForms/Dialogs/IndexLibraryDialog.cs b/LibationWinForms/Dialogs/IndexLibraryDialog.cs
index ba4e4342..063d3dd2 100644
--- a/LibationWinForms/Dialogs/IndexLibraryDialog.cs
+++ b/LibationWinForms/Dialogs/IndexLibraryDialog.cs
@@ -1,9 +1,8 @@
-using ApplicationServices;
-using InternalUtilities;
-using LibationWinForms.Login;
-using System;
-using System.Linq;
+using System;
using System.Windows.Forms;
+using ApplicationServices;
+using AudibleUtilities;
+using LibationWinForms.Login;
namespace LibationWinForms.Dialogs
{
diff --git a/LibationWinForms/Dialogs/Login/LoginCallbackDialog.cs b/LibationWinForms/Dialogs/Login/LoginCallbackDialog.cs
index 93d2b043..e2ef722d 100644
--- a/LibationWinForms/Dialogs/Login/LoginCallbackDialog.cs
+++ b/LibationWinForms/Dialogs/Login/LoginCallbackDialog.cs
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
+using AudibleUtilities;
using Dinah.Core;
-using InternalUtilities;
namespace LibationWinForms.Dialogs.Login
{
diff --git a/LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.cs b/LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.cs
index 827a8273..e3c75906 100644
--- a/LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.cs
+++ b/LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.cs
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
+using AudibleUtilities;
using Dinah.Core;
-using InternalUtilities;
namespace LibationWinForms.Dialogs.Login
{
diff --git a/LibationWinForms/Dialogs/Login/LoginExternalDialog.cs b/LibationWinForms/Dialogs/Login/LoginExternalDialog.cs
index c4028ca9..377589df 100644
--- a/LibationWinForms/Dialogs/Login/LoginExternalDialog.cs
+++ b/LibationWinForms/Dialogs/Login/LoginExternalDialog.cs
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
+using AudibleUtilities;
using Dinah.Core;
-using InternalUtilities;
namespace LibationWinForms.Dialogs.Login
{
diff --git a/LibationWinForms/Dialogs/Login/WinformLoginCallback.cs b/LibationWinForms/Dialogs/Login/WinformLoginCallback.cs
index 5e134863..2a1b273e 100644
--- a/LibationWinForms/Dialogs/Login/WinformLoginCallback.cs
+++ b/LibationWinForms/Dialogs/Login/WinformLoginCallback.cs
@@ -1,6 +1,6 @@
using System;
using AudibleApi;
-using InternalUtilities;
+using AudibleUtilities;
using LibationWinForms.Dialogs.Login;
namespace LibationWinForms.Login
diff --git a/LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs b/LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs
index 29245662..d609817a 100644
--- a/LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs
+++ b/LibationWinForms/Dialogs/Login/WinformLoginChoiceEager.cs
@@ -1,6 +1,6 @@
using System;
using AudibleApi;
-using InternalUtilities;
+using AudibleUtilities;
using LibationWinForms.Dialogs.Login;
namespace LibationWinForms.Login
diff --git a/LibationWinForms/Dialogs/RemoveBooksDialog.cs b/LibationWinForms/Dialogs/RemoveBooksDialog.cs
index 538a5925..e3739c4f 100644
--- a/LibationWinForms/Dialogs/RemoveBooksDialog.cs
+++ b/LibationWinForms/Dialogs/RemoveBooksDialog.cs
@@ -1,16 +1,16 @@
-using ApplicationServices;
-using DataLayer;
-using Dinah.Core.DataBinding;
-using InternalUtilities;
-using LibationFileManager;
-using LibationWinForms.Login;
-using System;
+using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Linq;
using System.Windows.Forms;
+using ApplicationServices;
+using AudibleUtilities;
+using DataLayer;
+using Dinah.Core.DataBinding;
+using LibationFileManager;
+using LibationWinForms.Login;
namespace LibationWinForms.Dialogs
{
diff --git a/LibationWinForms/Dialogs/ScanAccountsDialog.cs b/LibationWinForms/Dialogs/ScanAccountsDialog.cs
index c5453cfb..5ad47361 100644
--- a/LibationWinForms/Dialogs/ScanAccountsDialog.cs
+++ b/LibationWinForms/Dialogs/ScanAccountsDialog.cs
@@ -1,8 +1,8 @@
-using InternalUtilities;
-using System;
+using System;
using System.Linq;
using System.Collections.Generic;
using System.Windows.Forms;
+using AudibleUtilities;
namespace LibationWinForms.Dialogs
{
diff --git a/LibationWinForms/Form1.cs b/LibationWinForms/Form1.cs
index a554e26d..8f104cf0 100644
--- a/LibationWinForms/Form1.cs
+++ b/LibationWinForms/Form1.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using ApplicationServices;
+using AudibleUtilities;
using Dinah.Core;
using Dinah.Core.Drawing;
using Dinah.Core.Threading;
-using InternalUtilities;
using LibationFileManager;
using LibationWinForms.Dialogs;
diff --git a/LibationWinForms/Program.cs b/LibationWinForms/Program.cs
index d37b39ff..6bc7eb81 100644
--- a/LibationWinForms/Program.cs
+++ b/LibationWinForms/Program.cs
@@ -4,9 +4,9 @@ using System.IO;
using System.Linq;
using System.Windows.Forms;
using AudibleApi.Authorization;
+using AudibleUtilities;
using DataLayer;
using Dinah.Core;
-using InternalUtilities;
using LibationFileManager;
using LibationWinForms.Dialogs;
using Microsoft.EntityFrameworkCore;
diff --git a/_Tests/InternalUtilities.Tests/AccountTests.cs b/_Tests/AudibleUtilities.Tests/AccountTests.cs
similarity index 99%
rename from _Tests/InternalUtilities.Tests/AccountTests.cs
rename to _Tests/AudibleUtilities.Tests/AccountTests.cs
index 24223e9d..2c93bd48 100644
--- a/_Tests/InternalUtilities.Tests/AccountTests.cs
+++ b/_Tests/AudibleUtilities.Tests/AccountTests.cs
@@ -8,10 +8,10 @@ using System.Threading;
using System.Threading.Tasks;
using AudibleApi;
using AudibleApi.Authorization;
+using AudibleUtilities;
using Dinah.Core;
using FluentAssertions;
using FluentAssertions.Common;
-using InternalUtilities;
using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/_Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj b/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj
similarity index 90%
rename from _Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj
rename to _Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj
index d3b146e6..02d1c0e0 100644
--- a/_Tests/InternalUtilities.Tests/InternalUtilities.Tests.csproj
+++ b/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj
@@ -19,7 +19,7 @@
-
+