diff --git a/ComicRack.Engine/ComicRack.Engine.csproj b/ComicRack.Engine/ComicRack.Engine.csproj
index 123eff2..395310d 100644
--- a/ComicRack.Engine/ComicRack.Engine.csproj
+++ b/ComicRack.Engine/ComicRack.Engine.csproj
@@ -59,272 +59,272 @@
     <Compile Include="BookPageRetrievalCompletedEventArgs.cs" />
     <Compile Include="CacheManager.cs" />
     <Compile Include="ComicBook.cs" />
-    <Compile Include="ComicBookAddedComparer.cs" />
-    <Compile Include="ComicBookAddedMatcher.cs" />
-    <Compile Include="ComicBookAgeRatingComparer.cs" />
-    <Compile Include="ComicBookAgeRatingMatcher.cs" />
-    <Compile Include="ComicBookAllPropertiesMatcher.cs" />
-    <Compile Include="ComicBookAlternateCountComparer.cs" />
-    <Compile Include="ComicBookAlternateCountMatcher.cs" />
-    <Compile Include="ComicBookAlternateNumberComparer.cs" />
-    <Compile Include="ComicBookAlternateNumberMatcher.cs" />
-    <Compile Include="ComicBookAlternateSeriesComparer.cs" />
-    <Compile Include="ComicBookAlternateSeriesMatcher.cs" />
-    <Compile Include="ComicBookBlackAndWhiteComparer.cs" />
-    <Compile Include="ComicBookBlackAndWhiteMatcher.cs" />
-    <Compile Include="ComicBookBookAgeComparer.cs" />
-    <Compile Include="ComicBookBookAgeMatcher.cs" />
-    <Compile Include="ComicBookBookCollectionStatusComparer.cs" />
-    <Compile Include="ComicBookBookCollectionStatusMatcher.cs" />
-    <Compile Include="ComicBookBookConditionComparer.cs" />
-    <Compile Include="ComicBookBookConditionMatcher.cs" />
-    <Compile Include="ComicBookBookLocationComparer.cs" />
-    <Compile Include="ComicBookBookLocationMatcher.cs" />
-    <Compile Include="ComicBookBookmarkCountComparer.cs" />
-    <Compile Include="ComicBookBookmarkCountMatcher.cs" />
-    <Compile Include="ComicBookBookNotesMatcher.cs" />
-    <Compile Include="ComicBookBookOwnerComparer.cs" />
-    <Compile Include="ComicBookBookOwnerMatcher.cs" />
-    <Compile Include="ComicBookBookPriceComparer.cs" />
-    <Compile Include="ComicBookBookPriceMatcher.cs" />
-    <Compile Include="ComicBookBookStoreComparer.cs" />
-    <Compile Include="ComicBookBookStoreMatcher.cs" />
-    <Compile Include="ComicBookCharactersComparer.cs" />
-    <Compile Include="ComicBookCharactersMatcher.cs" />
-    <Compile Include="ComicBookCheckedComparer.cs" />
-    <Compile Include="ComicBookCheckedMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookAddedComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookAddedMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookAgeRatingComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookAgeRatingMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookAllPropertiesMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookAlternateCountComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookAlternateCountMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookAlternateNumberComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookAlternateNumberMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookAlternateSeriesComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookAlternateSeriesMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBlackAndWhiteComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBlackAndWhiteMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBookAgeComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookAgeMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBookCollectionStatusComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookCollectionStatusMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBookConditionComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookConditionMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBookLocationComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookLocationMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBookmarkCountComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookmarkCountMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookNotesMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBookOwnerComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookOwnerMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBookPriceComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookPriceMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookBookStoreComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookBookStoreMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookCharactersComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookCharactersMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookCheckedComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookCheckedMatcher.cs" />
     <Compile Include="ComicBookCollection.cs" />
-    <Compile Include="ComicBookColoristComparer.cs" />
-    <Compile Include="ComicBookColoristMatcher.cs" />
-    <Compile Include="ComicBookCommunityRatingComparer.cs" />
-    <Compile Include="ComicBookCommunityRatingMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookColoristComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookColoristMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookCommunityRatingComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookCommunityRatingMatcher.cs" />
     <Compile Include="ComicBookContainer.cs" />
     <Compile Include="ComicBookContainerUndo.cs" />
-    <Compile Include="ComicBookCountComparer.cs" />
-    <Compile Include="ComicBookCountMatcher.cs" />
-    <Compile Include="ComicBookCoverArtistComparer.cs" />
-    <Compile Include="ComicBookCoverArtistMatcher.cs" />
-    <Compile Include="ComicBookCreationComparer.cs" />
-    <Compile Include="ComicBookCreationMatcher.cs" />
-    <Compile Include="ComicBookCustomValuesMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookCountComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookCountMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookCoverArtistComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookCoverArtistMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookCreationComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookCreationMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookCustomValuesMatcher.cs" />
     <Compile Include="ComicBookDateMatcher.cs" />
-    <Compile Include="ComicBookDayComparer.cs" />
-    <Compile Include="ComicBookDayMatcher.cs" />
-    <Compile Include="ComicBookDirectoryComparer.cs" />
-    <Compile Include="ComicBookDirectoryMatcher.cs" />
-    <Compile Include="ComicBookDublicateComparer.cs" />
-    <Compile Include="ComicBookDuplicateMatcher.cs" />
-    <Compile Include="ComicBookEditorComparer.cs" />
-    <Compile Include="ComicBookEditorMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookDayComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookDayMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookDirectoryComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookDirectoryMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookDublicateComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookDuplicateMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookEditorComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookEditorMatcher.cs" />
     <Compile Include="ComicBookFactory.cs" />
-    <Compile Include="ComicBookFileComparer.cs" />
-    <Compile Include="ComicBookFileFormatComparer.cs" />
-    <Compile Include="ComicBookFileFormatMatcher.cs" />
-    <Compile Include="ComicBookFileMatcher.cs" />
-    <Compile Include="ComicBookFileNameComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookFileComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookFileFormatComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookFileFormatMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookFileMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookFileNameComparer.cs" />
     <Compile Include="ComicBookFileRenameEventArgs.cs" />
-    <Compile Include="ComicBookFileSizeMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookFileSizeMatcher.cs" />
     <Compile Include="ComicBookFilterType.cs" />
