Applied new _components layout structure to Kavita. All except manga as there is an open PR that drastically changes that module. (#1666)

UI/Web/src/app/_models/auth/member.ts

@@ -1,5 +1,5 @@
-import { AgeRestriction } from './age-restriction';
-import { Library } from './library';
+import { AgeRestriction } from '../metadata/age-restriction';
+import { Library } from '../library';
 
 export interface Member {
     id: number;

UI/Web/src/app/_models/chapter.ts

@@ -1,4 +1,4 @@
-import { HourEstimateRange } from './hour-estimate-range';
+import { HourEstimateRange } from './series-detail/hour-estimate-range';
 import { MangaFile } from './manga-file';
 import { AgeRating } from './metadata/age-rating';
 import { AgeRatingDto } from './metadata/age-rating-dto';

UI/Web/src/app/_models/config-data.ts

@@ -1,10 +0,0 @@
-/**
- * This is for base url only. Not to be used my applicaiton, only loading and bootstrapping app
- */
-// export class ConfigData {
-//     baseUrl: string = '/';
-
-//     constructor(baseUrl: string) {
-//         this.baseUrl = baseUrl;
-//     }
-// }

UI/Web/src/app/_models/metadata/age-restriction.ts

@@ -1,4 +1,4 @@
-import { AgeRating } from "./metadata/age-rating";
+import { AgeRating } from "./age-rating";
 
 export interface AgeRestriction {
     ageRating: AgeRating;

UI/Web/src/app/_models/metadata/chapter-metadata.ts

@@ -1,8 +1,8 @@
 import { Genre } from "./genre";
-import { AgeRating } from "./metadata/age-rating";
-import { PublicationStatus } from "./metadata/publication-status";
+import { AgeRating } from "./age-rating";
+import { PublicationStatus } from "./publication-status";
 import { Person } from "./person";
-import { Tag } from "./tag";
+import { Tag } from "../tag";
 
 export interface ChapterMetadata {
     id: number;

UI/Web/src/app/_models/metadata/series-filter.ts

@@ -1,4 +1,4 @@
-import { MangaFormat } from "./manga-format";
+import { MangaFormat } from "../manga-format";
 
 export interface FilterItem<T> {
     title: string;

UI/Web/src/app/_models/metadata/series-metadata.ts

@@ -1,9 +1,9 @@
-import { CollectionTag } from "./collection-tag";
+import { CollectionTag } from "../collection-tag";
 import { Genre } from "./genre";
-import { AgeRating } from "./metadata/age-rating";
-import { PublicationStatus } from "./metadata/publication-status";
+import { AgeRating } from "./age-rating";
+import { PublicationStatus } from "./publication-status";
 import { Person } from "./person";
-import { Tag } from "./tag";
+import { Tag } from "../tag";
 
 export interface SeriesMetadata {
     seriesId: number;

UI/Web/src/app/_models/preferences/preferences.ts

@@ -1,7 +1,7 @@
 
 import { LayoutMode } from 'src/app/manga-reader/_models/layout-mode';
-import { BookPageLayoutMode } from '../book-page-layout-mode';
-import { PageLayoutMode } from '../page-layout-mode';
+import { BookPageLayoutMode } from '../readers/book-page-layout-mode';
+import { PageLayoutMode } from '../readers/page-layout-mode';
 import { PageSplitOption } from './page-split-option';
 import { ReaderMode } from './reader-mode';
 import { ReadingDirection } from './reading-direction';

UI/Web/src/app/_models/search/search-result-group.ts

@@ -1,7 +1,7 @@
 import { Chapter } from "../chapter";
 import { Library } from "../library";
 import { MangaFile } from "../manga-file";
-import { SearchResult } from "../search-result";
+import { SearchResult } from "./search-result";
 import { Tag } from "../tag";
 
 export class SearchResultGroup {

UI/Web/src/app/_models/search/search-result.ts

@@ -1,4 +1,4 @@
-import { MangaFormat } from "./manga-format";
+import { MangaFormat } from "../manga-format";
 
 export interface SearchResult {
     seriesId: number;

UI/Web/src/app/_models/user.ts

@@ -1,4 +1,4 @@
-import { AgeRestriction } from './age-restriction';
+import { AgeRestriction } from './metadata/age-restriction';
 import { Preferences } from './preferences/preferences';
 
 // This interface is only used for login and storing/retreiving JWT from local storage

UI/Web/src/app/_models/volume.ts

@@ -1,5 +1,5 @@
 import { Chapter } from './chapter';
-import { HourEstimateRange } from './hour-estimate-range';
+import { HourEstimateRange } from './series-detail/hour-estimate-range';
 
 export interface Volume {
     id: number;

UI/Web/src/app/_services/account.service.ts

@@ -8,11 +8,11 @@ import { User } from '../_models/user';
 import { Router } from '@angular/router';
 import { EVENTS, MessageHubService } from './message-hub.service';
 import { ThemeService } from './theme.service';
-import { InviteUserResponse } from '../_models/invite-user-response';
+import { InviteUserResponse } from '../_models/auth/invite-user-response';
 import { UserUpdateEvent } from '../_models/events/user-update-event';
-import { UpdateEmailResponse } from '../_models/email/update-email-response';
+import { UpdateEmailResponse } from '../_models/auth/update-email-response';
 import { AgeRating } from '../_models/metadata/age-rating';
-import { AgeRestriction } from '../_models/age-restriction';
+import { AgeRestriction } from '../_models/metadata/age-restriction';
 
 export enum Role {
   Admin = 'Admin',

UI/Web/src/app/_services/member.service.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { environment } from 'src/environments/environment';
-import { Member } from '../_models/member';
+import { Member } from '../_models/auth/member';
 
 @Injectable({
   providedIn: 'root'

UI/Web/src/app/_services/metadata.service.ts

@@ -4,12 +4,12 @@ import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { environment } from 'src/environments/environment';
 import { UtilityService } from '../shared/_services/utility.service';
-import { Genre } from '../_models/genre';
+import { Genre } from '../_models/metadata/genre';
 import { AgeRating } from '../_models/metadata/age-rating';
 import { AgeRatingDto } from '../_models/metadata/age-rating-dto';
 import { Language } from '../_models/metadata/language';
 import { PublicationStatusDto } from '../_models/metadata/publication-status-dto';
-import { Person } from '../_models/person';
+import { Person } from '../_models/metadata/person';
 import { Tag } from '../_models/tag';
 
 @Injectable({

UI/Web/src/app/_services/reader.service.ts

@@ -5,12 +5,12 @@ import { Router } from '@angular/router';
 import { environment } from 'src/environments/environment';
 import { ChapterInfo } from '../manga-reader/_models/chapter-info';
 import { Chapter } from '../_models/chapter';
-import { HourEstimateRange } from '../_models/hour-estimate-range';
+import { HourEstimateRange } from '../_models/series-detail/hour-estimate-range';
 import { MangaFormat } from '../_models/manga-format';
 import { BookmarkInfo } from '../_models/manga-reader/bookmark-info';
-import { PageBookmark } from '../_models/page-bookmark';
-import { ProgressBookmark } from '../_models/progress-bookmark';
-import { SeriesFilter } from '../_models/series-filter';
+import { PageBookmark } from '../_models/readers/page-bookmark';
+import { ProgressBookmark } from '../_models/readers/progress-bookmark';
+import { SeriesFilter } from '../_models/metadata/series-filter';
 import { UtilityService } from '../shared/_services/utility.service';
 import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service';
 

UI/Web/src/app/_services/series.service.ts

@@ -6,15 +6,15 @@ import { environment } from 'src/environments/environment';
 import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service';
 import { UtilityService } from '../shared/_services/utility.service';
 import { Chapter } from '../_models/chapter';
-import { ChapterMetadata } from '../_models/chapter-metadata';
+import { ChapterMetadata } from '../_models/metadata/chapter-metadata';
 import { CollectionTag } from '../_models/collection-tag';
 import { PaginatedResult } from '../_models/pagination';
 import { Series } from '../_models/series';
 import { RelatedSeries } from '../_models/series-detail/related-series';
 import { SeriesDetail } from '../_models/series-detail/series-detail';
-import { SeriesFilter } from '../_models/series-filter';
+import { SeriesFilter } from '../_models/metadata/series-filter';
 import { SeriesGroup } from '../_models/series-group';
-import { SeriesMetadata } from '../_models/series-metadata';
+import { SeriesMetadata } from '../_models/metadata/series-metadata';
 import { Volume } from '../_models/volume';
 import { ImageService } from './image.service';
 

UI/Web/src/app/admin/_modals/library-access-modal/library-access-modal.component.ts

@@ -3,7 +3,7 @@ import { FormBuilder } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { SelectionModel } from 'src/app/typeahead/typeahead.component';
 import { Library } from 'src/app/_models/library';
-import { Member } from 'src/app/_models/member';
+import { Member } from 'src/app/_models/auth/member';
 import { LibraryService } from 'src/app/_services/library.service';
 
 @Component({

UI/Web/src/app/admin/_modals/reset-password-modal/reset-password-modal.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormGroup, FormControl, Validators } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { Member } from 'src/app/_models/member';
+import { Member } from 'src/app/_models/auth/member';
 import { AccountService } from 'src/app/_services/account.service';
 
 @Component({

UI/Web/src/app/admin/edit-user/edit-user.component.ts

@@ -1,9 +1,9 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormGroup, FormControl, Validators } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { AgeRestriction } from 'src/app/_models/age-restriction';
+import { AgeRestriction } from 'src/app/_models/metadata/age-restriction';
 import { Library } from 'src/app/_models/library';
-import { Member } from 'src/app/_models/member';
+import { Member } from 'src/app/_models/auth/member';
 import { AccountService } from 'src/app/_services/account.service';
 
 @Component({

UI/Web/src/app/admin/invite-user/invite-user.component.ts

@@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastrService } from 'ngx-toastr';
-import { AgeRestriction } from 'src/app/_models/age-restriction';
-import { InviteUserResponse } from 'src/app/_models/invite-user-response';
+import { AgeRestriction } from 'src/app/_models/metadata/age-restriction';
+import { InviteUserResponse } from 'src/app/_models/auth/invite-user-response';
 import { Library } from 'src/app/_models/library';
 import { AgeRating } from 'src/app/_models/metadata/age-rating';
 import { AccountService } from 'src/app/_services/account.service';

UI/Web/src/app/admin/library-selector/library-selector.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { SelectionModel } from 'src/app/typeahead/typeahead.component';
 import { Library } from 'src/app/_models/library';
-import { Member } from 'src/app/_models/member';
+import { Member } from 'src/app/_models/auth/member';
 import { LibraryService } from 'src/app/_services/library.service';
 
 @Component({

UI/Web/src/app/admin/manage-library/manage-library.component.ts

@@ -4,7 +4,7 @@ import { ToastrService } from 'ngx-toastr';
 import { Subject } from 'rxjs';
 import { distinctUntilChanged, filter, take, takeUntil } from 'rxjs/operators';
 import { ConfirmService } from 'src/app/shared/confirm.service';
-import { LibrarySettingsModalComponent } from 'src/app/sidenav/_components/library-settings-modal/library-settings-modal.component';
+import { LibrarySettingsModalComponent } from 'src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component';
 import { NotificationProgressEvent } from 'src/app/_models/events/notification-progress-event';
 import { ScanSeriesEvent } from 'src/app/_models/events/scan-series-event';
 import { Library } from 'src/app/_models/library';

UI/Web/src/app/admin/manage-users/manage-users.component.ts

@@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { catchError, take } from 'rxjs/operators';
 import { MemberService } from 'src/app/_services/member.service';
-import { Member } from 'src/app/_models/member';
+import { Member } from 'src/app/_models/auth/member';
 import { User } from 'src/app/_models/user';
 import { AccountService } from 'src/app/_services/account.service';
 import { ToastrService } from 'ngx-toastr';

UI/Web/src/app/admin/role-selector/role-selector.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { Member } from 'src/app/_models/member';
+import { Member } from 'src/app/_models/auth/member';
 import { User } from 'src/app/_models/user';
 import { AccountService } from 'src/app/_services/account.service';
 import { MemberService } from 'src/app/_services/member.service';

UI/Web/src/app/all-series/_components/all-series/all-series.component.ts

@@ -3,19 +3,21 @@ import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subject } from 'rxjs';
 import { take, debounceTime, takeUntil } from 'rxjs/operators';
-import { BulkSelectionService } from '../cards/bulk-selection.service';
-import { FilterSettings } from '../metadata-filter/filter-settings';
-import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service';
-import { KEY_CODES, UtilityService } from '../shared/_services/utility.service';
-import { JumpKey } from '../_models/jumpbar/jump-key';
-import { Pagination } from '../_models/pagination';
-import { Series } from '../_models/series';
-import { FilterEvent, SeriesFilter } from '../_models/series-filter';
-import { Action, ActionItem } from '../_services/action-factory.service';
-import { ActionService } from '../_services/action.service';
-import { JumpbarService } from '../_services/jumpbar.service';
-import { EVENTS, Message, MessageHubService } from '../_services/message-hub.service';
-import { SeriesService } from '../_services/series.service';
+import { BulkSelectionService } from 'src/app/cards/bulk-selection.service';
+import { FilterSettings } from 'src/app/metadata-filter/filter-settings';
+import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service';
+import { UtilityService, KEY_CODES } from 'src/app/shared/_services/utility.service';
+import { JumpKey } from 'src/app/_models/jumpbar/jump-key';
+import { Pagination } from 'src/app/_models/pagination';
+import { Series } from 'src/app/_models/series';
+import { SeriesFilter, FilterEvent } from 'src/app/_models/metadata/series-filter';
+import { Action, ActionItem } from 'src/app/_services/action-factory.service';
+import { ActionService } from 'src/app/_services/action.service';
+import { JumpbarService } from 'src/app/_services/jumpbar.service';
+import { MessageHubService, Message, EVENTS } from 'src/app/_services/message-hub.service';
+import { SeriesService } from 'src/app/_services/series.service';
+
+
 
 @Component({
   selector: 'app-all-series',

UI/Web/src/app/all-series/all-series-routing.module.ts

@@ -1,7 +1,9 @@
 import { NgModule } from "@angular/core";
 import { Routes, RouterModule } from "@angular/router";
 import { AuthGuard } from "../_guards/auth.guard";
-import { AllSeriesComponent } from "./all-series.component";
+import { AllSeriesComponent } from "./_components/all-series/all-series.component";
+
+
 const routes: Routes = [
   {path: '**', component: AllSeriesComponent, pathMatch: 'full', canActivate: [AuthGuard]},
   {

UI/Web/src/app/all-series/all-series.module.ts

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { AllSeriesComponent } from './all-series.component';
 import { AllSeriesRoutingModule } from './all-series-routing.module';
 import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module';
+import { AllSeriesComponent } from './_components/all-series/all-series.component';
 
 
 

UI/Web/src/app/announcements/announcements-routing.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
 import { Routes, RouterModule } from "@angular/router";
 import { AdminGuard } from "../_guards/admin.guard";
 import { AuthGuard } from "../_guards/auth.guard";
-import { AnnouncementsComponent } from "./announcements.component";
+import { AnnouncementsComponent } from "./_components/announcements/announcements.component";
 
 const routes: Routes = [
   {path: '**', component: AnnouncementsComponent, pathMatch: 'full', canActivate: [AuthGuard, AdminGuard]},

UI/Web/src/app/announcements/announcements.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { AnnouncementsComponent } from './announcements.component';
-import { ChangelogComponent } from './changelog/changelog.component';
+import { AnnouncementsComponent } from './_components/announcements/announcements.component';
+import { ChangelogComponent } from './_components/changelog/changelog.component';
 import { AnnouncementsRoutingModule } from './announcements-routing.module';
 import { SharedModule } from '../shared/shared.module';
 import { PipeModule } from '../pipe/pipe.module';

UI/Web/src/app/app.module.ts

@@ -12,7 +12,7 @@ import { ErrorInterceptor } from './_interceptors/error.interceptor';
 import { SAVER, getSaver } from './shared/_providers/saver.provider';
 import { SidenavModule } from './sidenav/sidenav.module';
 import { NavModule } from './nav/nav.module';
-import { DevicesComponent } from './devices/devices.component';
+import { DevicesComponent } from './_components/devices/devices.component';
 
 
 

UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.ts

@@ -10,9 +10,9 @@ import { NavService } from 'src/app/_services/nav.service';
 import { CHAPTER_ID_DOESNT_EXIST, CHAPTER_ID_NOT_FETCHED, ReaderService } from 'src/app/_services/reader.service';
 import { SeriesService } from 'src/app/_services/series.service';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
-import { BookService } from '../book.service';
+import { BookService } from '../../_services/book.service';
 import { KEY_CODES, UtilityService } from 'src/app/shared/_services/utility.service';
-import { BookChapterItem } from '../_models/book-chapter-item';
+import { BookChapterItem } from '../../_models/book-chapter-item';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { Stack } from 'src/app/shared/data-structures/stack';
 import { MemberService } from 'src/app/_services/member.service';
@@ -21,7 +21,7 @@ import { MangaFormat } from 'src/app/_models/manga-format';
 import { LibraryService } from 'src/app/_services/library.service';
 import { LibraryType } from 'src/app/_models/library';
 import { BookTheme } from 'src/app/_models/preferences/book-theme';
-import { BookPageLayoutMode } from 'src/app/_models/book-page-layout-mode';
+import { BookPageLayoutMode } from 'src/app/_models/readers/book-page-layout-mode';
 import { PageStyle } from '../reader-settings/reader-settings.component';
 import { User } from 'src/app/_models/user';
 import { ThemeService } from 'src/app/_services/theme.service';

UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts

@@ -2,17 +2,17 @@ import { DOCUMENT } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Inject, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Subject, take, takeUntil } from 'rxjs';
-import { BookPageLayoutMode } from 'src/app/_models/book-page-layout-mode';
+import { BookPageLayoutMode } from 'src/app/_models/readers/book-page-layout-mode';
 import { BookTheme } from 'src/app/_models/preferences/book-theme';
 import { ReadingDirection } from 'src/app/_models/preferences/reading-direction';
 import { ThemeProvider } from 'src/app/_models/preferences/site-theme';
 import { User } from 'src/app/_models/user';
 import { AccountService } from 'src/app/_services/account.service';
 import { ThemeService } from 'src/app/_services/theme.service';
-import { BookService, FontFamily } from '../book.service';
-import { BookBlackTheme } from '../_models/book-black-theme';
-import { BookDarkTheme } from '../_models/book-dark-theme';
-import { BookWhiteTheme } from '../_models/book-white-theme';
+import { FontFamily, BookService } from '../../_services/book.service';
+import { BookBlackTheme } from '../../_models/book-black-theme';
+import { BookDarkTheme } from '../../_models/book-dark-theme';
+import { BookWhiteTheme } from '../../_models/book-white-theme';
 
 /**
  * Used for book reader. Do not use for other components

UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { Subject } from 'rxjs';
-import { BookChapterItem } from '../_models/book-chapter-item';
+import { BookChapterItem } from '../../_models/book-chapter-item';
 
 @Component({
   selector: 'app-table-of-contents',

UI/Web/src/app/book-reader/_services/book.service.ts

@@ -1,8 +1,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { environment } from 'src/environments/environment';
-import { BookChapterItem } from './_models/book-chapter-item';
-import { BookInfo } from './_models/book-info';
+import { BookChapterItem } from '../_models/book-chapter-item';
+import { BookInfo } from '../_models/book-info';
 
 export interface BookPage {
   bookTitle: string;

UI/Web/src/app/book-reader/book-reader.module.ts

@@ -1,14 +1,14 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { BookReaderComponent } from './book-reader/book-reader.component';
+import { BookReaderComponent } from './_components/book-reader/book-reader.component';
 import { BookReaderRoutingModule } from './book-reader.router.module';
 import { SharedModule } from '../shared/shared.module';
-import { SafeStylePipe } from './safe-style.pipe';
+import { SafeStylePipe } from './_pipes/safe-style.pipe';
 import { ReactiveFormsModule } from '@angular/forms';
 import { PipeModule } from '../pipe/pipe.module';
 import { NgbAccordionModule, NgbNavModule, NgbProgressbarModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
-import { TableOfContentsComponent } from './table-of-contents/table-of-contents.component';
-import { ReaderSettingsComponent } from './reader-settings/reader-settings.component';
+import { ReaderSettingsComponent } from './_components/reader-settings/reader-settings.component';
+import { TableOfContentsComponent } from './_components/table-of-contents/table-of-contents.component';
 
 
 @NgModule({

UI/Web/src/app/book-reader/book-reader.router.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { BookReaderComponent } from './book-reader/book-reader.component';
+import { BookReaderComponent } from './_components/book-reader/book-reader.component';
 
 const routes: Routes = [
   {

UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts

@@ -9,10 +9,10 @@ import { DownloadService } from 'src/app/shared/_services/download.service';
 import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service';
 import { KEY_CODES } from 'src/app/shared/_services/utility.service';
 import { JumpKey } from 'src/app/_models/jumpbar/jump-key';
-import { PageBookmark } from 'src/app/_models/page-bookmark';
+import { PageBookmark } from 'src/app/_models/readers/page-bookmark';
 import { Pagination } from 'src/app/_models/pagination';
 import { Series } from 'src/app/_models/series';
-import { FilterEvent, SeriesFilter } from 'src/app/_models/series-filter';
+import { FilterEvent, SeriesFilter } from 'src/app/_models/metadata/series-filter';
 import { Action, ActionFactoryService, ActionItem } from 'src/app/_services/action-factory.service';
 import { ImageService } from 'src/app/_services/image.service';
 import { JumpbarService } from 'src/app/_services/jumpbar.service';

UI/Web/src/app/bookmark/bookmark-routing.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 import { Routes, RouterModule } from "@angular/router";
 import { AuthGuard } from "../_guards/auth.guard";
-import { BookmarksComponent } from "./bookmarks/bookmarks.component";
+import { BookmarksComponent } from "./_components/bookmarks/bookmarks.component";
 
 const routes: Routes = [
   {path: '**', component: BookmarksComponent, pathMatch: 'full', canActivate: [AuthGuard]},

UI/Web/src/app/bookmark/bookmark.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { BookmarkRoutingModule } from './bookmark-routing.module';
-import { BookmarksComponent } from './bookmarks/bookmarks.component';
+import { BookmarksComponent } from './_components/bookmarks/bookmarks.component';
 import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module';
 
 

UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts

@@ -4,16 +4,16 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { forkJoin, Observable, of, Subject } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 import { Breakpoint, UtilityService } from 'src/app/shared/_services/utility.service';
-import { TypeaheadSettings } from 'src/app/typeahead/typeahead-settings';
+import { TypeaheadSettings } from 'src/app/typeahead/_models/typeahead-settings';
 import { Chapter } from 'src/app/_models/chapter';
 import { CollectionTag } from 'src/app/_models/collection-tag';
-import { Genre } from 'src/app/_models/genre';
+import { Genre } from 'src/app/_models/metadata/genre';
 import { AgeRatingDto } from 'src/app/_models/metadata/age-rating-dto';
 import { Language } from 'src/app/_models/metadata/language';
 import { PublicationStatusDto } from 'src/app/_models/metadata/publication-status-dto';
-import { Person, PersonRole } from 'src/app/_models/person';
+import { Person, PersonRole } from 'src/app/_models/metadata/person';
 import { Series } from 'src/app/_models/series';
-import { SeriesMetadata } from 'src/app/_models/series-metadata';
+import { SeriesMetadata } from 'src/app/_models/metadata/series-metadata';
 import { Tag } from 'src/app/_models/tag';
 import { CollectionTagService } from 'src/app/_services/collection-tag.service';
 import { ImageService } from 'src/app/_services/image.service';

UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts

@@ -7,12 +7,12 @@ import { Download } from 'src/app/shared/_models/download';
 import { DownloadService } from 'src/app/shared/_services/download.service';
 import { Breakpoint, UtilityService } from 'src/app/shared/_services/utility.service';
 import { Chapter } from 'src/app/_models/chapter';
-import { ChapterMetadata } from 'src/app/_models/chapter-metadata';
+import { ChapterMetadata } from 'src/app/_models/metadata/chapter-metadata';
 import { Device } from 'src/app/_models/device/device';
 import { LibraryType } from 'src/app/_models/library';
 import { MangaFile } from 'src/app/_models/manga-file';
 import { MangaFormat } from 'src/app/_models/manga-format';
-import { PersonRole } from 'src/app/_models/person';
+import { PersonRole } from 'src/app/_models/metadata/person';
 import { Volume } from 'src/app/_models/volume';
 import { AccountService } from 'src/app/_services/account.service';
 import { ActionItem, ActionFactoryService, Action } from 'src/app/_services/action-factory.service';

UI/Web/src/app/cards/card-detail-layout/card-detail-layout.component.ts

@@ -11,7 +11,7 @@ import { Breakpoint, UtilityService } from 'src/app/shared/_services/utility.ser
 import { JumpKey } from 'src/app/_models/jumpbar/jump-key';
 import { Library } from 'src/app/_models/library';
 import { Pagination } from 'src/app/_models/pagination';
-import { FilterEvent, FilterItem, SeriesFilter } from 'src/app/_models/series-filter';
+import { FilterEvent, FilterItem, SeriesFilter } from 'src/app/_models/metadata/series-filter';
 import { ActionItem } from 'src/app/_services/action-factory.service';
 import { JumpbarService } from 'src/app/_services/jumpbar.service';
 

UI/Web/src/app/cards/card-item/card-item.component.ts

@@ -7,7 +7,7 @@ import { Chapter } from 'src/app/_models/chapter';
 import { CollectionTag } from 'src/app/_models/collection-tag';
 import { UserProgressUpdateEvent } from 'src/app/_models/events/user-progress-update-event';
 import { MangaFormat } from 'src/app/_models/manga-format';
-import { PageBookmark } from 'src/app/_models/page-bookmark';
+import { PageBookmark } from 'src/app/_models/readers/page-bookmark';
 import { RecentlyAddedItem } from 'src/app/_models/recently-added-item';
 import { Series } from 'src/app/_models/series';
 import { User } from 'src/app/_models/user';

UI/Web/src/app/cards/chapter-metadata-detail/chapter-metadata-detail.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { ChapterMetadata } from 'src/app/_models/chapter-metadata';
+import { ChapterMetadata } from 'src/app/_models/metadata/chapter-metadata';
 
 @Component({
   selector: 'app-chapter-metadata-detail',

UI/Web/src/app/cards/edit-series-relation/edit-series-relation.component.ts

@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, In
 import { FormControl } from '@angular/forms';
 import { map, Subject, Observable, of, firstValueFrom, takeUntil, ReplaySubject } from 'rxjs';
 import { UtilityService } from 'src/app/shared/_services/utility.service';
-import { TypeaheadSettings } from 'src/app/typeahead/typeahead-settings';
-import { SearchResult } from 'src/app/_models/search-result';
+import { TypeaheadSettings } from 'src/app/typeahead/_models/typeahead-settings';
+import { SearchResult } from 'src/app/_models/search/search-result';
 import { Series } from 'src/app/_models/series';
 import { RelationKind, RelationKinds } from 'src/app/_models/series-detail/relation-kind';
 import { ImageService } from 'src/app/_services/image.service';

UI/Web/src/app/cards/entity-info-cards/entity-info-cards.component.ts

@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy
 import { Subject } from 'rxjs';
 import { UtilityService } from 'src/app/shared/_services/utility.service';
 import { Chapter } from 'src/app/_models/chapter';
-import { ChapterMetadata } from 'src/app/_models/chapter-metadata';
-import { HourEstimateRange } from 'src/app/_models/hour-estimate-range';
+import { ChapterMetadata } from 'src/app/_models/metadata/chapter-metadata';
+import { HourEstimateRange } from 'src/app/_models/series-detail/hour-estimate-range';
 import { LibraryType } from 'src/app/_models/library';
 import { MangaFormat } from 'src/app/_models/manga-format';
 import { AgeRating } from 'src/app/_models/metadata/age-rating';

UI/Web/src/app/cards/series-info-cards/series-info-cards.component.ts

@@ -3,10 +3,10 @@ import { debounceTime, filter, map, Subject, takeUntil } from 'rxjs';
 import { FilterQueryParam } from 'src/app/shared/_services/filter-utilities.service';
 import { UtilityService } from 'src/app/shared/_services/utility.service';
 import { UserProgressUpdateEvent } from 'src/app/_models/events/user-progress-update-event';
-import { HourEstimateRange } from 'src/app/_models/hour-estimate-range';
+import { HourEstimateRange } from 'src/app/_models/series-detail/hour-estimate-range';
 import { MangaFormat } from 'src/app/_models/manga-format';
 import { Series } from 'src/app/_models/series';
-import { SeriesMetadata } from 'src/app/_models/series-metadata';
+import { SeriesMetadata } from 'src/app/_models/metadata/series-metadata';
 import { AccountService } from 'src/app/_services/account.service';
 import { EVENTS, MessageHubService } from 'src/app/_services/message-hub.service';
 import { MetadataService } from 'src/app/_services/metadata.service';

UI/Web/src/app/carousel/carousel.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { CarouselReelComponent } from './carousel-reel/carousel-reel.component';
+import { CarouselReelComponent } from './_components/carousel-reel/carousel-reel.component';
 import { SwiperModule } from 'swiper/angular';
 
 

UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.ts

@@ -16,7 +16,7 @@ import { SeriesAddedToCollectionEvent } from 'src/app/_models/events/series-adde
 import { JumpKey } from 'src/app/_models/jumpbar/jump-key';
 import { Pagination } from 'src/app/_models/pagination';
 import { Series } from 'src/app/_models/series';
-import { FilterEvent, SeriesFilter } from 'src/app/_models/series-filter';
+import { FilterEvent, SeriesFilter } from 'src/app/_models/metadata/series-filter';
 import { Action, ActionFactoryService, ActionItem } from 'src/app/_services/action-factory.service';
 import { ActionService } from 'src/app/_services/action.service';
 import { CollectionTagService } from 'src/app/_services/collection-tag.service';

UI/Web/src/app/collections/collections-routing.module.ts

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { AuthGuard } from '../_guards/auth.guard';
-import { AllCollectionsComponent } from './all-collections/all-collections.component';
-import { CollectionDetailComponent } from './collection-detail/collection-detail.component';
+import { AllCollectionsComponent } from './_components/all-collections/all-collections.component';
+import { CollectionDetailComponent } from './_components/collection-detail/collection-detail.component';
 
 const routes: Routes = [
   {

UI/Web/src/app/collections/collections.module.ts

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { CollectionDetailComponent } from './collection-detail/collection-detail.component';
+import { CollectionDetailComponent } from './_components/collection-detail/collection-detail.component';
 import { SharedModule } from '../shared/shared.module';
-import { AllCollectionsComponent } from './all-collections/all-collections.component';
+import { AllCollectionsComponent } from './_components/all-collections/all-collections.component';
 import { CollectionsRoutingModule } from './collections-routing.module';
 import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module';
 

UI/Web/src/app/dashboard/_components/dashboard.component.ts

@@ -3,19 +3,19 @@ import { Title } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { Observable, of, ReplaySubject, Subject } from 'rxjs';
 import { debounceTime, map, take, takeUntil, tap, shareReplay } from 'rxjs/operators';
-import { FilterQueryParam } from '../shared/_services/filter-utilities.service';
-import { SeriesAddedEvent } from '../_models/events/series-added-event';
-import { SeriesRemovedEvent } from '../_models/events/series-removed-event';
-import { Library } from '../_models/library';
-import { RecentlyAddedItem } from '../_models/recently-added-item';
-import { Series } from '../_models/series';
-import { SortField } from '../_models/series-filter';
-import { SeriesGroup } from '../_models/series-group';
-import { AccountService } from '../_services/account.service';
-import { ImageService } from '../_services/image.service';
-import { LibraryService } from '../_services/library.service';
-import { MessageHubService, EVENTS } from '../_services/message-hub.service';
-import { SeriesService } from '../_services/series.service';
+import { FilterQueryParam } from 'src/app/shared/_services/filter-utilities.service';
+import { SeriesAddedEvent } from 'src/app/_models/events/series-added-event';
+import { SeriesRemovedEvent } from 'src/app/_models/events/series-removed-event';
+import { Library } from 'src/app/_models/library';
+import { RecentlyAddedItem } from 'src/app/_models/recently-added-item';
+import { Series } from 'src/app/_models/series';
+import { SortField } from 'src/app/_models/metadata/series-filter';
+import { SeriesGroup } from 'src/app/_models/series-group';
+import { AccountService } from 'src/app/_services/account.service';
+import { ImageService } from 'src/app/_services/image.service';
+import { LibraryService } from 'src/app/_services/library.service';
+import { MessageHubService, EVENTS } from 'src/app/_services/message-hub.service';
+import { SeriesService } from 'src/app/_services/series.service';
 
 @Component({
   selector: 'app-dashboard',

UI/Web/src/app/dashboard/dashboard-routing.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { AuthGuard } from '../_guards/auth.guard';
-import { DashboardComponent } from './dashboard.component';
+import { DashboardComponent } from './_components/dashboard.component';
 
 
 const routes: Routes = [

UI/Web/src/app/dashboard/dashboard.module.ts

@@ -3,20 +3,16 @@ import { CommonModule } from '@angular/common';
 import { DashboardRoutingModule } from './dashboard-routing.module';
 
 import { CarouselModule } from '../carousel/carousel.module';
-import { DashboardComponent } from './dashboard.component';
+import { DashboardComponent } from './_components/dashboard.component';
 import { SharedSideNavCardsModule } from '../shared-side-nav-cards/shared-side-nav-cards.module';
 
 
-
 @NgModule({
   declarations: [DashboardComponent],
   imports: [
     CommonModule,
-
     CarouselModule,
-
     SharedSideNavCardsModule,
-
     DashboardRoutingModule
   ]
 })

UI/Web/src/app/library-detail/library-detail.component.ts

@@ -9,7 +9,7 @@ import { SeriesAddedEvent } from '../_models/events/series-added-event';
 import { Library } from '../_models/library';
 import { Pagination } from '../_models/pagination';
 import { Series } from '../_models/series';
-import { FilterEvent, SeriesFilter } from '../_models/series-filter';
+import { FilterEvent, SeriesFilter } from '../_models/metadata/series-filter';
 import { Action, ActionFactoryService, ActionItem } from '../_services/action-factory.service';
 import { ActionService } from '../_services/action.service';
 import { LibraryService } from '../_services/library.service';

UI/Web/src/app/library-detail/library-recommended/library-recommended.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { filter, map, merge, Observable, shareReplay, Subject, takeUntil } from 'rxjs';
-import { Genre } from 'src/app/_models/genre';
+import { Genre } from 'src/app/_models/metadata/genre';
 import { Series } from 'src/app/_models/series';
 import { MetadataService } from 'src/app/_services/metadata.service';
 import { RecommendationService } from 'src/app/_services/recommendation.service';

UI/Web/src/app/metadata-filter/filter-settings.ts

@@ -1,4 +1,4 @@
-import { SeriesFilter } from "../_models/series-filter";
+import { SeriesFilter } from "../_models/metadata/series-filter";
 
 export class FilterSettings {
     libraryDisabled = false;

UI/Web/src/app/metadata-filter/metadata-filter.component.ts

@@ -4,16 +4,16 @@ import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap';
 import { distinctUntilChanged, forkJoin, map, Observable, of, ReplaySubject, Subject, takeUntil } from 'rxjs';
 import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service';
 import { UtilityService } from '../shared/_services/utility.service';
-import { TypeaheadSettings } from '../typeahead/typeahead-settings';
+import { TypeaheadSettings } from '../typeahead/_models/typeahead-settings';
 import { CollectionTag } from '../_models/collection-tag';
-import { Genre } from '../_models/genre';
+import { Genre } from '../_models/metadata/genre';
 import { Library } from '../_models/library';
 import { MangaFormat } from '../_models/manga-format';
 import { AgeRatingDto } from '../_models/metadata/age-rating-dto';
 import { Language } from '../_models/metadata/language';
 import { PublicationStatusDto } from '../_models/metadata/publication-status-dto';
-import { Person, PersonRole } from '../_models/person';
-import { FilterEvent, FilterItem, mangaFormatFilters, SeriesFilter, SortField } from '../_models/series-filter';
+import { Person, PersonRole } from '../_models/metadata/person';
+import { FilterEvent, FilterItem, mangaFormatFilters, SeriesFilter, SortField } from '../_models/metadata/series-filter';
 import { Tag } from '../_models/tag';
 import { CollectionTagService } from '../_services/collection-tag.service';
 import { LibraryService } from '../_services/library.service';