move some things around orgwise

app/db/src/app/app-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { SearchPage } from './search/components/search-page/search.page';
+import { SearchPage } from './search/search-page/search.page';
 
 const routes: Routes = [
   {

app/db/src/app/app.module.ts

@@ -14,9 +14,9 @@ import { AngularFireDatabaseModule } from '@angular/fire/database';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 
-import { SearchPage } from './search/components/search-page/search.page';
-import { AddToPageModalComponent } from './search/components/saved-page/add-to-page-modal/add-to-page-modal.component';
-import { PageEditModalComponent } from './search/components/saved-page/page-edit-modal/page-edit-modal.component';
+import { SearchPage } from './search/search-page/search.page';
+import { PageEditModalComponent } from './search/saved-page/page-edit-modal/page-edit-modal.component';
+import { AddToPageModalComponent } from './search/saved-page/add-to-page-modal/add-to-page-modal.component';
 import { NoteEditModalComponent } from './search/components/note/edit-modal/note-edit-modal.component';
 import { VersePickerModalComponent } from './search/components/verse-picker-modal/verse-picker-modal.component';
 

app/db/src/app/common/components/card.component.ts

@@ -2,10 +2,10 @@ import { EventEmitter, Output, Input, ElementRef, Component } from '@angular/cor
 import { CardItem, OpenData } from '../../models/app-state';
 import { Observable } from 'rxjs';
 import { MatDialog } from '@angular/material/dialog';
-import { AddToPageModalComponent } from '../../search/components/saved-page/add-to-page-modal/add-to-page-modal.component';
 import { SubscriberComponent } from './subscriber.component';
 import { AppService } from 'src/app/services/app.service';
 import { ListDirection } from '../list-direction';
+import { AddToPageModalComponent } from '../../search/saved-page/add-to-page-modal/add-to-page-modal.component';
 
 @Component({
   template: '',

app/db/src/app/common/components/settings/settings.component.ts

@@ -9,13 +9,12 @@ import { MatSliderChange } from '@angular/material/slider';
 import { AngularFireAuth } from '@angular/fire/auth';
 import { auth } from 'firebase/app';
 import { Storable } from 'src/app/models/storable';
-import { PageEditModalComponent } from '../../../search/components/saved-page/page-edit-modal/page-edit-modal.component';
 import { NoteEditModalComponent } from '../../../search/components/note/edit-modal/note-edit-modal.component';
 import { MatDialog } from '@angular/material/dialog';
 import { OkCancelModalComponent, OkCancelResult } from '../ok-cancel-modal/ok-cancel-modal.component';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { SearchPage } from 'src/app/search/components/search-page/search.page';
 import { NavService } from 'src/app/services/nav.service';
+import { PageEditModalComponent } from '../../../search/saved-page/page-edit-modal/page-edit-modal.component';
 
 @Component({
   selector: 'app-settings',

app/db/src/app/search/saved-page/add-to-page-modal/add-to-page-modal.component.ts

@@ -2,8 +2,8 @@ import { Component, Inject, ViewChild } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatSelectionList } from '@angular/material/list';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { AppService } from '../../../../services/app.service';
-import { CardItem } from '../../../../models/app-state';
+import { CardItem } from '../../../models/app-state';
+import { AppService } from '../../../services/app.service';
 
 @Component({
   selector: 'app-add-to-page-modal-modal',

app/db/src/app/search/saved-page/page-edit-modal/page-edit-modal.component.ts

@@ -1,7 +1,7 @@
 import { Component, Inject } from '@angular/core';
 import { FormGroup, FormBuilder } from '@angular/forms';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { AppService } from '../../../../services/app.service';
+import { AppService } from '../../../services/app.service';
 
 @Component({
   selector: 'app-page-edit-modal',

app/db/src/app/search/search-page/search.page.ts

@@ -2,14 +2,13 @@ import { Component, OnInit, ViewChild, ChangeDetectionStrategy } from '@angular/
 import { ActivatedRoute, Router, NavigationEnd } from '@angular/router';
 import { FormControl } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
-import { AppService } from '../../../services/app.service';
-import { NavService } from '../../../services/nav.service';
-import { OpenData, CardItem, CardType } from '../../../models/app-state';
-import { BibleReference } from '../../../common/bible-reference';
-import { VersePickerModalComponent } from '../verse-picker-modal/verse-picker-modal.component';
-import { SubscriberComponent } from '../../../common/components/subscriber.component';
-
 import { MatAutocompleteTrigger, MatAutocomplete } from '@angular/material/autocomplete';
+import { AppService } from '../../services/app.service';
+import { NavService } from '../../services/nav.service';
+import { VersePickerModalComponent } from '../components/verse-picker-modal/verse-picker-modal.component';
+import { SubscriberComponent } from '../../common/components/subscriber.component';
+import { BibleReference } from '../../common/bible-reference';
+import { OpenData, CardItem, CardType } from '../../models/app-state';
 
 @Component({
   selector: 'app-search-page',