-    <Compile Include="ComicBookFormatComparer.cs" />
-    <Compile Include="ComicBookFormatMatcher.cs" />
-    <Compile Include="ComicBookFullPathMatcher.cs" />
-    <Compile Include="ComicBookGenreComparer.cs" />
-    <Compile Include="ComicBookGenreMatcher.cs" />
-    <Compile Include="ComicBookGroupAdded.cs" />
-    <Compile Include="ComicBookGroupAgeRating.cs" />
-    <Compile Include="ComicBookGroupAlternateCount.cs" />
-    <Compile Include="ComicBookGroupAlternateNumber.cs" />
-    <Compile Include="ComicBookGroupAlternateSeries.cs" />
-    <Compile Include="ComicBookGroupBlackAndWhite.cs" />
-    <Compile Include="ComicBookGroupBookAge.cs" />
-    <Compile Include="ComicBookGroupBookCollectionStatus.cs" />
-    <Compile Include="ComicBookGroupBookCondition.cs" />
-    <Compile Include="ComicBookGroupBookLocation.cs" />
-    <Compile Include="ComicBookGroupBookOwner.cs" />
-    <Compile Include="ComicBookGroupBookPrice.cs" />
-    <Compile Include="ComicBookGroupBookStore.cs" />
-    <Compile Include="ComicBookGroupCharacters.cs" />
-    <Compile Include="ComicBookGroupChecked.cs" />
-    <Compile Include="ComicBookGroupColorist.cs" />
-    <Compile Include="ComicBookGroupCommunityRating.cs" />
-    <Compile Include="ComicBookGroupCount.cs" />
-    <Compile Include="ComicBookGroupCoverArtist.cs" />
-    <Compile Include="ComicBookGroupCreation.cs" />
-    <Compile Include="ComicBookGroupDay.cs" />
-    <Compile Include="ComicBookGroupDirectory.cs" />
-    <Compile Include="ComicBookGroupEditor.cs" />
-    <Compile Include="ComicBookGroupEnableProposed.cs" />
-    <Compile Include="ComicBookGroupFileFormat.cs" />
-    <Compile Include="ComicBookGroupFileName.cs" />
-    <Compile Include="ComicBookGroupFormat.cs" />
-    <Compile Include="ComicBookGroupGenre.cs" />
-    <Compile Include="ComicBookGroupHasBeenRead.cs" />
-    <Compile Include="ComicBookGroupImprint.cs" />
-    <Compile Include="ComicBookGroupInker.cs" />
-    <Compile Include="ComicBookGroupLanguage.cs" />
-    <Compile Include="ComicBookGroupLetterer.cs" />
-    <Compile Include="ComicBookGroupLinked.cs" />
-    <Compile Include="ComicBookGroupLocations.cs" />
-    <Compile Include="ComicBookGroupMainCharacterOrTeam.cs" />
-    <Compile Include="ComicBookGroupManga.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookFormatComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookFormatMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookFullPathMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookGenreComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookGenreMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupAdded.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupAgeRating.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupAlternateCount.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupAlternateNumber.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupAlternateSeries.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupBlackAndWhite.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupBookAge.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupBookCollectionStatus.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupBookCondition.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupBookLocation.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupBookOwner.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupBookPrice.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupBookStore.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupCharacters.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupChecked.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupColorist.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupCommunityRating.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupCount.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupCoverArtist.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupCreation.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupDay.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupDirectory.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupEditor.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupEnableProposed.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupFileFormat.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupFileName.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupFormat.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupGenre.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupHasBeenRead.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupImprint.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupInker.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupLanguage.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupLetterer.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupLinked.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupLocations.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupMainCharacterOrTeam.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupManga.cs" />
     <Compile Include="ComicBookGroupMatcher.cs" />
-    <Compile Include="ComicBookGroupModified.cs" />
-    <Compile Include="ComicBookGroupMonth.cs" />
-    <Compile Include="ComicBookGroupNumber.cs" />
-    <Compile Include="ComicBookGroupOpenCount.cs" />
-    <Compile Include="ComicBookGroupOpened.cs" />
-    <Compile Include="ComicBookGroupPages.cs" />
-    <Compile Include="ComicBookGroupPenciller.cs" />
-    <Compile Include="ComicBookGroupPublished.cs" />
-    <Compile Include="ComicBookGroupPublisher.cs" />
-    <Compile Include="ComicBookGroupRating.cs" />
-    <Compile Include="ComicBookGroupRatingBase.cs" />
-    <Compile Include="ComicBookGroupReadPercentage.cs" />
-    <Compile Include="ComicBookGroupReleased.cs" />
-    <Compile Include="ComicBookGroupScanInformation.cs" />
-    <Compile Include="ComicBookGroupSeries.cs" />
-    <Compile Include="ComicBookGroupSeriesComplete.cs" />
-    <Compile Include="ComicBookGroupSeriesGroup.cs" />
-    <Compile Include="ComicBookGroupSize.cs" />
-    <Compile Include="ComicBookGroupStoryArc.cs" />
-    <Compile Include="ComicBookGroupTeams.cs" />
-    <Compile Include="ComicBookGroupTitle.cs" />
-    <Compile Include="ComicBookGroupVolume.cs" />
-    <Compile Include="ComicBookGroupWeb.cs" />
-    <Compile Include="ComicBookGroupWeek.cs" />
-    <Compile Include="ComicBookGroupWriter.cs" />
-    <Compile Include="ComicBookGroupYear.cs" />
-    <Compile Include="ComicBookHasBeenReadComparer.cs" />
-    <Compile Include="ComicBookHasCustomValuesMatcher.cs" />
-    <Compile Include="ComicBookImprintComparer.cs" />
-    <Compile Include="ComicBookImprintMatcher.cs" />
-    <Compile Include="ComicBookInkerComparer.cs" />
-    <Compile Include="ComicBookInkerMatcher.cs" />
-    <Compile Include="ComicBookISBNComparer.cs" />
-    <Compile Include="ComicBookISBNMatcher.cs" />
-    <Compile Include="ComicBookIsLinkedMatcher.cs" />
-    <Compile Include="ComicBookLanguageComparer.cs" />
-    <Compile Include="ComicBookLanguageMatcher.cs" />
-    <Compile Include="ComicBookLettererComparer.cs" />
-    <Compile Include="ComicBookLettererMatcher.cs" />
-    <Compile Include="ComicBookLinkedComparer.cs" />
-    <Compile Include="ComicBookLocationsComparer.cs" />
-    <Compile Include="ComicBookLocationsMatcher.cs" />
-    <Compile Include="ComicBookMainCharacterOrTeamComparer.cs" />
-    <Compile Include="ComicBookMainCharacterOrTeamMatcher.cs" />
-    <Compile Include="ComicBookMangaComparer.cs" />
-    <Compile Include="ComicBookMangaMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupModified.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupMonth.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupNumber.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupOpenCount.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupOpened.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupPages.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupPenciller.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupPublished.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupPublisher.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupRating.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupRatingBase.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupReadPercentage.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupReleased.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupScanInformation.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupSeries.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupSeriesComplete.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupSeriesGroup.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupSize.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupStoryArc.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupTeams.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupTitle.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupVolume.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupWeb.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupWeek.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupWriter.cs" />
+    <Compile Include="Metadata\ComicBook\Group\ComicBookGroupYear.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookHasBeenReadComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookHasCustomValuesMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookImprintComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookImprintMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookInkerComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookInkerMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookISBNComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookISBNMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookIsLinkedMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookLanguageComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookLanguageMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookLettererComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookLettererMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookLinkedComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookLocationsComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookLocationsMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookMainCharacterOrTeamComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookMainCharacterOrTeamMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookMangaComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookMangaMatcher.cs" />
     <Compile Include="ComicBookMatcher.cs" />
     <Compile Include="ComicBookMatcherCollection.cs" />
     <Compile Include="ComicBookMatcherHintAttribute.cs" />
