diff --git a/app/db/src/app/app.module.ts b/app/db/src/app/app.module.ts
index 59c912cd..aa0813fe 100644
--- a/app/db/src/app/app.module.ts
+++ b/app/db/src/app/app.module.ts
@@ -15,8 +15,8 @@ import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.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 { PageEditModalComponent } from './search/components/page-edit-modal/page-edit-modal.component';
+import { AddToPageModalComponent } from './search/components/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';
 
diff --git a/app/db/src/app/common/components/card.component.ts b/app/db/src/app/common/components/card.component.ts
index 91299eea..be1bd8b8 100644
--- a/app/db/src/app/common/components/card.component.ts
+++ b/app/db/src/app/common/components/card.component.ts
@@ -5,7 +5,7 @@ import { MatDialog } from '@angular/material/dialog';
 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';
+import { AddToPageModalComponent } from '../../search/components/add-to-page-modal/add-to-page-modal.component';
 
 @Component({
   template: '',
diff --git a/app/db/src/app/common/components/settings/settings.component.ts b/app/db/src/app/common/components/settings/settings.component.ts
index 5256980d..9ca4a4a9 100644
--- a/app/db/src/app/common/components/settings/settings.component.ts
+++ b/app/db/src/app/common/components/settings/settings.component.ts
@@ -1,20 +1,24 @@
 import { Component } from '@angular/core';
-import { AppService } from 'src/app/services/app.service';
 import { MatSlideToggleChange } from '@angular/material/slide-toggle';
+import { MatSelectChange } from '@angular/material/select';
+import { MatSliderChange } from '@angular/material/slider';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatDialog } from '@angular/material/dialog';
+
+import { AngularFireAuth } from '@angular/fire/auth';
+import { auth } from 'firebase/app';
+
+import { Storable } from 'src/app/models/storable';
 import { SubscriberComponent } from '../subscriber.component';
 import { DisplaySettings, SavedPage } from 'src/app/models/app-state';
 import { CardFonts } from 'src/app/constants';
-import { MatSelectChange } from '@angular/material/select';
-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 { 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 { NavService } from 'src/app/services/nav.service';
-import { PageEditModalComponent } from '../../../search/saved-page/page-edit-modal/page-edit-modal.component';
+import { AppService } from 'src/app/services/app.service';
+
+import { NoteEditModalComponent } from '../../../search/components/note/edit-modal/note-edit-modal.component';
+import { OkCancelModalComponent, OkCancelResult } from '../ok-cancel-modal/ok-cancel-modal.component';
+import { PageEditModalComponent } from '../../../search/components/page-edit-modal/page-edit-modal.component';
 
 @Component({
   selector: 'app-settings',
diff --git a/app/db/src/app/search/saved-page/add-to-page-modal/add-to-page-modal.component.html b/app/db/src/app/search/components/add-to-page-modal/add-to-page-modal.component.html
similarity index 100%
rename from app/db/src/app/search/saved-page/add-to-page-modal/add-to-page-modal.component.html
rename to app/db/src/app/search/components/add-to-page-modal/add-to-page-modal.component.html
diff --git a/app/db/src/app/search/saved-page/add-to-page-modal/add-to-page-modal.component.scss b/app/db/src/app/search/components/add-to-page-modal/add-to-page-modal.component.scss
similarity index 100%
rename from app/db/src/app/search/saved-page/add-to-page-modal/add-to-page-modal.component.scss
rename to app/db/src/app/search/components/add-to-page-modal/add-to-page-modal.component.scss
diff --git a/app/db/src/app/search/saved-page/add-to-page-modal/add-to-page-modal.component.ts b/app/db/src/app/search/components/add-to-page-modal/add-to-page-modal.component.ts
similarity index 100%
rename from app/db/src/app/search/saved-page/add-to-page-modal/add-to-page-modal.component.ts
rename to app/db/src/app/search/components/add-to-page-modal/add-to-page-modal.component.ts
diff --git a/app/db/src/app/search/saved-page/page-edit-modal/page-edit-modal.component.html b/app/db/src/app/search/components/page-edit-modal/page-edit-modal.component.html
similarity index 100%
rename from app/db/src/app/search/saved-page/page-edit-modal/page-edit-modal.component.html
rename to app/db/src/app/search/components/page-edit-modal/page-edit-modal.component.html
diff --git a/app/db/src/app/search/saved-page/page-edit-modal/page-edit-modal.component.scss b/app/db/src/app/search/components/page-edit-modal/page-edit-modal.component.scss
similarity index 100%
rename from app/db/src/app/search/saved-page/page-edit-modal/page-edit-modal.component.scss
rename to app/db/src/app/search/components/page-edit-modal/page-edit-modal.component.scss
diff --git a/app/db/src/app/search/saved-page/page-edit-modal/page-edit-modal.component.ts b/app/db/src/app/search/components/page-edit-modal/page-edit-modal.component.ts
similarity index 100%
rename from app/db/src/app/search/saved-page/page-edit-modal/page-edit-modal.component.ts
rename to app/db/src/app/search/components/page-edit-modal/page-edit-modal.component.ts