diff --git a/AaxDecrypter/UNTESTED/AAXChapters.cs b/AaxDecrypter/AAXChapters.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/AAXChapters.cs
rename to AaxDecrypter/AAXChapters.cs
diff --git a/AaxDecrypter/UNTESTED/AaxToM4bConverter.cs b/AaxDecrypter/AaxToM4bConverter.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/AaxToM4bConverter.cs
rename to AaxDecrypter/AaxToM4bConverter.cs
diff --git a/AaxDecrypter/UNTESTED/BytesCracker.cs b/AaxDecrypter/BytesCracker.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/BytesCracker.cs
rename to AaxDecrypter/BytesCracker.cs
diff --git a/AaxDecrypter/UNTESTED/BytesCrackerSupportLibraries.cs b/AaxDecrypter/BytesCrackerSupportLibraries.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/BytesCrackerSupportLibraries.cs
rename to AaxDecrypter/BytesCrackerSupportLibraries.cs
diff --git a/AaxDecrypter/UNTESTED/Chapter.cs b/AaxDecrypter/Chapter.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/Chapter.cs
rename to AaxDecrypter/Chapter.cs
diff --git a/AaxDecrypter/UNTESTED/Chapters.cs b/AaxDecrypter/Chapters.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/Chapters.cs
rename to AaxDecrypter/Chapters.cs
diff --git a/AaxDecrypter/UNTESTED/Cue.cs b/AaxDecrypter/Cue.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/Cue.cs
rename to AaxDecrypter/Cue.cs
diff --git a/AaxDecrypter/UNTESTED/DecryptSupportLibraries.cs b/AaxDecrypter/DecryptSupportLibraries.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/DecryptSupportLibraries.cs
rename to AaxDecrypter/DecryptSupportLibraries.cs
diff --git a/AaxDecrypter/UNTESTED/EncodingInfo.cs b/AaxDecrypter/EncodingInfo.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/EncodingInfo.cs
rename to AaxDecrypter/EncodingInfo.cs
diff --git a/AaxDecrypter/UNTESTED/NFO.cs b/AaxDecrypter/NFO.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/NFO.cs
rename to AaxDecrypter/NFO.cs
diff --git a/AaxDecrypter/UNTESTED/Tags.cs b/AaxDecrypter/Tags.cs
similarity index 100%
rename from AaxDecrypter/UNTESTED/Tags.cs
rename to AaxDecrypter/Tags.cs
diff --git a/ApplicationServices/UNTESTED/DbContexts.cs b/ApplicationServices/DbContexts.cs
similarity index 100%
rename from ApplicationServices/UNTESTED/DbContexts.cs
rename to ApplicationServices/DbContexts.cs
diff --git a/ApplicationServices/UNTESTED/LibraryCommands.cs b/ApplicationServices/LibraryCommands.cs
similarity index 100%
rename from ApplicationServices/UNTESTED/LibraryCommands.cs
rename to ApplicationServices/LibraryCommands.cs
diff --git a/ApplicationServices/UNTESTED/LibraryExporter.cs b/ApplicationServices/LibraryExporter.cs
similarity index 100%
rename from ApplicationServices/UNTESTED/LibraryExporter.cs
rename to ApplicationServices/LibraryExporter.cs
diff --git a/ApplicationServices/UNTESTED/SearchEngineCommands.cs b/ApplicationServices/SearchEngineCommands.cs
similarity index 100%
rename from ApplicationServices/UNTESTED/SearchEngineCommands.cs
rename to ApplicationServices/SearchEngineCommands.cs
diff --git a/DataLayer/UNTESTED/Configurations/BookConfig.cs b/DataLayer/Configurations/BookConfig.cs
similarity index 100%
rename from DataLayer/UNTESTED/Configurations/BookConfig.cs
rename to DataLayer/Configurations/BookConfig.cs
diff --git a/DataLayer/UNTESTED/Configurations/BookContributorConfig.cs b/DataLayer/Configurations/BookContributorConfig.cs
similarity index 100%
rename from DataLayer/UNTESTED/Configurations/BookContributorConfig.cs
rename to DataLayer/Configurations/BookContributorConfig.cs
diff --git a/DataLayer/UNTESTED/Configurations/CategoryConfig.cs b/DataLayer/Configurations/CategoryConfig.cs
similarity index 100%
rename from DataLayer/UNTESTED/Configurations/CategoryConfig.cs
rename to DataLayer/Configurations/CategoryConfig.cs
diff --git a/DataLayer/UNTESTED/Configurations/ContributorConfig.cs b/DataLayer/Configurations/ContributorConfig.cs
similarity index 100%
rename from DataLayer/UNTESTED/Configurations/ContributorConfig.cs
rename to DataLayer/Configurations/ContributorConfig.cs
diff --git a/DataLayer/UNTESTED/Configurations/LibraryBookConfig.cs b/DataLayer/Configurations/LibraryBookConfig.cs
similarity index 100%
rename from DataLayer/UNTESTED/Configurations/LibraryBookConfig.cs
rename to DataLayer/Configurations/LibraryBookConfig.cs
diff --git a/DataLayer/UNTESTED/Configurations/SeriesBookConfig.cs b/DataLayer/Configurations/SeriesBookConfig.cs
similarity index 100%
rename from DataLayer/UNTESTED/Configurations/SeriesBookConfig.cs
rename to DataLayer/Configurations/SeriesBookConfig.cs
diff --git a/DataLayer/UNTESTED/Configurations/SeriesConfig.cs b/DataLayer/Configurations/SeriesConfig.cs
similarity index 100%
rename from DataLayer/UNTESTED/Configurations/SeriesConfig.cs
rename to DataLayer/Configurations/SeriesConfig.cs
diff --git a/DataLayer/UNTESTED/EfClasses/Book.cs b/DataLayer/EfClasses/Book.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/Book.cs
rename to DataLayer/EfClasses/Book.cs
diff --git a/DataLayer/UNTESTED/EfClasses/BookContributor.cs b/DataLayer/EfClasses/BookContributor.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/BookContributor.cs
rename to DataLayer/EfClasses/BookContributor.cs
diff --git a/DataLayer/UNTESTED/EfClasses/Category.cs b/DataLayer/EfClasses/Category.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/Category.cs
rename to DataLayer/EfClasses/Category.cs
diff --git a/DataLayer/UNTESTED/EfClasses/Contributor.cs b/DataLayer/EfClasses/Contributor.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/Contributor.cs
rename to DataLayer/EfClasses/Contributor.cs
diff --git a/DataLayer/UNTESTED/EfClasses/LibraryBook.cs b/DataLayer/EfClasses/LibraryBook.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/LibraryBook.cs
rename to DataLayer/EfClasses/LibraryBook.cs
diff --git a/DataLayer/UNTESTED/EfClasses/Rating.cs b/DataLayer/EfClasses/Rating.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/Rating.cs
rename to DataLayer/EfClasses/Rating.cs
diff --git a/DataLayer/UNTESTED/EfClasses/Role.cs b/DataLayer/EfClasses/Role.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/Role.cs
rename to DataLayer/EfClasses/Role.cs
diff --git a/DataLayer/UNTESTED/EfClasses/Series.cs b/DataLayer/EfClasses/Series.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/Series.cs
rename to DataLayer/EfClasses/Series.cs
diff --git a/DataLayer/UNTESTED/EfClasses/SeriesBook.cs b/DataLayer/EfClasses/SeriesBook.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/SeriesBook.cs
rename to DataLayer/EfClasses/SeriesBook.cs
diff --git a/DataLayer/UNTESTED/EfClasses/Supplement.cs b/DataLayer/EfClasses/Supplement.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/Supplement.cs
rename to DataLayer/EfClasses/Supplement.cs
diff --git a/DataLayer/UNTESTED/EfClasses/UserDefinedItem.cs b/DataLayer/EfClasses/UserDefinedItem.cs
similarity index 100%
rename from DataLayer/UNTESTED/EfClasses/UserDefinedItem.cs
rename to DataLayer/EfClasses/UserDefinedItem.cs
diff --git a/DataLayer/UNTESTED/LibationContext.cs b/DataLayer/LibationContext.cs
similarity index 100%
rename from DataLayer/UNTESTED/LibationContext.cs
rename to DataLayer/LibationContext.cs
diff --git a/DataLayer/UNTESTED/LibationContextFactory.cs b/DataLayer/LibationContextFactory.cs
similarity index 100%
rename from DataLayer/UNTESTED/LibationContextFactory.cs
rename to DataLayer/LibationContextFactory.cs
diff --git a/DataLayer/UNTESTED/QueryObjects/BookQueries.cs b/DataLayer/QueryObjects/BookQueries.cs
similarity index 100%
rename from DataLayer/UNTESTED/QueryObjects/BookQueries.cs
rename to DataLayer/QueryObjects/BookQueries.cs
diff --git a/DataLayer/UNTESTED/QueryObjects/GenericPaging.cs b/DataLayer/QueryObjects/GenericPaging.cs
similarity index 100%
rename from DataLayer/UNTESTED/QueryObjects/GenericPaging.cs
rename to DataLayer/QueryObjects/GenericPaging.cs
diff --git a/DataLayer/UNTESTED/QueryObjects/LibraryQueries.cs b/DataLayer/QueryObjects/LibraryQueries.cs
similarity index 100%
rename from DataLayer/UNTESTED/QueryObjects/LibraryQueries.cs
rename to DataLayer/QueryObjects/LibraryQueries.cs
diff --git a/DataLayer/UNTESTED/TagPersistenceInterceptor.cs b/DataLayer/TagPersistenceInterceptor.cs
similarity index 100%
rename from DataLayer/UNTESTED/TagPersistenceInterceptor.cs
rename to DataLayer/TagPersistenceInterceptor.cs
diff --git a/DataLayer/UNTESTED/Utilities/LocalDatabaseInfo.cs b/DataLayer/Utilities/LocalDatabaseInfo.cs
similarity index 100%
rename from DataLayer/UNTESTED/Utilities/LocalDatabaseInfo.cs
rename to DataLayer/Utilities/LocalDatabaseInfo.cs
diff --git a/DtoImporterService/UNTESTED/BookImporter.cs b/DtoImporterService/BookImporter.cs
similarity index 100%
rename from DtoImporterService/UNTESTED/BookImporter.cs
rename to DtoImporterService/BookImporter.cs
diff --git a/DtoImporterService/UNTESTED/CategoryImporter.cs b/DtoImporterService/CategoryImporter.cs
similarity index 100%
rename from DtoImporterService/UNTESTED/CategoryImporter.cs
rename to DtoImporterService/CategoryImporter.cs
diff --git a/DtoImporterService/UNTESTED/ContributorImporter.cs b/DtoImporterService/ContributorImporter.cs
similarity index 100%
rename from DtoImporterService/UNTESTED/ContributorImporter.cs
rename to DtoImporterService/ContributorImporter.cs
diff --git a/DtoImporterService/UNTESTED/ImporterBase.cs b/DtoImporterService/ImporterBase.cs
similarity index 100%
rename from DtoImporterService/UNTESTED/ImporterBase.cs
rename to DtoImporterService/ImporterBase.cs
diff --git a/DtoImporterService/UNTESTED/LibraryImporter.cs b/DtoImporterService/LibraryImporter.cs
similarity index 100%
rename from DtoImporterService/UNTESTED/LibraryImporter.cs
rename to DtoImporterService/LibraryImporter.cs
diff --git a/DtoImporterService/UNTESTED/SeriesImporter.cs b/DtoImporterService/SeriesImporter.cs
similarity index 100%
rename from DtoImporterService/UNTESTED/SeriesImporter.cs
rename to DtoImporterService/SeriesImporter.cs
diff --git a/FileLiberator/UNTESTED/BackupBook.cs b/FileLiberator/BackupBook.cs
similarity index 100%
rename from FileLiberator/UNTESTED/BackupBook.cs
rename to FileLiberator/BackupBook.cs
diff --git a/FileLiberator/UNTESTED/DecryptBook.cs b/FileLiberator/DecryptBook.cs
similarity index 100%
rename from FileLiberator/UNTESTED/DecryptBook.cs
rename to FileLiberator/DecryptBook.cs
diff --git a/FileLiberator/UNTESTED/DownloadBook.cs b/FileLiberator/DownloadBook.cs
similarity index 100%
rename from FileLiberator/UNTESTED/DownloadBook.cs
rename to FileLiberator/DownloadBook.cs
diff --git a/FileLiberator/UNTESTED/DownloadFile.cs b/FileLiberator/DownloadFile.cs
similarity index 100%
rename from FileLiberator/UNTESTED/DownloadFile.cs
rename to FileLiberator/DownloadFile.cs
diff --git a/FileLiberator/UNTESTED/DownloadPdf.cs b/FileLiberator/DownloadPdf.cs
similarity index 100%
rename from FileLiberator/UNTESTED/DownloadPdf.cs
rename to FileLiberator/DownloadPdf.cs
diff --git a/FileLiberator/UNTESTED/DownloadableBase.cs b/FileLiberator/DownloadableBase.cs
similarity index 100%
rename from FileLiberator/UNTESTED/DownloadableBase.cs
rename to FileLiberator/DownloadableBase.cs
diff --git a/FileLiberator/UNTESTED/DownloadedChapters.cs b/FileLiberator/DownloadedChapters.cs
similarity index 100%
rename from FileLiberator/UNTESTED/DownloadedChapters.cs
rename to FileLiberator/DownloadedChapters.cs
diff --git a/FileLiberator/UNTESTED/IDecryptable.cs b/FileLiberator/IDecryptable.cs
similarity index 100%
rename from FileLiberator/UNTESTED/IDecryptable.cs
rename to FileLiberator/IDecryptable.cs
diff --git a/FileLiberator/UNTESTED/IDownloadable.cs b/FileLiberator/IDownloadable.cs
similarity index 100%
rename from FileLiberator/UNTESTED/IDownloadable.cs
rename to FileLiberator/IDownloadable.cs
diff --git a/FileLiberator/UNTESTED/IDownloadableProcessable.cs b/FileLiberator/IDownloadableProcessable.cs
similarity index 100%
rename from FileLiberator/UNTESTED/IDownloadableProcessable.cs
rename to FileLiberator/IDownloadableProcessable.cs
diff --git a/FileLiberator/UNTESTED/IProcessable.cs b/FileLiberator/IProcessable.cs
similarity index 100%
rename from FileLiberator/UNTESTED/IProcessable.cs
rename to FileLiberator/IProcessable.cs
diff --git a/FileLiberator/UNTESTED/IProcessableExt.cs b/FileLiberator/IProcessableExt.cs
similarity index 100%
rename from FileLiberator/UNTESTED/IProcessableExt.cs
rename to FileLiberator/IProcessableExt.cs
diff --git a/FileManager/UNTESTED/AudibleFileStorage.cs b/FileManager/AudibleFileStorage.cs
similarity index 100%
rename from FileManager/UNTESTED/AudibleFileStorage.cs
rename to FileManager/AudibleFileStorage.cs
diff --git a/FileManager/UNTESTED/Configuration.cs b/FileManager/Configuration.cs
similarity index 100%
rename from FileManager/UNTESTED/Configuration.cs
rename to FileManager/Configuration.cs
diff --git a/FileManager/UNTESTED/FilePathCache.cs b/FileManager/FilePathCache.cs
similarity index 100%
rename from FileManager/UNTESTED/FilePathCache.cs
rename to FileManager/FilePathCache.cs
diff --git a/FileManager/UNTESTED/FileUtility.cs b/FileManager/FileUtility.cs
similarity index 100%
rename from FileManager/UNTESTED/FileUtility.cs
rename to FileManager/FileUtility.cs
diff --git a/FileManager/UNTESTED/PersistentDictionary.cs b/FileManager/PersistentDictionary.cs
similarity index 100%
rename from FileManager/UNTESTED/PersistentDictionary.cs
rename to FileManager/PersistentDictionary.cs
diff --git a/FileManager/UNTESTED/PictureStorage.cs b/FileManager/PictureStorage.cs
similarity index 100%
rename from FileManager/UNTESTED/PictureStorage.cs
rename to FileManager/PictureStorage.cs
diff --git a/FileManager/UNTESTED/QuickFilters.cs b/FileManager/QuickFilters.cs
similarity index 100%
rename from FileManager/UNTESTED/QuickFilters.cs
rename to FileManager/QuickFilters.cs
diff --git a/FileManager/UNTESTED/SqliteStorage.cs b/FileManager/SqliteStorage.cs
similarity index 100%
rename from FileManager/UNTESTED/SqliteStorage.cs
rename to FileManager/SqliteStorage.cs
diff --git a/FileManager/UNTESTED/TagsPersistence.cs b/FileManager/TagsPersistence.cs
similarity index 100%
rename from FileManager/UNTESTED/TagsPersistence.cs
rename to FileManager/TagsPersistence.cs
diff --git a/InternalUtilities/UNTESTED/AudibleApiActions.cs b/InternalUtilities/AudibleApiActions.cs
similarity index 100%
rename from InternalUtilities/UNTESTED/AudibleApiActions.cs
rename to InternalUtilities/AudibleApiActions.cs
diff --git a/InternalUtilities/UNTESTED/AudibleApiStorage.cs b/InternalUtilities/AudibleApiStorage.cs
similarity index 100%
rename from InternalUtilities/UNTESTED/AudibleApiStorage.cs
rename to InternalUtilities/AudibleApiStorage.cs
diff --git a/InternalUtilities/UNTESTED/AudibleApiValidators.cs b/InternalUtilities/AudibleApiValidators.cs
similarity index 100%
rename from InternalUtilities/UNTESTED/AudibleApiValidators.cs
rename to InternalUtilities/AudibleApiValidators.cs
diff --git a/LibationLauncher/UNTESTED/Program.cs b/LibationLauncher/Program.cs
similarity index 100%
rename from LibationLauncher/UNTESTED/Program.cs
rename to LibationLauncher/Program.cs
diff --git a/LibationSearchEngine/UNTESTED/LuceneExtensions.cs b/LibationSearchEngine/LuceneExtensions.cs
similarity index 100%
rename from LibationSearchEngine/UNTESTED/LuceneExtensions.cs
rename to LibationSearchEngine/LuceneExtensions.cs
diff --git a/LibationSearchEngine/UNTESTED/LuceneRegex.cs b/LibationSearchEngine/LuceneRegex.cs
similarity index 100%
rename from LibationSearchEngine/UNTESTED/LuceneRegex.cs
rename to LibationSearchEngine/LuceneRegex.cs
diff --git a/LibationSearchEngine/UNTESTED/SearchEngine.cs b/LibationSearchEngine/SearchEngine.cs
similarity index 100%
rename from LibationSearchEngine/UNTESTED/SearchEngine.cs
rename to LibationSearchEngine/SearchEngine.cs
diff --git a/LibationSearchEngine/UNTESTED/SearchResults.cs b/LibationSearchEngine/SearchResults.cs
similarity index 100%
rename from LibationSearchEngine/UNTESTED/SearchResults.cs
rename to LibationSearchEngine/SearchResults.cs
diff --git a/LibationWinForms/UNTESTED/BookLiberation/AutomatedBackupsForm.Designer.cs b/LibationWinForms/BookLiberation/AutomatedBackupsForm.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/AutomatedBackupsForm.Designer.cs
rename to LibationWinForms/BookLiberation/AutomatedBackupsForm.Designer.cs
diff --git a/LibationWinForms/UNTESTED/BookLiberation/AutomatedBackupsForm.cs b/LibationWinForms/BookLiberation/AutomatedBackupsForm.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/AutomatedBackupsForm.cs
rename to LibationWinForms/BookLiberation/AutomatedBackupsForm.cs
diff --git a/LibationWinForms/UNTESTED/BookLiberation/AutomatedBackupsForm.resx b/LibationWinForms/BookLiberation/AutomatedBackupsForm.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/AutomatedBackupsForm.resx
rename to LibationWinForms/BookLiberation/AutomatedBackupsForm.resx
diff --git a/LibationWinForms/UNTESTED/BookLiberation/DecryptForm.Designer.cs b/LibationWinForms/BookLiberation/DecryptForm.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/DecryptForm.Designer.cs
rename to LibationWinForms/BookLiberation/DecryptForm.Designer.cs
diff --git a/LibationWinForms/UNTESTED/BookLiberation/DecryptForm.cs b/LibationWinForms/BookLiberation/DecryptForm.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/DecryptForm.cs
rename to LibationWinForms/BookLiberation/DecryptForm.cs
diff --git a/LibationWinForms/UNTESTED/BookLiberation/DecryptForm.resx b/LibationWinForms/BookLiberation/DecryptForm.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/DecryptForm.resx
rename to LibationWinForms/BookLiberation/DecryptForm.resx
diff --git a/LibationWinForms/UNTESTED/BookLiberation/DownloadForm.Designer.cs b/LibationWinForms/BookLiberation/DownloadForm.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/DownloadForm.Designer.cs
rename to LibationWinForms/BookLiberation/DownloadForm.Designer.cs
diff --git a/LibationWinForms/UNTESTED/BookLiberation/DownloadForm.cs b/LibationWinForms/BookLiberation/DownloadForm.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/DownloadForm.cs
rename to LibationWinForms/BookLiberation/DownloadForm.cs
diff --git a/LibationWinForms/UNTESTED/BookLiberation/DownloadForm.resx b/LibationWinForms/BookLiberation/DownloadForm.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/DownloadForm.resx
rename to LibationWinForms/BookLiberation/DownloadForm.resx
diff --git a/LibationWinForms/UNTESTED/BookLiberation/ProcessorAutomationController.cs b/LibationWinForms/BookLiberation/ProcessorAutomationController.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/BookLiberation/ProcessorAutomationController.cs
rename to LibationWinForms/BookLiberation/ProcessorAutomationController.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/AccountsDialog.Designer.cs b/LibationWinForms/Dialogs/AccountsDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/AccountsDialog.Designer.cs
rename to LibationWinForms/Dialogs/AccountsDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/AccountsDialog.cs b/LibationWinForms/Dialogs/AccountsDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/AccountsDialog.cs
rename to LibationWinForms/Dialogs/AccountsDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/AccountsDialog.resx b/LibationWinForms/Dialogs/AccountsDialog.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/AccountsDialog.resx
rename to LibationWinForms/Dialogs/AccountsDialog.resx
diff --git a/LibationWinForms/UNTESTED/Dialogs/EditQuickFilters.Designer.cs b/LibationWinForms/Dialogs/EditQuickFilters.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/EditQuickFilters.Designer.cs
rename to LibationWinForms/Dialogs/EditQuickFilters.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/EditQuickFilters.cs b/LibationWinForms/Dialogs/EditQuickFilters.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/EditQuickFilters.cs
rename to LibationWinForms/Dialogs/EditQuickFilters.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/EditQuickFilters.resx b/LibationWinForms/Dialogs/EditQuickFilters.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/EditQuickFilters.resx
rename to LibationWinForms/Dialogs/EditQuickFilters.resx
diff --git a/LibationWinForms/UNTESTED/Dialogs/EditTagsDialog.Designer.cs b/LibationWinForms/Dialogs/EditTagsDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/EditTagsDialog.Designer.cs
rename to LibationWinForms/Dialogs/EditTagsDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/EditTagsDialog.cs b/LibationWinForms/Dialogs/EditTagsDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/EditTagsDialog.cs
rename to LibationWinForms/Dialogs/EditTagsDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/EditTagsDialog.resx b/LibationWinForms/Dialogs/EditTagsDialog.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/EditTagsDialog.resx
rename to LibationWinForms/Dialogs/EditTagsDialog.resx
diff --git a/LibationWinForms/UNTESTED/Dialogs/IndexLibraryDialog.Designer.cs b/LibationWinForms/Dialogs/IndexLibraryDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/IndexLibraryDialog.Designer.cs
rename to LibationWinForms/Dialogs/IndexLibraryDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/IndexLibraryDialog.cs b/LibationWinForms/Dialogs/IndexLibraryDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/IndexLibraryDialog.cs
rename to LibationWinForms/Dialogs/IndexLibraryDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/LibationFilesDialog.Designer.cs b/LibationWinForms/Dialogs/LibationFilesDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/LibationFilesDialog.Designer.cs
rename to LibationWinForms/Dialogs/LibationFilesDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/LibationFilesDialog.cs b/LibationWinForms/Dialogs/LibationFilesDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/LibationFilesDialog.cs
rename to LibationWinForms/Dialogs/LibationFilesDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/LibationFilesDialog.resx b/LibationWinForms/Dialogs/LibationFilesDialog.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/LibationFilesDialog.resx
rename to LibationWinForms/Dialogs/LibationFilesDialog.resx
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.Designer.cs b/LibationWinForms/Dialogs/Login/ApprovalNeededDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.Designer.cs
rename to LibationWinForms/Dialogs/Login/ApprovalNeededDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.cs b/LibationWinForms/Dialogs/Login/ApprovalNeededDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/ApprovalNeededDialog.cs
rename to LibationWinForms/Dialogs/Login/ApprovalNeededDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/AudibleLoginDialog.Designer.cs b/LibationWinForms/Dialogs/Login/AudibleLoginDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/AudibleLoginDialog.Designer.cs
rename to LibationWinForms/Dialogs/Login/AudibleLoginDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/AudibleLoginDialog.cs b/LibationWinForms/Dialogs/Login/AudibleLoginDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/AudibleLoginDialog.cs
rename to LibationWinForms/Dialogs/Login/AudibleLoginDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/CaptchaDialog.Designer.cs b/LibationWinForms/Dialogs/Login/CaptchaDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/CaptchaDialog.Designer.cs
rename to LibationWinForms/Dialogs/Login/CaptchaDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/CaptchaDialog.cs b/LibationWinForms/Dialogs/Login/CaptchaDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/CaptchaDialog.cs
rename to LibationWinForms/Dialogs/Login/CaptchaDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/WinformResponder.cs b/LibationWinForms/Dialogs/Login/WinformResponder.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/WinformResponder.cs
rename to LibationWinForms/Dialogs/Login/WinformResponder.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/_2faCodeDialog.Designer.cs b/LibationWinForms/Dialogs/Login/_2faCodeDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/_2faCodeDialog.Designer.cs
rename to LibationWinForms/Dialogs/Login/_2faCodeDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/Login/_2faCodeDialog.cs b/LibationWinForms/Dialogs/Login/_2faCodeDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/Login/_2faCodeDialog.cs
rename to LibationWinForms/Dialogs/Login/_2faCodeDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/ScanAccountsDialog.Designer.cs b/LibationWinForms/Dialogs/ScanAccountsDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/ScanAccountsDialog.Designer.cs
rename to LibationWinForms/Dialogs/ScanAccountsDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/ScanAccountsDialog.cs b/LibationWinForms/Dialogs/ScanAccountsDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/ScanAccountsDialog.cs
rename to LibationWinForms/Dialogs/ScanAccountsDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/ScanAccountsDialog.resx b/LibationWinForms/Dialogs/ScanAccountsDialog.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/ScanAccountsDialog.resx
rename to LibationWinForms/Dialogs/ScanAccountsDialog.resx
diff --git a/LibationWinForms/UNTESTED/Dialogs/SearchSyntaxDialog.Designer.cs b/LibationWinForms/Dialogs/SearchSyntaxDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SearchSyntaxDialog.Designer.cs
rename to LibationWinForms/Dialogs/SearchSyntaxDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/SearchSyntaxDialog.cs b/LibationWinForms/Dialogs/SearchSyntaxDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SearchSyntaxDialog.cs
rename to LibationWinForms/Dialogs/SearchSyntaxDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/SearchSyntaxDialog.resx b/LibationWinForms/Dialogs/SearchSyntaxDialog.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SearchSyntaxDialog.resx
rename to LibationWinForms/Dialogs/SearchSyntaxDialog.resx
diff --git a/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.Designer.cs b/LibationWinForms/Dialogs/SettingsDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SettingsDialog.Designer.cs
rename to LibationWinForms/Dialogs/SettingsDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs b/LibationWinForms/Dialogs/SettingsDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs
rename to LibationWinForms/Dialogs/SettingsDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.resx b/LibationWinForms/Dialogs/SettingsDialog.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SettingsDialog.resx
rename to LibationWinForms/Dialogs/SettingsDialog.resx
diff --git a/LibationWinForms/UNTESTED/Dialogs/SetupDialog.Designer.cs b/LibationWinForms/Dialogs/SetupDialog.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SetupDialog.Designer.cs
rename to LibationWinForms/Dialogs/SetupDialog.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/SetupDialog.cs b/LibationWinForms/Dialogs/SetupDialog.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SetupDialog.cs
rename to LibationWinForms/Dialogs/SetupDialog.cs
diff --git a/LibationWinForms/UNTESTED/Dialogs/SetupDialog.resx b/LibationWinForms/Dialogs/SetupDialog.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Dialogs/SetupDialog.resx
rename to LibationWinForms/Dialogs/SetupDialog.resx
diff --git a/LibationWinForms/UNTESTED/Form1.Designer.cs b/LibationWinForms/Form1.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Form1.Designer.cs
rename to LibationWinForms/Form1.Designer.cs
diff --git a/LibationWinForms/UNTESTED/Form1.cs b/LibationWinForms/Form1.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/Form1.cs
rename to LibationWinForms/Form1.cs
diff --git a/LibationWinForms/UNTESTED/Form1.resx b/LibationWinForms/Form1.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/Form1.resx
rename to LibationWinForms/Form1.resx
diff --git a/LibationWinForms/UNTESTED/GridEntry.cs b/LibationWinForms/GridEntry.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/GridEntry.cs
rename to LibationWinForms/GridEntry.cs
diff --git a/LibationWinForms/LibationWinForms.csproj b/LibationWinForms/LibationWinForms.csproj
index 22a318b2..eb26895b 100644
--- a/LibationWinForms/LibationWinForms.csproj
+++ b/LibationWinForms/LibationWinForms.csproj
@@ -22,28 +22,28 @@
True
Resources.resx
-
-
+
+
LibationFilesDialog.cs
-
-
+
+
ApprovalNeededDialog.cs
-
-
+
+
ScanAccountsDialog.cs
-
-
+
+
SettingsDialog.cs
-
-
+
+
IndexLibraryDialog.cs
-
-
+
+
SetupDialog.cs
@@ -53,16 +53,16 @@
ResXFileCodeGenerator
Resources.Designer.cs
-
+
LibationFilesDialog.cs
-
+
ScanAccountsDialog.cs
-
+
SettingsDialog.cs
-
+
SetupDialog.cs
diff --git a/LibationWinForms/UNTESTED/ProductsGrid.Designer.cs b/LibationWinForms/ProductsGrid.Designer.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/ProductsGrid.Designer.cs
rename to LibationWinForms/ProductsGrid.Designer.cs
diff --git a/LibationWinForms/UNTESTED/ProductsGrid.cs b/LibationWinForms/ProductsGrid.cs
similarity index 100%
rename from LibationWinForms/UNTESTED/ProductsGrid.cs
rename to LibationWinForms/ProductsGrid.cs
diff --git a/LibationWinForms/UNTESTED/ProductsGrid.resx b/LibationWinForms/ProductsGrid.resx
similarity index 100%
rename from LibationWinForms/UNTESTED/ProductsGrid.resx
rename to LibationWinForms/ProductsGrid.resx
diff --git a/WindowsDesktopUtilities/UNTESTED/WinAudibleImageServer.cs b/WindowsDesktopUtilities/WinAudibleImageServer.cs
similarity index 100%
rename from WindowsDesktopUtilities/UNTESTED/WinAudibleImageServer.cs
rename to WindowsDesktopUtilities/WinAudibleImageServer.cs