-    <Compile Include="ComicBookModifiedComparer.cs" />
-    <Compile Include="ComicBookModifiedInfoMatcher.cs" />
-    <Compile Include="ComicBookModifiedMatcher.cs" />
-    <Compile Include="ComicBookMonthComparer.cs" />
-    <Compile Include="ComicBookMonthMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookModifiedComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookModifiedInfoMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookModifiedMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookMonthComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookMonthMatcher.cs" />
     <Compile Include="ComicBookNavigator.cs" />
-    <Compile Include="ComicBookNewPagesComparer.cs" />
-    <Compile Include="ComicBookNewPagesMatcher.cs" />
-    <Compile Include="ComicBookNotesMatcher.cs" />
-    <Compile Include="ComicBookNumberComparer.cs" />
-    <Compile Include="ComicBookNumberMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookNewPagesComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookNewPagesMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookNotesMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookNumberComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookNumberMatcher.cs" />
     <Compile Include="ComicBookNumericMatcher.cs" />
-    <Compile Include="ComicBookOpenCountComparer.cs" />
-    <Compile Include="ComicBookOpenedComparer.cs" />
-    <Compile Include="ComicBookOpenedMatcher.cs" />
-    <Compile Include="ComicBookPageCountComparer.cs" />
-    <Compile Include="ComicBookPageCountMatcher.cs" />
-    <Compile Include="ComicBookPencillerComparer.cs" />
-    <Compile Include="ComicBookPencillerMatcher.cs" />
-    <Compile Include="ComicBookPublishedComparer.cs" />
-    <Compile Include="ComicBookPublishedMatcher.cs" />
-    <Compile Include="ComicBookPublisherComparer.cs" />
-    <Compile Include="ComicBookPublisherMatcher.cs" />
-    <Compile Include="ComicBookRatingComparer.cs" />
-    <Compile Include="ComicBookRatingMatcher.cs" />
-    <Compile Include="ComicBookReadPercentageComparer.cs" />
-    <Compile Include="ComicBookReadPercentageMatcher.cs" />
-    <Compile Include="ComicBookReleasedComparer.cs" />
-    <Compile Include="ComicBookReleasedMatcher.cs" />
-    <Compile Include="ComicBookReviewComparer.cs" />
-    <Compile Include="ComicBookReviewMatcher.cs" />
-    <Compile Include="ComicBookScanInformationComparer.cs" />
-    <Compile Include="ComicBookScanInformationMatcher.cs" />
-    <Compile Include="ComicBookSeriesComparer.cs" />
-    <Compile Include="ComicBookSeriesCompleteComparer.cs" />
-    <Compile Include="ComicBookSeriesCompleteMatcher.cs" />
-    <Compile Include="ComicBookSeriesEnableProposedComparer.cs" />
-    <Compile Include="ComicBookSeriesGroupComparer.cs" />
-    <Compile Include="ComicBookSeriesGroupMatcher.cs" />
-    <Compile Include="ComicBookSeriesMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookOpenCountComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookOpenedComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookOpenedMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookPageCountComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookPageCountMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookPencillerComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookPencillerMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookPublishedComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookPublishedMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookPublisherComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookPublisherMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookRatingComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookRatingMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookReadPercentageComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookReadPercentageMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookReleasedComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookReleasedMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookReviewComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookReviewMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookScanInformationComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookScanInformationMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookSeriesComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookSeriesCompleteComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookSeriesCompleteMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookSeriesEnableProposedComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookSeriesGroupComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookSeriesGroupMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookSeriesMatcher.cs" />
     <Compile Include="ComicBookSeriesStatistics.cs" />
-    <Compile Include="ComicBookSeriesStatsAverageCommunityRatingComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsAverageRatingComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsCountComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsGapCountComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsLastAddedTimeComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsLastOpenedTimeComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsLastReleasedTimeComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsMaxNumberComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsMaxYearComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsMinNumberComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsMinYearComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsPageCountComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsPageReadCountComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsReadPercentageComparer.cs" />
-    <Compile Include="ComicBookSeriesStatsRunningTimeYearsComparer.cs" />
-    <Compile Include="ComicBookSizeComparer.cs" />
-    <Compile Include="ComicBookStatsGroupAverageCommunityRating.cs" />
-    <Compile Include="ComicBookStatsGroupAverageRating.cs" />
-    <Compile Include="ComicBookStatsGroupCount.cs" />
-    <Compile Include="ComicBookStatsGroupGapCount.cs" />
-    <Compile Include="ComicBookStatsGroupLastAddedTime.cs" />
-    <Compile Include="ComicBookStatsGroupLastOpenedTime.cs" />
-    <Compile Include="ComicBookStatsGroupLastReleasedTime.cs" />
-    <Compile Include="ComicBookStatsGroupMaxYear.cs" />
-    <Compile Include="ComicBookStatsGroupMinYear.cs" />
-    <Compile Include="ComicBookStatsGroupPageCount.cs" />
-    <Compile Include="ComicBookStatsGroupPageReadCount.cs" />
-    <Compile Include="ComicBookStatsGroupReadPercentage.cs" />
-    <Compile Include="ComicBookStatsGroupRunningTimeYears.cs" />
-    <Compile Include="ComicBookStatusComparer.cs" />
-    <Compile Include="ComicBookStoryArcComparer.cs" />
-    <Compile Include="ComicBookStoryArcMatcher.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsAverageCommunityRatingComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsAverageRatingComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsCountComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsGapCountComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsLastAddedTimeComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsLastOpenedTimeComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsLastReleasedTimeComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsMaxNumberComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsMaxYearComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsMinNumberComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsMinYearComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsPageCountComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsPageReadCountComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsReadPercentageComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Comparer\ComicBookSeriesStatsRunningTimeYearsComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookSizeComparer.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupAverageCommunityRating.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupAverageRating.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupCount.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupGapCount.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupLastAddedTime.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupLastOpenedTime.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupLastReleasedTime.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupMaxYear.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupMinYear.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupPageCount.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupPageReadCount.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupReadPercentage.cs" />
+    <Compile Include="Metadata\ComicBookStats\Group\ComicBookStatsGroupRunningTimeYears.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookStatusComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookStoryArcComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookStoryArcMatcher.cs" />
     <Compile Include="ComicBookStringGrouper.cs" />
     <Compile Include="ComicBookStringMatcher.cs" />
-    <Compile Include="ComicBookSummaryMatcher.cs" />
-    <Compile Include="ComicBookTagsComparer.cs" />
-    <Compile Include="ComicBookTagsMatcher.cs" />
-    <Compile Include="ComicBookTeamsComparer.cs" />
-    <Compile Include="ComicBookTeamsMatcher.cs" />
-    <Compile Include="ComicBookTitleComparer.cs" />
-    <Compile Include="ComicBookTitleMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookSummaryMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookTagsComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookTagsMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookTeamsComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookTeamsMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookTitleComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookTitleMatcher.cs" />
     <Compile Include="ComicBookValueMatcher.cs" />
-    <Compile Include="ComicBookVolumeComparer.cs" />
-    <Compile Include="ComicBookVolumeMatcher.cs" />
-    <Compile Include="ComicBookWebComparer.cs" />
-    <Compile Include="ComicBookWeekComparer.cs" />
-    <Compile Include="ComicBookWeekMatcher.cs" />
-    <Compile Include="ComicBookWriterComparer.cs" />
-    <Compile Include="ComicBookWriterMatcher.cs" />
-    <Compile Include="ComicBookYearComparer.cs" />
-    <Compile Include="ComicBookYearMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookVolumeComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookVolumeMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookWebComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookWeekComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookWeekMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookWriterComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookWriterMatcher.cs" />
+    <Compile Include="Metadata\ComicBook\Comparer\ComicBookYearComparer.cs" />
+    <Compile Include="Metadata\ComicBook\Matcher\ComicBookYearMatcher.cs" />
     <Compile Include="ComicBookYesNoMatcher.cs" />
     <Compile Include="ComicDateFormat.cs" />
     <Compile Include="ComicInfo.cs" />
     <Compile Include="ComicNameInfo.cs" />
-    <Compile Include="ComicPageBookmarkComparer.cs" />
+    <Compile Include="Metadata\ComicPageInfo\Comparer\ComicPageBookmarkComparer.cs" />
     <Compile Include="ComicPageInfo.cs" />
     <Compile Include="ComicPageInfoCollection.cs" />
     <Compile Include="ComicPageInfoConverter.cs" />
     <Compile Include="ComicPageInfoGroupImageSize.cs" />
-    <Compile Include="ComicPageInfoImageHeightComparer.cs" />
-    <Compile Include="ComicPageInfoImageSizeComparer.cs" />
-    <Compile Include="ComicPageInfoImageWidthComparer.cs" />
-    <Compile Include="ComicPageInfoTypeComparer.cs" />
+    <Compile Include="Metadata\ComicPageInfo\Comparer\ComicPageInfoImageHeightComparer.cs" />
+    <Compile Include="Metadata\ComicPageInfo\Comparer\ComicPageInfoImageSizeComparer.cs" />
+    <Compile Include="Metadata\ComicPageInfo\Comparer\ComicPageInfoImageWidthComparer.cs" />
+    <Compile Include="Metadata\ComicPageInfo\Comparer\ComicPageInfoTypeComparer.cs" />
     <Compile Include="ComicPagePosition.cs" />
-    <Compile Include="ComicPagePositionComparer.cs" />
-    <Compile Include="ComicPageRotationComparer.cs" />
+    <Compile Include="Metadata\ComicPageInfo\Comparer\ComicPagePositionComparer.cs" />
+    <Compile Include="Metadata\ComicPageInfo\Comparer\ComicPageRotationComparer.cs" />
     <Compile Include="ComicPageType.cs" />
     <Compile Include="ComicScanner.cs" />
     <Compile Include="ComicScanNotifyEventArgs.cs" />
@@ -651,6 +651,7 @@
   <ItemGroup>
     <Content Include="DLL\sharpPDF.dll" />
   </ItemGroup>
+  <ItemGroup />
   <!-- <ItemGroup> -->
   <!-- <EmbeddedResource Include="Controls\ComicPageContainerControl.resources" /> -->
   <!-- <EmbeddedResource Include="Controls\MagnifySetupControl.resources" /> -->
diff --git a/ComicRack.Engine/ComicBookAddedComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAddedComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAddedComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAddedComparer.cs
diff --git a/ComicRack.Engine/ComicBookAgeRatingComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAgeRatingComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAgeRatingComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAgeRatingComparer.cs
diff --git a/ComicRack.Engine/ComicBookAlternateCountComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAlternateCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAlternateCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAlternateCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookAlternateNumberComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAlternateNumberComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAlternateNumberComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAlternateNumberComparer.cs
diff --git a/ComicRack.Engine/ComicBookAlternateSeriesComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAlternateSeriesComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAlternateSeriesComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookAlternateSeriesComparer.cs
diff --git a/ComicRack.Engine/ComicBookBlackAndWhiteComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBlackAndWhiteComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBlackAndWhiteComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBlackAndWhiteComparer.cs
diff --git a/ComicRack.Engine/ComicBookBookAgeComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookAgeComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookAgeComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookAgeComparer.cs
diff --git a/ComicRack.Engine/ComicBookBookCollectionStatusComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookCollectionStatusComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookCollectionStatusComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookCollectionStatusComparer.cs
diff --git a/ComicRack.Engine/ComicBookBookConditionComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookConditionComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookConditionComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookConditionComparer.cs
diff --git a/ComicRack.Engine/ComicBookBookLocationComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookLocationComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookLocationComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookLocationComparer.cs
diff --git a/ComicRack.Engine/ComicBookBookOwnerComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookOwnerComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookOwnerComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookOwnerComparer.cs
diff --git a/ComicRack.Engine/ComicBookBookPriceComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookPriceComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookPriceComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookPriceComparer.cs
diff --git a/ComicRack.Engine/ComicBookBookStoreComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookStoreComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookStoreComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookStoreComparer.cs
diff --git a/ComicRack.Engine/ComicBookBookmarkCountComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookmarkCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookmarkCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookBookmarkCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookCharactersComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCharactersComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCharactersComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCharactersComparer.cs
diff --git a/ComicRack.Engine/ComicBookCheckedComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCheckedComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCheckedComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCheckedComparer.cs
diff --git a/ComicRack.Engine/ComicBookColoristComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookColoristComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookColoristComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookColoristComparer.cs
diff --git a/ComicRack.Engine/ComicBookCommunityRatingComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCommunityRatingComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCommunityRatingComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCommunityRatingComparer.cs
diff --git a/ComicRack.Engine/ComicBookCountComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookCoverArtistComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCoverArtistComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCoverArtistComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCoverArtistComparer.cs
diff --git a/ComicRack.Engine/ComicBookCreationComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCreationComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCreationComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookCreationComparer.cs
diff --git a/ComicRack.Engine/ComicBookDayComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookDayComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookDayComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookDayComparer.cs
diff --git a/ComicRack.Engine/ComicBookDirectoryComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookDirectoryComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookDirectoryComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookDirectoryComparer.cs
diff --git a/ComicRack.Engine/ComicBookDublicateComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookDublicateComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookDublicateComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookDublicateComparer.cs
diff --git a/ComicRack.Engine/ComicBookEditorComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookEditorComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookEditorComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookEditorComparer.cs
diff --git a/ComicRack.Engine/ComicBookFileComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookFileComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFileComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookFileComparer.cs
diff --git a/ComicRack.Engine/ComicBookFileFormatComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookFileFormatComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFileFormatComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookFileFormatComparer.cs
diff --git a/ComicRack.Engine/ComicBookFileNameComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookFileNameComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFileNameComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookFileNameComparer.cs
diff --git a/ComicRack.Engine/ComicBookFormatComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookFormatComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFormatComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookFormatComparer.cs
diff --git a/ComicRack.Engine/ComicBookGenreComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookGenreComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGenreComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookGenreComparer.cs
diff --git a/ComicRack.Engine/ComicBookHasBeenReadComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookHasBeenReadComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookHasBeenReadComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookHasBeenReadComparer.cs
diff --git a/ComicRack.Engine/ComicBookISBNComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookISBNComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookISBNComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookISBNComparer.cs
diff --git a/ComicRack.Engine/ComicBookImprintComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookImprintComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookImprintComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookImprintComparer.cs
diff --git a/ComicRack.Engine/ComicBookInkerComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookInkerComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookInkerComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookInkerComparer.cs
diff --git a/ComicRack.Engine/ComicBookLanguageComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookLanguageComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookLanguageComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookLanguageComparer.cs
diff --git a/ComicRack.Engine/ComicBookLettererComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookLettererComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookLettererComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookLettererComparer.cs
diff --git a/ComicRack.Engine/ComicBookLinkedComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookLinkedComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookLinkedComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookLinkedComparer.cs
diff --git a/ComicRack.Engine/ComicBookLocationsComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookLocationsComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookLocationsComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookLocationsComparer.cs
diff --git a/ComicRack.Engine/ComicBookMainCharacterOrTeamComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookMainCharacterOrTeamComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookMainCharacterOrTeamComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookMainCharacterOrTeamComparer.cs
diff --git a/ComicRack.Engine/ComicBookMangaComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookMangaComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookMangaComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookMangaComparer.cs
diff --git a/ComicRack.Engine/ComicBookModifiedComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookModifiedComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookModifiedComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookModifiedComparer.cs
diff --git a/ComicRack.Engine/ComicBookMonthComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookMonthComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookMonthComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookMonthComparer.cs
diff --git a/ComicRack.Engine/ComicBookNewPagesComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookNewPagesComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookNewPagesComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookNewPagesComparer.cs
diff --git a/ComicRack.Engine/ComicBookNumberComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookNumberComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookNumberComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookNumberComparer.cs
diff --git a/ComicRack.Engine/ComicBookOpenCountComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookOpenCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookOpenCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookOpenCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookOpenedComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookOpenedComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookOpenedComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookOpenedComparer.cs
diff --git a/ComicRack.Engine/ComicBookPageCountComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookPageCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookPageCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookPageCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookPencillerComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookPencillerComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookPencillerComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookPencillerComparer.cs
diff --git a/ComicRack.Engine/ComicBookPublishedComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookPublishedComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookPublishedComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookPublishedComparer.cs
diff --git a/ComicRack.Engine/ComicBookPublisherComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookPublisherComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookPublisherComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookPublisherComparer.cs
diff --git a/ComicRack.Engine/ComicBookRatingComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookRatingComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookRatingComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookRatingComparer.cs
diff --git a/ComicRack.Engine/ComicBookReadPercentageComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookReadPercentageComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookReadPercentageComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookReadPercentageComparer.cs
diff --git a/ComicRack.Engine/ComicBookReleasedComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookReleasedComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookReleasedComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookReleasedComparer.cs
diff --git a/ComicRack.Engine/ComicBookReviewComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookReviewComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookReviewComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookReviewComparer.cs
diff --git a/ComicRack.Engine/ComicBookScanInformationComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookScanInformationComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookScanInformationComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookScanInformationComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSeriesComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSeriesComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesCompleteComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSeriesCompleteComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesCompleteComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSeriesCompleteComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesEnableProposedComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSeriesEnableProposedComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesEnableProposedComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSeriesEnableProposedComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesGroupComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSeriesGroupComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesGroupComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSeriesGroupComparer.cs
diff --git a/ComicRack.Engine/ComicBookSizeComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSizeComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSizeComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookSizeComparer.cs
diff --git a/ComicRack.Engine/ComicBookStatusComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookStatusComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatusComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookStatusComparer.cs
diff --git a/ComicRack.Engine/ComicBookStoryArcComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookStoryArcComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStoryArcComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookStoryArcComparer.cs
diff --git a/ComicRack.Engine/ComicBookTagsComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookTagsComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookTagsComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookTagsComparer.cs
diff --git a/ComicRack.Engine/ComicBookTeamsComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookTeamsComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookTeamsComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookTeamsComparer.cs
diff --git a/ComicRack.Engine/ComicBookTitleComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookTitleComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookTitleComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookTitleComparer.cs
diff --git a/ComicRack.Engine/ComicBookVolumeComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookVolumeComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookVolumeComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookVolumeComparer.cs
diff --git a/ComicRack.Engine/ComicBookWebComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookWebComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookWebComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookWebComparer.cs
diff --git a/ComicRack.Engine/ComicBookWeekComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookWeekComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookWeekComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookWeekComparer.cs
diff --git a/ComicRack.Engine/ComicBookWriterComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookWriterComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookWriterComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookWriterComparer.cs
diff --git a/ComicRack.Engine/ComicBookYearComparer.cs b/ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookYearComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookYearComparer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Comparer/ComicBookYearComparer.cs
diff --git a/ComicRack.Engine/ComicBookGroupAdded.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAdded.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupAdded.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAdded.cs
diff --git a/ComicRack.Engine/ComicBookGroupAgeRating.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAgeRating.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupAgeRating.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAgeRating.cs
diff --git a/ComicRack.Engine/ComicBookGroupAlternateCount.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAlternateCount.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupAlternateCount.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAlternateCount.cs
diff --git a/ComicRack.Engine/ComicBookGroupAlternateNumber.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAlternateNumber.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupAlternateNumber.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAlternateNumber.cs
diff --git a/ComicRack.Engine/ComicBookGroupAlternateSeries.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAlternateSeries.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupAlternateSeries.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupAlternateSeries.cs
diff --git a/ComicRack.Engine/ComicBookGroupBlackAndWhite.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBlackAndWhite.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupBlackAndWhite.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBlackAndWhite.cs
diff --git a/ComicRack.Engine/ComicBookGroupBookAge.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookAge.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupBookAge.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookAge.cs
diff --git a/ComicRack.Engine/ComicBookGroupBookCollectionStatus.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookCollectionStatus.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupBookCollectionStatus.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookCollectionStatus.cs
diff --git a/ComicRack.Engine/ComicBookGroupBookCondition.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookCondition.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupBookCondition.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookCondition.cs
diff --git a/ComicRack.Engine/ComicBookGroupBookLocation.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookLocation.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupBookLocation.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookLocation.cs
diff --git a/ComicRack.Engine/ComicBookGroupBookOwner.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookOwner.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupBookOwner.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookOwner.cs
diff --git a/ComicRack.Engine/ComicBookGroupBookPrice.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookPrice.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupBookPrice.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookPrice.cs
diff --git a/ComicRack.Engine/ComicBookGroupBookStore.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookStore.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupBookStore.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupBookStore.cs
diff --git a/ComicRack.Engine/ComicBookGroupCharacters.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCharacters.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupCharacters.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCharacters.cs
diff --git a/ComicRack.Engine/ComicBookGroupChecked.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupChecked.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupChecked.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupChecked.cs
diff --git a/ComicRack.Engine/ComicBookGroupColorist.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupColorist.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupColorist.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupColorist.cs
diff --git a/ComicRack.Engine/ComicBookGroupCommunityRating.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCommunityRating.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupCommunityRating.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCommunityRating.cs
diff --git a/ComicRack.Engine/ComicBookGroupCount.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCount.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupCount.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCount.cs
diff --git a/ComicRack.Engine/ComicBookGroupCoverArtist.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCoverArtist.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupCoverArtist.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCoverArtist.cs
diff --git a/ComicRack.Engine/ComicBookGroupCreation.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCreation.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupCreation.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupCreation.cs
diff --git a/ComicRack.Engine/ComicBookGroupDay.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupDay.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupDay.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupDay.cs
diff --git a/ComicRack.Engine/ComicBookGroupDirectory.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupDirectory.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupDirectory.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupDirectory.cs
diff --git a/ComicRack.Engine/ComicBookGroupEditor.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupEditor.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupEditor.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupEditor.cs
diff --git a/ComicRack.Engine/ComicBookGroupEnableProposed.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupEnableProposed.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupEnableProposed.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupEnableProposed.cs
diff --git a/ComicRack.Engine/ComicBookGroupFileFormat.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupFileFormat.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupFileFormat.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupFileFormat.cs
diff --git a/ComicRack.Engine/ComicBookGroupFileName.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupFileName.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupFileName.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupFileName.cs
diff --git a/ComicRack.Engine/ComicBookGroupFormat.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupFormat.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupFormat.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupFormat.cs
diff --git a/ComicRack.Engine/ComicBookGroupGenre.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupGenre.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupGenre.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupGenre.cs
diff --git a/ComicRack.Engine/ComicBookGroupHasBeenRead.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupHasBeenRead.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupHasBeenRead.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupHasBeenRead.cs
diff --git a/ComicRack.Engine/ComicBookGroupImprint.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupImprint.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupImprint.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupImprint.cs
diff --git a/ComicRack.Engine/ComicBookGroupInker.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupInker.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupInker.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupInker.cs
diff --git a/ComicRack.Engine/ComicBookGroupLanguage.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupLanguage.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupLanguage.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupLanguage.cs
diff --git a/ComicRack.Engine/ComicBookGroupLetterer.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupLetterer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupLetterer.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupLetterer.cs
diff --git a/ComicRack.Engine/ComicBookGroupLinked.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupLinked.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupLinked.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupLinked.cs
diff --git a/ComicRack.Engine/ComicBookGroupLocations.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupLocations.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupLocations.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupLocations.cs
diff --git a/ComicRack.Engine/ComicBookGroupMainCharacterOrTeam.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupMainCharacterOrTeam.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupMainCharacterOrTeam.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupMainCharacterOrTeam.cs
diff --git a/ComicRack.Engine/ComicBookGroupManga.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupManga.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupManga.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupManga.cs
diff --git a/ComicRack.Engine/ComicBookGroupModified.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupModified.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupModified.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupModified.cs
diff --git a/ComicRack.Engine/ComicBookGroupMonth.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupMonth.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupMonth.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupMonth.cs
diff --git a/ComicRack.Engine/ComicBookGroupNumber.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupNumber.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupNumber.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupNumber.cs
diff --git a/ComicRack.Engine/ComicBookGroupOpenCount.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupOpenCount.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupOpenCount.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupOpenCount.cs
diff --git a/ComicRack.Engine/ComicBookGroupOpened.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupOpened.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupOpened.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupOpened.cs
diff --git a/ComicRack.Engine/ComicBookGroupPages.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupPages.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupPages.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupPages.cs
diff --git a/ComicRack.Engine/ComicBookGroupPenciller.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupPenciller.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupPenciller.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupPenciller.cs
diff --git a/ComicRack.Engine/ComicBookGroupPublished.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupPublished.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupPublished.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupPublished.cs
diff --git a/ComicRack.Engine/ComicBookGroupPublisher.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupPublisher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupPublisher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupPublisher.cs
diff --git a/ComicRack.Engine/ComicBookGroupRating.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupRating.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupRating.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupRating.cs
diff --git a/ComicRack.Engine/ComicBookGroupRatingBase.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupRatingBase.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupRatingBase.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupRatingBase.cs
diff --git a/ComicRack.Engine/ComicBookGroupReadPercentage.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupReadPercentage.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupReadPercentage.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupReadPercentage.cs
diff --git a/ComicRack.Engine/ComicBookGroupReleased.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupReleased.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupReleased.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupReleased.cs
diff --git a/ComicRack.Engine/ComicBookGroupScanInformation.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupScanInformation.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupScanInformation.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupScanInformation.cs
diff --git a/ComicRack.Engine/ComicBookGroupSeries.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupSeries.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupSeries.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupSeries.cs
diff --git a/ComicRack.Engine/ComicBookGroupSeriesComplete.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupSeriesComplete.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupSeriesComplete.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupSeriesComplete.cs
diff --git a/ComicRack.Engine/ComicBookGroupSeriesGroup.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupSeriesGroup.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupSeriesGroup.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupSeriesGroup.cs
diff --git a/ComicRack.Engine/ComicBookGroupSize.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupSize.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupSize.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupSize.cs
diff --git a/ComicRack.Engine/ComicBookGroupStoryArc.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupStoryArc.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupStoryArc.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupStoryArc.cs
diff --git a/ComicRack.Engine/ComicBookGroupTeams.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupTeams.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupTeams.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupTeams.cs
diff --git a/ComicRack.Engine/ComicBookGroupTitle.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupTitle.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupTitle.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupTitle.cs
diff --git a/ComicRack.Engine/ComicBookGroupVolume.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupVolume.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupVolume.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupVolume.cs
diff --git a/ComicRack.Engine/ComicBookGroupWeb.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupWeb.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupWeb.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupWeb.cs
diff --git a/ComicRack.Engine/ComicBookGroupWeek.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupWeek.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupWeek.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupWeek.cs
diff --git a/ComicRack.Engine/ComicBookGroupWriter.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupWriter.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupWriter.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupWriter.cs
diff --git a/ComicRack.Engine/ComicBookGroupYear.cs b/ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupYear.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGroupYear.cs
rename to ComicRack.Engine/Metadata/ComicBook/Group/ComicBookGroupYear.cs
diff --git a/ComicRack.Engine/ComicBookAddedMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAddedMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAddedMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAddedMatcher.cs
diff --git a/ComicRack.Engine/ComicBookAgeRatingMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAgeRatingMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAgeRatingMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAgeRatingMatcher.cs
diff --git a/ComicRack.Engine/ComicBookAllPropertiesMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAllPropertiesMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAllPropertiesMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAllPropertiesMatcher.cs
diff --git a/ComicRack.Engine/ComicBookAlternateCountMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAlternateCountMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAlternateCountMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAlternateCountMatcher.cs
diff --git a/ComicRack.Engine/ComicBookAlternateNumberMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAlternateNumberMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAlternateNumberMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAlternateNumberMatcher.cs
diff --git a/ComicRack.Engine/ComicBookAlternateSeriesMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAlternateSeriesMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookAlternateSeriesMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookAlternateSeriesMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBlackAndWhiteMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBlackAndWhiteMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBlackAndWhiteMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBlackAndWhiteMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookAgeMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookAgeMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookAgeMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookAgeMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookCollectionStatusMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookCollectionStatusMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookCollectionStatusMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookCollectionStatusMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookConditionMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookConditionMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookConditionMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookConditionMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookLocationMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookLocationMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookLocationMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookLocationMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookNotesMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookNotesMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookNotesMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookNotesMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookOwnerMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookOwnerMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookOwnerMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookOwnerMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookPriceMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookPriceMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookPriceMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookPriceMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookStoreMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookStoreMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookStoreMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookStoreMatcher.cs
diff --git a/ComicRack.Engine/ComicBookBookmarkCountMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookmarkCountMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookBookmarkCountMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookBookmarkCountMatcher.cs
diff --git a/ComicRack.Engine/ComicBookCharactersMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCharactersMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCharactersMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCharactersMatcher.cs
diff --git a/ComicRack.Engine/ComicBookCheckedMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCheckedMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCheckedMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCheckedMatcher.cs
diff --git a/ComicRack.Engine/ComicBookColoristMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookColoristMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookColoristMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookColoristMatcher.cs
diff --git a/ComicRack.Engine/ComicBookCommunityRatingMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCommunityRatingMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCommunityRatingMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCommunityRatingMatcher.cs
diff --git a/ComicRack.Engine/ComicBookCountMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCountMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCountMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCountMatcher.cs
diff --git a/ComicRack.Engine/ComicBookCoverArtistMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCoverArtistMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCoverArtistMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCoverArtistMatcher.cs
diff --git a/ComicRack.Engine/ComicBookCreationMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCreationMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCreationMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCreationMatcher.cs
diff --git a/ComicRack.Engine/ComicBookCustomValuesMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCustomValuesMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookCustomValuesMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookCustomValuesMatcher.cs
diff --git a/ComicRack.Engine/ComicBookDayMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookDayMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookDayMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookDayMatcher.cs
diff --git a/ComicRack.Engine/ComicBookDirectoryMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookDirectoryMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookDirectoryMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookDirectoryMatcher.cs
diff --git a/ComicRack.Engine/ComicBookDuplicateMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookDuplicateMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookDuplicateMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookDuplicateMatcher.cs
diff --git a/ComicRack.Engine/ComicBookEditorMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookEditorMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookEditorMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookEditorMatcher.cs
diff --git a/ComicRack.Engine/ComicBookFileFormatMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFileFormatMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFileFormatMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFileFormatMatcher.cs
diff --git a/ComicRack.Engine/ComicBookFileMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFileMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFileMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFileMatcher.cs
diff --git a/ComicRack.Engine/ComicBookFileSizeMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFileSizeMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFileSizeMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFileSizeMatcher.cs
diff --git a/ComicRack.Engine/ComicBookFormatMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFormatMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFormatMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFormatMatcher.cs
diff --git a/ComicRack.Engine/ComicBookFullPathMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFullPathMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookFullPathMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookFullPathMatcher.cs
diff --git a/ComicRack.Engine/ComicBookGenreMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookGenreMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookGenreMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookGenreMatcher.cs
diff --git a/ComicRack.Engine/ComicBookHasCustomValuesMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookHasCustomValuesMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookHasCustomValuesMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookHasCustomValuesMatcher.cs
diff --git a/ComicRack.Engine/ComicBookISBNMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookISBNMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookISBNMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookISBNMatcher.cs
diff --git a/ComicRack.Engine/ComicBookImprintMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookImprintMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookImprintMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookImprintMatcher.cs
diff --git a/ComicRack.Engine/ComicBookInkerMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookInkerMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookInkerMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookInkerMatcher.cs
diff --git a/ComicRack.Engine/ComicBookIsLinkedMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookIsLinkedMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookIsLinkedMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookIsLinkedMatcher.cs
diff --git a/ComicRack.Engine/ComicBookLanguageMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookLanguageMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookLanguageMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookLanguageMatcher.cs
diff --git a/ComicRack.Engine/ComicBookLettererMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookLettererMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookLettererMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookLettererMatcher.cs
diff --git a/ComicRack.Engine/ComicBookLocationsMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookLocationsMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookLocationsMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookLocationsMatcher.cs
diff --git a/ComicRack.Engine/ComicBookMainCharacterOrTeamMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookMainCharacterOrTeamMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookMainCharacterOrTeamMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookMainCharacterOrTeamMatcher.cs
diff --git a/ComicRack.Engine/ComicBookMangaMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookMangaMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookMangaMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookMangaMatcher.cs
diff --git a/ComicRack.Engine/ComicBookModifiedInfoMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookModifiedInfoMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookModifiedInfoMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookModifiedInfoMatcher.cs
diff --git a/ComicRack.Engine/ComicBookModifiedMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookModifiedMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookModifiedMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookModifiedMatcher.cs
diff --git a/ComicRack.Engine/ComicBookMonthMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookMonthMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookMonthMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookMonthMatcher.cs
diff --git a/ComicRack.Engine/ComicBookNewPagesMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookNewPagesMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookNewPagesMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookNewPagesMatcher.cs
diff --git a/ComicRack.Engine/ComicBookNotesMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookNotesMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookNotesMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookNotesMatcher.cs
diff --git a/ComicRack.Engine/ComicBookNumberMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookNumberMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookNumberMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookNumberMatcher.cs
diff --git a/ComicRack.Engine/ComicBookOpenedMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookOpenedMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookOpenedMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookOpenedMatcher.cs
diff --git a/ComicRack.Engine/ComicBookPageCountMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookPageCountMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookPageCountMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookPageCountMatcher.cs
diff --git a/ComicRack.Engine/ComicBookPencillerMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookPencillerMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookPencillerMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookPencillerMatcher.cs
diff --git a/ComicRack.Engine/ComicBookPublishedMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookPublishedMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookPublishedMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookPublishedMatcher.cs
diff --git a/ComicRack.Engine/ComicBookPublisherMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookPublisherMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookPublisherMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookPublisherMatcher.cs
diff --git a/ComicRack.Engine/ComicBookRatingMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookRatingMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookRatingMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookRatingMatcher.cs
diff --git a/ComicRack.Engine/ComicBookReadPercentageMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookReadPercentageMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookReadPercentageMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookReadPercentageMatcher.cs
diff --git a/ComicRack.Engine/ComicBookReleasedMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookReleasedMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookReleasedMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookReleasedMatcher.cs
diff --git a/ComicRack.Engine/ComicBookReviewMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookReviewMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookReviewMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookReviewMatcher.cs
diff --git a/ComicRack.Engine/ComicBookScanInformationMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookScanInformationMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookScanInformationMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookScanInformationMatcher.cs
diff --git a/ComicRack.Engine/ComicBookSeriesCompleteMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookSeriesCompleteMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesCompleteMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookSeriesCompleteMatcher.cs
diff --git a/ComicRack.Engine/ComicBookSeriesGroupMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookSeriesGroupMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesGroupMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookSeriesGroupMatcher.cs
diff --git a/ComicRack.Engine/ComicBookSeriesMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookSeriesMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookSeriesMatcher.cs
diff --git a/ComicRack.Engine/ComicBookStoryArcMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookStoryArcMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStoryArcMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookStoryArcMatcher.cs
diff --git a/ComicRack.Engine/ComicBookSummaryMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookSummaryMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSummaryMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookSummaryMatcher.cs
diff --git a/ComicRack.Engine/ComicBookTagsMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookTagsMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookTagsMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookTagsMatcher.cs
diff --git a/ComicRack.Engine/ComicBookTeamsMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookTeamsMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookTeamsMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookTeamsMatcher.cs
diff --git a/ComicRack.Engine/ComicBookTitleMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookTitleMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookTitleMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookTitleMatcher.cs
diff --git a/ComicRack.Engine/ComicBookVolumeMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookVolumeMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookVolumeMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookVolumeMatcher.cs
diff --git a/ComicRack.Engine/ComicBookWeekMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookWeekMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookWeekMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookWeekMatcher.cs
diff --git a/ComicRack.Engine/ComicBookWriterMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookWriterMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookWriterMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookWriterMatcher.cs
diff --git a/ComicRack.Engine/ComicBookYearMatcher.cs b/ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookYearMatcher.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookYearMatcher.cs
rename to ComicRack.Engine/Metadata/ComicBook/Matcher/ComicBookYearMatcher.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsAverageCommunityRatingComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsAverageCommunityRatingComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsAverageCommunityRatingComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsAverageCommunityRatingComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsAverageRatingComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsAverageRatingComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsAverageRatingComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsAverageRatingComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsCountComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsGapCountComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsGapCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsGapCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsGapCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsLastAddedTimeComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsLastAddedTimeComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsLastAddedTimeComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsLastAddedTimeComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsLastOpenedTimeComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsLastOpenedTimeComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsLastOpenedTimeComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsLastOpenedTimeComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsLastReleasedTimeComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsLastReleasedTimeComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsLastReleasedTimeComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsLastReleasedTimeComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsMaxNumberComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsMaxNumberComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsMaxNumberComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsMaxNumberComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsMaxYearComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsMaxYearComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsMaxYearComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsMaxYearComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsMinNumberComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsMinNumberComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsMinNumberComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsMinNumberComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsMinYearComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsMinYearComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsMinYearComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsMinYearComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsPageCountComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsPageCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsPageCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsPageCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsPageReadCountComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsPageReadCountComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsPageReadCountComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsPageReadCountComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsReadPercentageComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsReadPercentageComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsReadPercentageComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsReadPercentageComparer.cs
diff --git a/ComicRack.Engine/ComicBookSeriesStatsRunningTimeYearsComparer.cs b/ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsRunningTimeYearsComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookSeriesStatsRunningTimeYearsComparer.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Comparer/ComicBookSeriesStatsRunningTimeYearsComparer.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupAverageCommunityRating.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupAverageCommunityRating.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupAverageCommunityRating.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupAverageCommunityRating.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupAverageRating.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupAverageRating.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupAverageRating.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupAverageRating.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupCount.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupCount.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupCount.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupCount.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupGapCount.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupGapCount.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupGapCount.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupGapCount.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupLastAddedTime.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupLastAddedTime.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupLastAddedTime.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupLastAddedTime.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupLastOpenedTime.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupLastOpenedTime.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupLastOpenedTime.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupLastOpenedTime.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupLastReleasedTime.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupLastReleasedTime.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupLastReleasedTime.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupLastReleasedTime.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupMaxYear.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupMaxYear.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupMaxYear.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupMaxYear.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupMinYear.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupMinYear.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupMinYear.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupMinYear.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupPageCount.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupPageCount.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupPageCount.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupPageCount.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupPageReadCount.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupPageReadCount.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupPageReadCount.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupPageReadCount.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupReadPercentage.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupReadPercentage.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupReadPercentage.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupReadPercentage.cs
diff --git a/ComicRack.Engine/ComicBookStatsGroupRunningTimeYears.cs b/ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupRunningTimeYears.cs
similarity index 100%
rename from ComicRack.Engine/ComicBookStatsGroupRunningTimeYears.cs
rename to ComicRack.Engine/Metadata/ComicBookStats/Group/ComicBookStatsGroupRunningTimeYears.cs
diff --git a/ComicRack.Engine/ComicPageBookmarkComparer.cs b/ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageBookmarkComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicPageBookmarkComparer.cs
rename to ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageBookmarkComparer.cs
diff --git a/ComicRack.Engine/ComicPageInfoImageHeightComparer.cs b/ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageInfoImageHeightComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicPageInfoImageHeightComparer.cs
rename to ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageInfoImageHeightComparer.cs
diff --git a/ComicRack.Engine/ComicPageInfoImageSizeComparer.cs b/ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageInfoImageSizeComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicPageInfoImageSizeComparer.cs
rename to ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageInfoImageSizeComparer.cs
diff --git a/ComicRack.Engine/ComicPageInfoImageWidthComparer.cs b/ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageInfoImageWidthComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicPageInfoImageWidthComparer.cs
rename to ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageInfoImageWidthComparer.cs
diff --git a/ComicRack.Engine/ComicPageInfoTypeComparer.cs b/ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageInfoTypeComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicPageInfoTypeComparer.cs
rename to ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageInfoTypeComparer.cs
diff --git a/ComicRack.Engine/ComicPagePositionComparer.cs b/ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPagePositionComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicPagePositionComparer.cs
rename to ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPagePositionComparer.cs
diff --git a/ComicRack.Engine/ComicPageRotationComparer.cs b/ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageRotationComparer.cs
similarity index 100%
rename from ComicRack.Engine/ComicPageRotationComparer.cs
rename to ComicRack.Engine/Metadata/ComicPageInfo/Comparer/ComicPageRotationComparer.cs