diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index 41afbf2115..4866cf3b60 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { BehaviorSubject, of as observableOf, Observable, Subject } from 'rxjs';
 import { filter, flatMap, map, startWith, switchMap, take, tap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
-import { SearchService } from '../+search-page/search-service/search.service';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
+import { SearchService } from '../core/shared/search/search.service';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { PaginatedList } from '../core/data/paginated-list';
diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts
index bdeffa34f3..96b2bde3d5 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/+collection-page/collection-page.module.ts
@@ -9,7 +9,7 @@ import { CreateCollectionPageComponent } from './create-collection-page/create-c
 import { CollectionFormComponent } from './collection-form/collection-form.component';
 import { EditCollectionPageComponent } from './edit-collection-page/edit-collection-page.component';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
-import { SearchService } from '../+search-page/search-service/search.service';
+import { SearchService } from '../core/shared/search/search.service';
 
 @NgModule({
   imports: [
diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts
index 48a7a05f45..efa97ce633 100644
--- a/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts
+++ b/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts
@@ -5,7 +5,7 @@ import { GenericItemPageFieldComponent } from '../../field-components/specific-f
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { SearchFixedFilterService } from '../../../../core/shared/search/search-fixed-filter.service';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.spec.ts b/src/app/+item-page/simple/item-types/shared/item.component.spec.ts
index 95235c5a72..d791241683 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.spec.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.spec.ts
@@ -10,7 +10,7 @@ import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angula
 import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { isNotEmpty } from '../../../../shared/empty.util';
-import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { SearchFixedFilterService } from '../../../../core/shared/search/search-fixed-filter.service';
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { RemoteData } from '../../../../core/data/remote-data';
diff --git a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts b/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
index e76a9cf3d0..22e9685e89 100644
--- a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
+++ b/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
@@ -4,7 +4,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { SearchFixedFilterService } from '../../../../core/shared/search/search-fixed-filter.service';
 import { Item } from '../../../../core/shared/item.model';
 
 describe('RelatedEntitiesSearchComponent', () => {
diff --git a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts b/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
index 672655a8b8..458567056b 100644
--- a/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
+++ b/src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
-import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { SearchFixedFilterService } from '../../../../core/shared/search/search-fixed-filter.service';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { of } from 'rxjs/internal/observable/of';
 
diff --git a/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts
index 38d6769437..9f8ab3e56c 100644
--- a/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts
+++ b/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts
@@ -1,10 +1,10 @@
 import { of as observableOf } from 'rxjs';
 
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { SearchFilter } from '../+search-page/search-filter.model';
+import { SearchFilter } from '../shared/search/search-filter.model';
 import { ActivatedRouteStub } from '../shared/testing/active-router-stub';
 import { MockRoleService } from '../shared/mocks/mock-role-service';
 import { cold, hot } from 'jasmine-marbles';
diff --git a/src/app/+my-dspace-page/my-dspace-configuration.service.ts b/src/app/+my-dspace-page/my-dspace-configuration.service.ts
index 705ec897f8..97f8f327c9 100644
--- a/src/app/+my-dspace-page/my-dspace-configuration.service.ts
+++ b/src/app/+my-dspace-page/my-dspace-configuration.service.ts
@@ -6,12 +6,12 @@ import { first, map } from 'rxjs/operators';
 
 import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
 import { RoleService } from '../core/roles/role.service';
-import { SearchConfigurationOption } from '../+search-page/search-switch-configuration/search-configuration-option.model';
-import { SearchConfigurationService } from '../+search-page/search-service/search-configuration.service';
+import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { RouteService } from '../shared/services/route.service';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { SearchFixedFilterService } from '../core/shared/search/search-fixed-filter.service';
 
 /**
  * Service that performs all actions that have to do with the current mydspace configuration
diff --git a/src/app/+my-dspace-page/my-dspace-page.component.spec.ts b/src/app/+my-dspace-page/my-dspace-page.component.spec.ts
index 9658814a6a..1144341d29 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.spec.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.component.spec.ts
@@ -20,15 +20,15 @@ import { MyDSpacePageComponent, SEARCH_CONFIG_SERVICE } from './my-dspace-page.c
 import { RouteService } from '../shared/services/route.service';
 import { routeServiceStub } from '../shared/testing/route-service-stub';
 import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service-stub';
-import { SearchService } from '../+search-page/search-service/search.service';
-import { SearchConfigurationService } from '../+search-page/search-service/search-configuration.service';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
-import { SearchSidebarService } from '../+search-page/search-sidebar/search-sidebar.service';
-import { SearchFilterService } from '../+search-page/search-filters/search-filter/search-filter.service';
+import { SearchService } from '../core/shared/search/search.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
+import { SearchSidebarService } from '../core/shared/search/search-sidebar.service';
+import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { RoleDirective } from '../shared/roles/role.directive';
 import { RoleService } from '../core/roles/role.service';
 import { MockRoleService } from '../shared/mocks/mock-role-service';
-import { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { SearchFixedFilterService } from '../core/shared/search/search-fixed-filter.service';
 
 describe('MyDSpacePageComponent', () => {
   let comp: MyDSpacePageComponent;
diff --git a/src/app/+my-dspace-page/my-dspace-page.component.ts b/src/app/+my-dspace-page/my-dspace-page.component.ts
index 251bf50bd1..c257898078 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.component.ts
@@ -15,16 +15,16 @@ import { RemoteData } from '../core/data/remote-data';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { pushInOut } from '../shared/animations/push';
 import { HostWindowService } from '../shared/host-window.service';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
-import { SearchService } from '../+search-page/search-service/search.service';
-import { SearchSidebarService } from '../+search-page/search-sidebar/search-sidebar.service';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SearchSidebarService } from '../core/shared/search/search-sidebar.service';
 import { hasValue } from '../shared/empty.util';
 import { getSucceededRemoteData } from '../core/shared/operators';
 import { MyDSpaceResult } from './my-dspace-result.model';
 import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
-import { SearchConfigurationOption } from '../+search-page/search-switch-configuration/search-configuration-option.model';
+import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
 import { RoleType } from '../core/roles/role-types';
-import { SearchConfigurationService } from '../+search-page/search-service/search-configuration.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
 import { ViewMode } from '../core/shared/view-mode.model';
 import { MyDSpaceRequest } from '../core/data/request.models';
diff --git a/src/app/+my-dspace-page/my-dspace-page.module.ts b/src/app/+my-dspace-page/my-dspace-page.module.ts
index 4b8cf37b7a..6c0b3334d4 100644
--- a/src/app/+my-dspace-page/my-dspace-page.module.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.module.ts
@@ -5,7 +5,6 @@ import { SharedModule } from '../shared/shared.module';
 
 import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
 import { MyDSpacePageComponent } from './my-dspace-page.component';
-import { SearchPageModule } from '../+search-page/search-page.module';
 import { MyDSpaceResultsComponent } from './my-dspace-results/my-dspace-results.component';
 import { WorkspaceitemMyDSpaceResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workspaceitem-my-dspace-result/workspaceitem-my-dspace-result-list-element.component';
 import { ItemMyDSpaceResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/item-my-dspace-result/item-my-dspace-result-list-element.component';
@@ -26,7 +25,6 @@ import { MyDSpaceConfigurationService } from './my-dspace-configuration.service'
     CommonModule,
     SharedModule,
     MyDspacePageRoutingModule,
-    SearchPageModule
   ],
   declarations: [
     MyDSpacePageComponent,
diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
index 3a16def9c1..a3df249c1f 100644
--- a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
@@ -4,7 +4,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { fadeIn, fadeInOut } from '../../shared/animations/fade';
 import { MyDSpaceResult } from '../my-dspace-result.model';
-import { SearchOptions } from '../../+search-page/search-options.model';
+import { SearchOptions } from '../../shared/search/search-options.model';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { isEmpty } from '../../shared/empty.util';
diff --git a/src/app/+search-page/filtered-search-page.component.spec.ts b/src/app/+search-page/filtered-search-page.component.spec.ts
index 59ab9d7b0d..e411a1c470 100644
--- a/src/app/+search-page/filtered-search-page.component.spec.ts
+++ b/src/app/+search-page/filtered-search-page.component.spec.ts
@@ -1,7 +1,7 @@
 import { FilteredSearchPageComponent } from './filtered-search-page.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { configureSearchComponentTestingModule } from './search-page.component.spec';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 
 describe('FilteredSearchPageComponent', () => {
   let comp: FilteredSearchPageComponent;
diff --git a/src/app/+search-page/filtered-search-page.component.ts b/src/app/+search-page/filtered-search-page.component.ts
index 66c619b823..ef427c5fd9 100644
--- a/src/app/+search-page/filtered-search-page.component.ts
+++ b/src/app/+search-page/filtered-search-page.component.ts
@@ -1,13 +1,13 @@
 import { HostWindowService } from '../shared/host-window.service';
-import { SearchService } from './search-service/search.service';
-import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
+import { SearchService } from '../core/shared/search/search.service';
+import { SearchSidebarService } from '../core/shared/search/search-sidebar.service';
 import { SearchPageComponent } from './search-page.component';
 import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
 import { pushInOut } from '../shared/animations/push';
 import { RouteService } from '../shared/services/route.service';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { Observable } from 'rxjs';
-import { PaginatedSearchOptions } from './paginated-search-options.model';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
 import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
 import { map } from 'rxjs/operators';
 
diff --git a/src/app/+search-page/search-filters/search-filters.component.scss b/src/app/+search-page/search-filters/search-filters.component.scss
deleted file mode 100644
index 628c8ed46f..0000000000
--- a/src/app/+search-page/search-filters/search-filters.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../styles/variables.scss';
-@import '../../../styles/mixins.scss';
\ No newline at end of file
diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
index 88c7c693d3..abc7b2e820 100644
--- a/src/app/+search-page/search-page.component.spec.ts
+++ b/src/app/+search-page/search-page.component.spec.ts
@@ -11,20 +11,20 @@ import { CommunityDataService } from '../core/data/community-data.service';
 import { HostWindowService } from '../shared/host-window.service';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { SearchPageComponent } from './search-page.component';
-import { SearchService } from './search-service/search.service';
+import { SearchService } from '../core/shared/search/search.service';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { By } from '@angular/platform-browser';
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
-import { SearchFilterService } from './search-filters/search-filter/search-filter.service';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
+import { SearchSidebarService } from '../core/shared/search/search-sidebar.service';
+import { SearchFilterService } from '../core/shared/search/search-filter.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { RemoteData } from '../core/data/remote-data';
 import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
 import { RouteService } from '../shared/services/route.service';
 import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service-stub';
-import { PaginatedSearchOptions } from './paginated-search-options.model';
-import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
+import { SearchFixedFilterService } from '../core/shared/search/search-fixed-filter.service';
 
 let comp: SearchPageComponent;
 let fixture: ComponentFixture<SearchPageComponent>;
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index f23bff96f3..b343391478 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -6,12 +6,12 @@ import { RemoteData } from '../core/data/remote-data';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { pushInOut } from '../shared/animations/push';
 import { HostWindowService } from '../shared/host-window.service';
-import { PaginatedSearchOptions } from './paginated-search-options.model';
-import { SearchResult } from './search-result.model';
-import { SearchService } from './search-service/search.service';
-import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
+import { SearchResult } from '../shared/search/search-result.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SearchSidebarService } from '../core/shared/search/search-sidebar.service';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { getSucceededRemoteData } from '../core/shared/operators';
 import { RouteService } from '../shared/services/route.service';
 import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
index 117c94abbc..c63fa40634 100644
--- a/src/app/+search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -4,62 +4,11 @@ import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { SearchPageRoutingModule } from './search-page-routing.module';
 import { SearchPageComponent } from './search-page.component';
-import { SearchResultsComponent } from './search-results/search-results.component';
-import { ItemSearchResultGridElementComponent } from '../shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component';
-import { CommunitySearchResultGridElementComponent } from '../shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component'
-import { CollectionSearchResultGridElementComponent } from '../shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
-import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
-import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
-import { SearchSidebarEffects } from './search-sidebar/search-sidebar.effects';
-import { SearchSettingsComponent } from './search-settings/search-settings.component';
-import { EffectsModule } from '@ngrx/effects';
-import { SearchFiltersComponent } from './search-filters/search-filters.component';
-import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
-import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
-import { SearchFilterService } from './search-filters/search-filter/search-filter.service';
 import { FilteredSearchPageComponent } from './filtered-search-page.component';
-import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
-import { FilteredSearchPageGuard } from './filtered-search-page.guard';
-import { SearchLabelsComponent } from './search-labels/search-labels.component';
-import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
-import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
-import { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
-import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
-import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
-import { SearchFacetOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
-import { SearchFacetSelectedOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
-import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
-import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
-import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
 
-const effects = [
-  SearchSidebarEffects
-];
 
 const components = [
   SearchPageComponent,
-  // SearchResultsComponent,
-  SearchSidebarComponent,
-  SearchSettingsComponent,
-  ItemSearchResultGridElementComponent,
-  CollectionSearchResultGridElementComponent,
-  CommunitySearchResultGridElementComponent,
-  SearchFiltersComponent,
-  SearchFilterComponent,
-  SearchFacetFilterComponent,
-  SearchLabelsComponent,
-  SearchFacetFilterComponent,
-  SearchFacetFilterWrapperComponent,
-  SearchRangeFilterComponent,
-  SearchTextFilterComponent,
-  SearchHierarchyFilterComponent,
-  SearchBooleanFilterComponent,
-  SearchFacetOptionComponent,
-  SearchFacetSelectedOptionComponent,
-  SearchFacetRangeOptionComponent,
-  SearchSwitchConfigurationComponent,
-  SearchAuthorityFilterComponent,
   FilteredSearchPageComponent
 ];
 
@@ -68,32 +17,9 @@ const components = [
     SearchPageRoutingModule,
     CommonModule,
     SharedModule,
-    EffectsModule.forFeature(effects),
     CoreModule.forRoot()
   ],
   declarations: components,
-  providers: [
-    SearchSidebarService,
-    SearchFilterService,
-    SearchFixedFilterService,
-    FilteredSearchPageGuard,
-    SearchFilterService,
-    SearchConfigurationService
-  ],
-  entryComponents: [
-    ItemSearchResultGridElementComponent,
-    CollectionSearchResultGridElementComponent,
-    CommunitySearchResultGridElementComponent,
-    SearchFacetFilterComponent,
-    SearchRangeFilterComponent,
-    SearchTextFilterComponent,
-    SearchHierarchyFilterComponent,
-    SearchBooleanFilterComponent,
-    SearchFacetOptionComponent,
-    SearchFacetSelectedOptionComponent,
-    SearchFacetRangeOptionComponent,
-    SearchAuthorityFilterComponent
-  ],
   exports: components
 })
 
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index bd2d832c67..03fa490bb3 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -20,7 +20,7 @@ import { Store, StoreModule } from '@ngrx/store';
 // Load the implementations that should be tested
 import { AppComponent } from './app.component';
 
-import { HostWindowState } from './shared/host-window.reducer';
+import { HostWindowState } from './shared/search/host-window.reducer';
 import { HostWindowResizeAction } from './shared/host-window.actions';
 
 import { MetadataService } from './core/metadata/metadata.service';
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 37cc791558..294df66db5 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -18,7 +18,7 @@ import { GLOBAL_CONFIG, GlobalConfig } from '../config';
 
 import { MetadataService } from './core/metadata/metadata.service';
 import { HostWindowResizeAction } from './shared/host-window.actions';
-import { HostWindowState } from './shared/host-window.reducer';
+import { HostWindowState } from './shared/search/host-window.reducer';
 import { NativeWindowRef, NativeWindowService } from './shared/services/window.service';
 import { isAuthenticated } from './core/auth/selectors';
 import { AuthService } from './core/auth/auth.service';
diff --git a/src/app/app.effects.ts b/src/app/app.effects.ts
index b4ddb24c8e..13ca475062 100644
--- a/src/app/app.effects.ts
+++ b/src/app/app.effects.ts
@@ -1,9 +1,11 @@
 import { StoreEffects } from './store.effects';
 import { NotificationsEffects } from './shared/notifications/notifications.effects';
 import { NavbarEffects } from './navbar/navbar.effects';
+import { SearchSidebarEffects } from './shared/search/search-sidebar/search-sidebar.effects';
 
 export const appEffects = [
   StoreEffects,
   NavbarEffects,
   NotificationsEffects,
+  SearchSidebarEffects
 ];
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index ea2512a974..b0ca9d697d 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -1,15 +1,15 @@
 import { ActionReducerMap, createSelector, MemoizedSelector } from '@ngrx/store';
 import * as fromRouter from '@ngrx/router-store';
-import { hostWindowReducer, HostWindowState } from './shared/host-window.reducer';
+import { hostWindowReducer, HostWindowState } from './shared/search/host-window.reducer';
 import { formReducer, FormState } from './shared/form/form.reducer';
 import {
   SearchSidebarState,
   sidebarReducer
-} from './+search-page/search-sidebar/search-sidebar.reducer';
+} from './shared/search/search-sidebar/search-sidebar.reducer';
 import {
   filterReducer,
   SearchFiltersState
-} from './+search-page/search-filters/search-filter/search-filter.reducer';
+} from './shared/search/search-filters/search-filter/search-filter.reducer';
 import {
   notificationsReducer,
   NotificationsState
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index b3523addc5..8c6ea1afe2 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -1,9 +1,9 @@
-import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
+import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
 import { RequestError } from '../data/request.models';
 import { PageInfo } from '../shared/page-info.model';
 import { ConfigObject } from '../config/models/config.model';
-import { FacetValue } from '../../+search-page/search-service/facet-value.model';
-import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model';
+import { FacetValue } from '../../shared/search/facet-value.model';
+import { SearchFilterConfig } from '../../shared/search/search-filter-config.model';
 import { IntegrationModel } from '../integration/models/integration.model';
 import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
 import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 3453c04af1..90231808e5 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -80,7 +80,7 @@ import { NormalizedObjectBuildService } from './cache/builders/normalized-object
 import { DSOChangeAnalyzer } from './data/dso-change-analyzer.service';
 import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
 import { DefaultChangeAnalyzer } from './data/default-change-analyzer.service';
-import { SearchService } from '../+search-page/search-service/search.service';
+import { SearchService } from './shared/search/search.service';
 import { RelationshipService } from './data/relationship.service';
 import { RoleService } from './roles/role.service';
 import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard';
@@ -95,6 +95,11 @@ import {
 } from './dspace-rest-v2/mocks/mock-response-map';
 import { EndpointMockingRestService } from './dspace-rest-v2/endpoint-mocking-rest.service';
 import { ENV_CONFIG, GLOBAL_CONFIG, GlobalConfig } from '../../config';
+import { SearchSidebarService } from './shared/search/search-sidebar.service';
+import { SearchFilterService } from './shared/search/search-filter.service';
+import { SearchFixedFilterService } from './shared/search/search-fixed-filter.service';
+import { FilteredSearchPageGuard } from '../+search-page/filtered-search-page.guard';
+import { SearchConfigurationService } from './shared/search/search-configuration.service';
 
 export const restServiceFactory = (cfg: GlobalConfig, mocks: MockResponseMap, http: HttpClient) => {
   // if (ENV_CONFIG.production) {
@@ -193,6 +198,13 @@ const PROVIDERS = [
   TaskResponseParsingService,
   ClaimedTaskDataService,
   PoolTaskDataService,
+  SearchService,
+  SearchSidebarService,
+  SearchFilterService,
+  SearchFixedFilterService,
+  FilteredSearchPageGuard,
+  SearchFilterService,
+  SearchConfigurationService,
   // register AuthInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
diff --git a/src/app/core/data/facet-config-response-parsing.service.ts b/src/app/core/data/facet-config-response-parsing.service.ts
index e65e317642..ecc3d0fcc8 100644
--- a/src/app/core/data/facet-config-response-parsing.service.ts
+++ b/src/app/core/data/facet-config-response-parsing.service.ts
@@ -7,7 +7,7 @@ import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
-import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model';
+import { SearchFilterConfig } from '../../shared/search/search-filter-config.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GlobalConfig } from '../../../config/global-config.interface';
diff --git a/src/app/core/data/facet-value-map-response-parsing.service.ts b/src/app/core/data/facet-value-map-response-parsing.service.ts
index e03c1a78df..f8f36c752d 100644
--- a/src/app/core/data/facet-value-map-response-parsing.service.ts
+++ b/src/app/core/data/facet-value-map-response-parsing.service.ts
@@ -9,7 +9,7 @@ import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
-import { FacetValue } from '../../+search-page/search-service/facet-value.model';
+import { FacetValue } from '../../shared/search/facet-value.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GlobalConfig } from '../../../config/global-config.interface';
diff --git a/src/app/core/data/facet-value-response-parsing.service.ts b/src/app/core/data/facet-value-response-parsing.service.ts
index e7665ebed2..418a58dc4f 100644
--- a/src/app/core/data/facet-value-response-parsing.service.ts
+++ b/src/app/core/data/facet-value-response-parsing.service.ts
@@ -4,7 +4,7 @@ import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
-import { FacetValue } from '../../+search-page/search-service/facet-value.model';
+import { FacetValue } from '../../shared/search/facet-value.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GLOBAL_CONFIG } from '../../../config';
diff --git a/src/app/core/data/mydspace-response-parsing.service.ts b/src/app/core/data/mydspace-response-parsing.service.ts
index a6945e27b4..bd5d5b1083 100644
--- a/src/app/core/data/mydspace-response-parsing.service.ts
+++ b/src/app/core/data/mydspace-response-parsing.service.ts
@@ -6,7 +6,7 @@ import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
 import { hasValue } from '../../shared/empty.util';
-import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
+import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
 import { MetadataMap, MetadataValue } from '../shared/metadata.models';
 
 @Injectable()
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index 81d9ed443e..1891769e65 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -64,11 +64,6 @@ export class RelationshipService {
     );
   }
 
-  /**
-   * Send a post request for a relationship by ID
-   * @param item1
-   * @param item2
-   */
   addRelationship(item1: Item, item2: Item): Observable<RestResponse> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       isNotEmptyOperator(),
diff --git a/src/app/core/data/search-response-parsing.service.ts b/src/app/core/data/search-response-parsing.service.ts
index 9ab0104393..8d30d6f873 100644
--- a/src/app/core/data/search-response-parsing.service.ts
+++ b/src/app/core/data/search-response-parsing.service.ts
@@ -6,7 +6,7 @@ import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
 import { hasValue } from '../../shared/empty.util';
-import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
+import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
 import { MetadataMap, MetadataValue } from '../shared/metadata.models';
 
 @Injectable()
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index 3118549169..66cf842f87 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -9,7 +9,7 @@ import { RequestService } from '../data/request.service';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
 import { PaginatedList } from '../data/paginated-list';
-import { SearchResult } from '../../+search-page/search-result.model';
+import { SearchResult } from '../../shared/search/search-result.model';
 import { Router } from '@angular/router';
 
 /**
diff --git a/src/app/+search-page/search-service/search-configuration.service.spec.ts b/src/app/core/shared/search/search-configuration.service.spec.ts
similarity index 94%
rename from src/app/+search-page/search-service/search-configuration.service.spec.ts
rename to src/app/core/shared/search/search-configuration.service.spec.ts
index fb95ab8d04..d9d3ce98a7 100644
--- a/src/app/+search-page/search-service/search-configuration.service.spec.ts
+++ b/src/app/core/shared/search/search-configuration.service.spec.ts
@@ -1,9 +1,9 @@
 import { SearchConfigurationService } from './search-configuration.service';
-import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { SearchFilter } from '../search-filter.model';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { SearchFilter } from '../../../shared/search/search-filter.model';
 import { of as observableOf } from 'rxjs';
 
 describe('SearchConfigurationService', () => {
diff --git a/src/app/+search-page/search-service/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
similarity index 93%
rename from src/app/+search-page/search-service/search-configuration.service.ts
rename to src/app/core/shared/search/search-configuration.service.ts
index 14fcdd8d60..bb30070450 100644
--- a/src/app/+search-page/search-service/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -10,17 +10,17 @@ import {
   Subscription
 } from 'rxjs';
 import { filter, flatMap, map, switchMap, tap } from 'rxjs/operators';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SearchOptions } from '../search-options.model';
-import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { RouteService } from '../../shared/services/route.service';
-import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
-import { RemoteData } from '../../core/data/remote-data';
-import { getSucceededRemoteData } from '../../core/shared/operators';
-import { SearchFilter } from '../search-filter.model';
-import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
-import { SearchFixedFilterService } from '../search-filters/search-filter/search-fixed-filter.service';
+import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SearchOptions } from '../../../shared/search/search-options.model';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { RouteService } from '../../../shared/services/route.service';
+import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
+import { RemoteData } from '../../data/remote-data';
+import { getSucceededRemoteData } from '../operators';
+import { SearchFilter } from '../../../shared/search/search-filter.model';
+import { DSpaceObjectType } from '../dspace-object-type.model';
+import { SearchFixedFilterService } from './search-fixed-filter.service';
 
 /**
  * Service that performs all actions that have to do with the current search configuration
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts b/src/app/core/shared/search/search-filter.service.spec.ts
similarity index 95%
rename from src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
rename to src/app/core/shared/search/search-filter.service.spec.ts
index e317a27698..32f3c2dd4c 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
+++ b/src/app/core/shared/search/search-filter.service.spec.ts
@@ -8,14 +8,14 @@ import {
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
   SearchFilterToggleAction
-} from './search-filter.actions';
-import { SearchFiltersState } from './search-filter.reducer';
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
-import { FilterType } from '../../search-service/filter-type.model';
+} from '../../../shared/search/search-filters/search-filter/search-filter.actions';
+import { SearchFiltersState } from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
+import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
+import { FilterType } from '../../../shared/search/filter-type.model';
 import { SearchFixedFilterService } from './search-fixed-filter.service';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
 import { of as observableOf } from 'rxjs';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
 
 describe('SearchFilterService', () => {
   let service: SearchFilterService;
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.service.ts b/src/app/core/shared/search/search-filter.service.ts
similarity index 94%
rename from src/app/+search-page/search-filters/search-filter/search-filter.service.ts
rename to src/app/core/shared/search/search-filter.service.ts
index 4b12417084..24ce25aa45 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.service.ts
+++ b/src/app/core/shared/search/search-filter.service.ts
@@ -1,7 +1,7 @@
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { mergeMap, map, distinctUntilChanged } from 'rxjs/operators';
 import { Injectable, InjectionToken } from '@angular/core';
-import { SearchFiltersState, SearchFilterState } from './search-filter.reducer';
+import { SearchFiltersState, SearchFilterState } from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import {
   SearchFilterCollapseAction,
@@ -11,14 +11,14 @@ import {
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
   SearchFilterToggleAction
-} from './search-filter.actions';
+} from '../../../shared/search/search-filters/search-filter/search-filter.actions';
 import { hasValue, isNotEmpty, } from '../../../shared/empty.util';
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
+import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
 import { RouteService } from '../../../shared/services/route.service';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SearchOptions } from '../../search-options.model';
-import { PaginatedSearchOptions } from '../../paginated-search-options.model';
+import { SearchOptions } from '../../../shared/search/search-options.model';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
 import { SearchFixedFilterService } from './search-fixed-filter.service';
 import { Params } from '@angular/router';
 import * as postcss from 'postcss';
diff --git a/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts b/src/app/core/shared/search/search-fixed-filter.service.spec.ts
similarity index 89%
rename from src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts
rename to src/app/core/shared/search/search-fixed-filter.service.spec.ts
index 3f6c2ef133..3e3372f7eb 100644
--- a/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts
+++ b/src/app/core/shared/search/search-fixed-filter.service.spec.ts
@@ -1,10 +1,10 @@
 import { SearchFixedFilterService } from './search-fixed-filter.service';
 import { RouteService } from '../../../shared/services/route.service';
-import { RequestService } from '../../../core/data/request.service';
-import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../hal-endpoint.service';
 import { of as observableOf } from 'rxjs';
-import { RequestEntry } from '../../../core/data/request.reducer';
-import { FilteredDiscoveryQueryResponse, RestResponse } from '../../../core/cache/response.models';
+import { RequestEntry } from '../../data/request.reducer';
+import { FilteredDiscoveryQueryResponse, RestResponse } from '../../cache/response.models';
 
 describe('SearchFixedFilterService', () => {
   let service: SearchFixedFilterService;
diff --git a/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts b/src/app/core/shared/search/search-fixed-filter.service.ts
similarity index 80%
rename from src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts
rename to src/app/core/shared/search/search-fixed-filter.service.ts
index 0f17b508c9..5c71770085 100644
--- a/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts
+++ b/src/app/core/shared/search/search-fixed-filter.service.ts
@@ -1,16 +1,16 @@
 import { Injectable } from '@angular/core';
 import { flatMap, map, switchMap, tap } from 'rxjs/operators';
 import { Observable, of as observableOf } from 'rxjs';
-import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
-import { GetRequest, RestRequest } from '../../../core/data/request.models';
-import { RequestService } from '../../../core/data/request.service';
-import { ResponseParsingService } from '../../../core/data/parsing.service';
-import { GenericConstructor } from '../../../core/shared/generic-constructor';
-import { FilteredDiscoveryPageResponseParsingService } from '../../../core/data/filtered-discovery-page-response-parsing.service';
+import { HALEndpointService } from '../hal-endpoint.service';
+import { GetRequest, RestRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+import { ResponseParsingService } from '../../data/parsing.service';
+import { GenericConstructor } from '../generic-constructor';
+import { FilteredDiscoveryPageResponseParsingService } from '../../data/filtered-discovery-page-response-parsing.service';
 import { hasValue } from '../../../shared/empty.util';
-import { configureRequest, getResponseFromEntry } from '../../../core/shared/operators';
+import { configureRequest, getResponseFromEntry } from '../operators';
 import { RouteService } from '../../../shared/services/route.service';
-import { FilteredDiscoveryQueryResponse } from '../../../core/cache/response.models';
+import { FilteredDiscoveryQueryResponse } from '../../cache/response.models';
 
 /**
  * Service for performing actions on the filtered-discovery-pages REST endpoint
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.service.spec.ts b/src/app/core/shared/search/search-sidebar.service.spec.ts
similarity index 96%
rename from src/app/+search-page/search-sidebar/search-sidebar.service.spec.ts
rename to src/app/core/shared/search/search-sidebar.service.spec.ts
index 0cccf9ea40..b6ad88ad0d 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.service.spec.ts
+++ b/src/app/core/shared/search/search-sidebar.service.spec.ts
@@ -3,7 +3,7 @@ import { SearchSidebarService } from './search-sidebar.service';
 import { AppState } from '../../app.reducer';
 import { async, TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from './search-sidebar.actions';
+import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from '../../../shared/search/search-sidebar/search-sidebar.actions';
 import { HostWindowService } from '../../shared/host-window.service';
 
 describe('SearchSidebarService', () => {
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.service.ts b/src/app/core/shared/search/search-sidebar.service.ts
similarity index 86%
rename from src/app/+search-page/search-sidebar/search-sidebar.service.ts
rename to src/app/core/shared/search/search-sidebar.service.ts
index 7185984538..a61f4e1878 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.service.ts
+++ b/src/app/core/shared/search/search-sidebar.service.ts
@@ -1,10 +1,10 @@
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { SearchSidebarState } from './search-sidebar.reducer';
+import { SearchSidebarState } from '../../../shared/search/search-sidebar/search-sidebar.reducer';
 import { createSelector, select, Store } from '@ngrx/store';
-import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from './search-sidebar.actions';
-import { AppState } from '../../app.reducer';
-import { HostWindowService } from '../../shared/host-window.service';
+import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from '../../../shared/search/search-sidebar/search-sidebar.actions';
+import { AppState } from '../../../app.reducer';
+import { HostWindowService } from '../../../shared/host-window.service';
 import { map } from 'rxjs/operators';
 
 const sidebarStateSelector = (state: AppState) => state.searchSidebar;
diff --git a/src/app/+search-page/search-service/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
similarity index 86%
rename from src/app/+search-page/search-service/search.service.spec.ts
rename to src/app/core/shared/search/search.service.spec.ts
index 9ec5bc35f2..ba25aef935 100644
--- a/src/app/+search-page/search-service/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -5,29 +5,29 @@ import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { SearchService } from './search.service';
-import { ItemDataService } from './../../core/data/item-data.service';
-import { SetViewMode } from '../../shared/view-mode';
-import { GLOBAL_CONFIG } from '../../../config';
-import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
+import { ItemDataService } from '../../data/item-data.service';
+import { SetViewMode } from '../../../shared/view-mode';
+import { GLOBAL_CONFIG } from '../../../../config';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { Router, UrlTree } from '@angular/router';
-import { RequestService } from '../../core/data/request.service';
-import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
-import { RouterStub } from '../../shared/testing/router-stub';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { RequestService } from '../../data/request.service';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
+import { RouterStub } from '../../../shared/testing/router-stub';
+import { HALEndpointService } from '../hal-endpoint.service';
 import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { RequestEntry } from '../../core/data/request.reducer';
-import { getMockRequestService } from '../../shared/mocks/mock-request.service';
-import { FacetConfigSuccessResponse, SearchSuccessResponse } from '../../core/cache/response.models';
-import { SearchQueryResponse } from './search-query-response.model';
-import { SearchFilterConfig } from './search-filter-config.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestEntry } from '../../data/request.reducer';
+import { getMockRequestService } from '../../../shared/mocks/mock-request.service';
+import { FacetConfigSuccessResponse, SearchSuccessResponse } from '../../cache/response.models';
+import { SearchQueryResponse } from '../../../shared/search/search-query-response.model';
+import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
+import { CommunityDataService } from '../../data/community-data.service';
+import { ViewMode } from '../view-mode.model';
+import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
 import { map } from 'rxjs/operators';
-import { RouteService } from '../../shared/services/route.service';
-import { routeServiceStub } from '../../shared/testing/route-service-stub';
+import { RouteService } from '../../../shared/services/route.service';
+import { routeServiceStub } from '../../../shared/testing/route-service-stub';
 
 @Component({ template: '' })
 class DummyComponent {
diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/core/shared/search/search.service.ts
similarity index 85%
rename from src/app/+search-page/search-service/search.service.ts
rename to src/app/core/shared/search/search.service.ts
index 598657a1b2..bf9a2fa353 100644
--- a/src/app/+search-page/search-service/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -2,47 +2,47 @@ import { combineLatest as observableCombineLatest, Observable, of as observableO
 import { Injectable, OnDestroy } from '@angular/core';
 import { NavigationExtras, PRIMARY_OUTLET, Router, UrlSegmentGroup } from '@angular/router';
 import { first, map, switchMap } from 'rxjs/operators';
-import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import {
   FacetConfigSuccessResponse,
   FacetValueSuccessResponse,
   SearchSuccessResponse
-} from '../../core/cache/response.models';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { ResponseParsingService } from '../../core/data/parsing.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { GetRequest, RestRequest } from '../../core/data/request.models';
-import { RequestService } from '../../core/data/request.service';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+} from '../../cache/response.models';
+import { PaginatedList } from '../../data/paginated-list';
+import { ResponseParsingService } from '../../data/parsing.service';
+import { RemoteData } from '../../data/remote-data';
+import { GetRequest, RestRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+import { DSpaceObject } from '../dspace-object.model';
+import { GenericConstructor } from '../generic-constructor';
+import { HALEndpointService } from '../hal-endpoint.service';
 import {
   configureRequest,
   filterSuccessfulResponses,
   getResponseFromEntry,
   getSucceededRemoteData
-} from '../../core/shared/operators';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { hasValue, isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
-import { NormalizedSearchResult } from '../normalized-search-result.model';
-import { SearchOptions } from '../search-options.model';
-import { SearchResult } from '../search-result.model';
-import { FacetValue } from './facet-value.model';
-import { SearchFilterConfig } from './search-filter-config.model';
-import { SearchResponseParsingService } from '../../core/data/search-response-parsing.service';
-import { SearchQueryResponse } from './search-query-response.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { getSearchResultFor } from './search-result-element-decorator';
-import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { FacetValueResponseParsingService } from '../../core/data/facet-value-response-parsing.service';
-import { FacetConfigResponseParsingService } from '../../core/data/facet-config-response-parsing.service';
-import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { Community } from '../../core/shared/community.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { ResourceType } from '../../core/shared/resource-type';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { RouteService } from '../../shared/services/route.service';
+} from '../operators';
+import { URLCombiner } from '../../url-combiner/url-combiner';
+import { hasValue, isEmpty, isNotEmpty, isNotUndefined } from '../../../shared/empty.util';
+import { NormalizedSearchResult } from '../../../shared/search/normalized-search-result.model';
+import { SearchOptions } from '../../../shared/search/search-options.model';
+import { SearchResult } from '../../../shared/search/search-result.model';
+import { FacetValue } from '../../../shared/search/facet-value.model';
+import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
+import { SearchResponseParsingService } from '../../data/search-response-parsing.service';
+import { SearchQueryResponse } from '../../../shared/search/search-query-response.model';
+import { PageInfo } from '../page-info.model';
+import { getSearchResultFor } from '../../../shared/search/search-result-element-decorator';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service';
+import { FacetConfigResponseParsingService } from '../../data/facet-config-response-parsing.service';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { Community } from '../community.model';
+import { CommunityDataService } from '../../data/community-data.service';
+import { ViewMode } from '../view-mode.model';
+import { ResourceType } from '../resource-type';
+import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
+import { RouteService } from '../../../shared/services/route.service';
 
 /**
  * Service that performs all general actions that have to do with the search page
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
index ec91561eb9..1b62fab64d 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -3,7 +3,7 @@ import { Observable ,  of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
 import { ITEM } from '../../../../shared/items/switcher/item-type-switcher.component';
-import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { SearchFixedFilterService } from '../../../../core/shared/search/search-fixed-filter.service';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
 import {
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
index 5ec553222b..4203d43021 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
@@ -2,9 +2,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
 import { DSOSelectorComponent } from './dso-selector.component';
-import { SearchService } from '../../../+search-page/search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
+import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../core/shared/item.model';
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 04501e4923..6b3f6768af 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -12,12 +12,12 @@ import { FormControl } from '@angular/forms';
 
 import { Observable } from 'rxjs';
 import { debounceTime, startWith, switchMap } from 'rxjs/operators';
-import { SearchService } from '../../../+search-page/search-service/search.service';
-import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 
 @Component({
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html
index c532cd9575..06688d2de1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html
@@ -1,89 +1,116 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">Choose a {{fieldName}}</h4>
     <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
-            (click)="modal.dismiss('Cross click')">
+            (click)="modal.dismiss()">
         <span aria-hidden="true">&times;</span>
     </button>
 </div>
-<div class="modal-body" *ngVar="(resultsRD$ | async) as resultsRD">
-    <form class="input-group mb-3" #queryForm="ngForm" (ngSubmit)="search(queryForm.value.query)">
-        <input type="text" class="form-control" name="query" placeholder="Search query"
-               [ngModel]="searchQuery">
-        <div class="input-group-append">
-            <button class="btn btn-outline-secondary" type="submit">Go</button>
-        </div>
-    </form>
-    <ds-loading *ngIf="!resultsRD || resultsRD.isLoading"></ds-loading>
-    <div *ngIf="resultsRD?.hasSucceeded && resultsRD.payload.page.length > 0">
-        <div *ngIf="repeatable">
-            <div class="input-group mb-3">
-                <div class="input-group-prepend">
-                    <div class="input-group-text">
-                        <!-- In theory we don't need separate checkboxes for this,
-                        but I wasn't able to get this to work correctly without them.
-                        Checkboxes that are in the indeterminate state always switch to checked when clicked
-                        This seemed like the cleanest and clearest solution to solve this issue for now.
-                        -->
-                        <input *ngIf="!isAllSelected() && !isSomeSelected()" type="checkbox"
-                               [indeterminate]="false"
-                               (change)="selectAll()">
-                        <input *ngIf="!isAllSelected() && isSomeSelected()" type="checkbox"
-                               [indeterminate]="true"
-                               (change)="deselectAll()">
-                        <input *ngIf="isAllSelected()" type="checkbox"
-                               [checked]="true"
-                               (change)="deselectAll()">
+<div class="search-page">
+    <div class="modal-body" *ngVar="(resultsRD$ | async) as resultsRD">
+        <div class="row">
+            <ds-search-sidebar class="col-4" id="search-sidebar"
+                               [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
+                               [inPlaceSearch]="true"></ds-search-sidebar>
+            <div class="col-8">
+                <form class="input-group mb-3" #queryForm="ngForm"
+                      (ngSubmit)="search(queryForm.value.query)">
+                    <input type="text" class="form-control" name="query" placeholder="Search query"
+                           [ngModel]="searchQuery">
+                    <div class="input-group-append">
+                        <button class="btn btn-outline-secondary" type="submit">Go</button>
                     </div>
+                </form>
+                <ds-loading *ngIf="!resultsRD || resultsRD.isLoading"></ds-loading>
+                <div *ngIf="resultsRD?.hasSucceeded && resultsRD.payload.page.length > 0">
+                    <div *ngIf="repeatable">
+                        <div class="input-group mb-3">
+                            <div class="input-group-prepend">
+                                <div class="input-group-text">
+                                    <!-- In theory we don't need separate checkboxes for this,
+                                    but I wasn't able to get this to work correctly without them.
+                                    Checkboxes that are in the indeterminate state always switch to checked when clicked
+                                    This seemed like the cleanest and clearest solution to solve this issue for now.
+                                    -->
+                                    <input *ngIf="!isAllSelected() && !isSomeSelected()"
+                                           type="checkbox"
+                                           [indeterminate]="false"
+                                           (change)="selectAll()">
+                                    <input *ngIf="!isAllSelected() && isSomeSelected()"
+                                           type="checkbox"
+                                           [indeterminate]="true"
+                                           (change)="deselectAll()">
+                                    <input *ngIf="isAllSelected()" type="checkbox"
+                                           [checked]="true"
+                                           (change)="deselectAll()">
+                                </div>
+                            </div>
+                            <button *ngIf="selectAllLoading" type="button"
+                                    class="btn btn-outline-secondary">
+                            <span class="spinner-border spinner-border-sm" role="status"
+                                  aria-hidden="true"></span>
+                                <span class="sr-only">Loading...</span>
+                            </button>
+                            <div ngbDropdown class="input-group-append">
+                                <button *ngIf="!selectAllLoading" id="resultdropdown" type="button"
+                                        ngbDropdownToggle
+                                        class="btn btn-outline-secondary dropdown-toggle-split"
+                                        data-toggle="dropdown" aria-haspopup="true"
+                                        aria-expanded="false">
+                                    <span class="sr-only">Toggle Dropdown</span>
+                                </button>
+
+                                <div ngbDropdownMenu aria-labelledby="resultdropdown">
+                                    <button class="dropdown-item"
+                                            (click)="selectPage(resultsRD?.payload?.page)">Select
+                                        page
+                                    </button>
+                                    <button class="dropdown-item"
+                                            (click)="deselectPage(resultsRD?.payload?.page)">
+                                        Deselect
+                                        page
+                                    </button>
+                                    <button class="dropdown-item" (click)="selectAll()">Select all
+                                    </button>
+                                    <button class="dropdown-item" (click)="deselectAll()">Deselect
+                                        all
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <ds-pagination
+                            [paginationOptions]="searchConfig.pagination"
+                            [collectionSize]="resultsRD?.payload?.totalElements"
+                            [sortOptions]="searchConfig.sort"
+                            [hideGear]="true"
+                            [hidePagerWhenSinglePage]="true"
+                            (paginationChange)="onPaginationChange($event.pagination)">
+                        <div class="form-check"
+                             *ngFor="let result of resultsRD?.payload?.page; let i = index">
+                            <input *ngIf="repeatable" class="form-check-input" type="checkbox"
+                                   [name]="'checkbox' + i"
+                                   [id]="'object'+i"
+                                   [checked]="isSelected(result.indexableObject)"
+                                   [disabled]="isDisabled(result.indexableObject)"
+                                   (change)="selectCheckbox($event.currentTarget.checked, result.indexableObject)">
+                            <input *ngIf="!repeatable" class="form-check-input" type="radio"
+                                   [name]="'radio' + i"
+                                   [id]="'object'+i"
+                                   [checked]="isSelected(result.indexableObject)"
+                                   (change)="selectRadio($event.currentTarget.checked, result.indexableObject)">
+                            <label class="form-check-label" [for]="'object'+i">
+                                <ds-wrapper-list-element class="result-list-element"
+                                                         [object]="result"
+                                                         [index]="i"></ds-wrapper-list-element>
+                            </label>
+                        </div>
+                    </ds-pagination>
                 </div>
-                <div ngbDropdown class="input-group-append">
-                    <button id="resultdropdown" type="button" ngbDropdownToggle
-                            class="btn btn-outline-secondary dropdown-toggle-split"
-                            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <div ngbDropdownMenu aria-labelledby="resultdropdown">
-                        <button class="dropdown-item"
-                                (click)="selectPage(resultsRD?.payload?.page)">Select page
-                        </button>
-                        <button class="dropdown-item"
-                                (click)="deselectPage(resultsRD?.payload?.page)">Deselect
-                            page
-                        </button>
-                        <button class="dropdown-item" (click)="selectAll()">Select all</button>
-                        <button class="dropdown-item" (click)="deselectAll()">Deselect all</button>
-                    </div>
+                <div *ngIf="resultsRD?.hasSucceeded && resultsRD.payload.page.length === 0">
+                    {{ 'form.no-results' | translate}}
                 </div>
             </div>
         </div>
-        <ds-pagination
-                [paginationOptions]="searchConfig.pagination"
-                [collectionSize]="resultsRD?.payload?.totalElements"
-                [sortOptions]="searchConfig.sort"
-                [hideGear]="true"
-                [hidePagerWhenSinglePage]="true"
-                (paginationChange)="onPaginationChange($event.pagination)">
-            <div class="form-check" *ngFor="let result of resultsRD?.payload?.page; let i = index">
-                <input *ngIf="repeatable" class="form-check-input" type="checkbox"
-                       [name]="'checkbox' + i"
-                       [id]="'object'+i"
-                       [checked]="isSelected(result.indexableObject)"
-                       [disabled]="isDisabled(result.indexableObject)"
-                       (change)="selectCheckbox($event.currentTarget.checked, result.indexableObject)">
-                <input *ngIf="!repeatable" class="form-check-input" type="radio"
-                       [name]="'radio' + i"
-                       [id]="'object'+i"
-                       [checked]="isSelected(result.indexableObject)"
-                       (change)="selectRadio($event.currentTarget.checked, result.indexableObject)">
-                <label class="form-check-label" [for]="'object'+i">
-                    <ds-wrapper-list-element class="result-list-element"
-                                             [object]="result"
-                                             [index]="i"></ds-wrapper-list-element>
-                </label>
-            </div>
-        </ds-pagination>
-    </div>
-    <div *ngIf="resultsRD?.hasSucceeded && resultsRD.payload.page.length === 0">
-        {{ 'form.no-results' | translate}}
     </div>
 </div>
 <div class="modal-footer">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts
index 90495bfe97..4f0f2d1fbe 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts
@@ -1,16 +1,19 @@
 import { Component, OnInit } from '@angular/core';
 import { PaginatedList } from '../../../../../../core/data/paginated-list';
-import { SearchResult } from '../../../../../../+search-page/search-result.model';
+import { SearchResult } from '../../../../../search/search-result.model';
 import { RemoteData } from '../../../../../../core/data/remote-data';
 import { Observable, ReplaySubject } from 'rxjs';
-import { SearchService } from '../../../../../../+search-page/search-service/search.service';
-import { PaginatedSearchOptions } from '../../../../../../+search-page/paginated-search-options.model';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model';
 import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { hasNoValue, hasValue, isNotEmpty } from '../../../../../empty.util';
 import { getSucceededRemoteData } from '../../../../../../core/shared/operators';
-import { concat, map, multicast, take, takeWhile } from 'rxjs/operators';
+import { concat, map, multicast, take, takeWhile, tap } from 'rxjs/operators';
+import { Router } from '@angular/router';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 
 const RELATION_TYPE_FILTER_PREFIX = 'f.entityType=';
 
@@ -20,7 +23,13 @@ const RELATION_TYPE_METADATA_PREFIX = 'relation.isPublicationOf';
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
   styleUrls: ['./dynamic-lookup-relation-modal.component.scss'],
-  templateUrl: './dynamic-lookup-relation-modal.component.html'
+  templateUrl: './dynamic-lookup-relation-modal.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
 })
 export class DsDynamicLookupRelationModalComponent implements OnInit {
   relationKey: string;
@@ -34,19 +43,22 @@ export class DsDynamicLookupRelationModalComponent implements OnInit {
   searchQuery;
   initialPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'submission-relation-list',
-    pageSize: 5
+    pageSize: 10
   });
+  selectAllLoading = false;
 
-  constructor(public modal: NgbActiveModal, private searchService: SearchService) {
+  constructor(public modal: NgbActiveModal, private searchService: SearchService, private router: Router) {
   }
 
   ngOnInit(): void {
+    this.resetRoute();
     this.fieldName = this.relationKey.substring(RELATION_TYPE_METADATA_PREFIX.length);
     this.onPaginationChange(this.initialPagination);
   }
 
   search(query: string) {
     this.searchQuery = query;
+    this.resetRoute();
     this.onPaginationChange(this.initialPagination);
     this.deselectAll();
   }
@@ -118,6 +130,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit {
 
   selectAll() {
     this.allSelected = true;
+    this.selectAllLoading = true;
     const fullPagination = Object.assign(new PaginationComponentOptions(), {
       query: this.searchQuery,
       currentPage: 1,
@@ -127,7 +140,8 @@ export class DsDynamicLookupRelationModalComponent implements OnInit {
     const results = this.searchService.search(fullSearchConfig);
     results.pipe(
       getSucceededRemoteData(),
-      map((resultsRD) => resultsRD.payload.page)
+      map((resultsRD) => resultsRD.payload.page),
+      tap(() => this.selectAllLoading = false)
     )
       .subscribe((results) =>
         this.selection = results
@@ -149,4 +163,10 @@ export class DsDynamicLookupRelationModalComponent implements OnInit {
   isSomeSelected() {
     return isNotEmpty(this.selection);
   }
+
+  resetRoute() {
+    this.router.navigate([], {
+      queryParams: Object.assign({}, { page: 1, query: this.searchQuery }),
+    });
+  }
 }
\ No newline at end of file
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts
index 88e1e974eb..7f49d75106 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts
@@ -11,6 +11,8 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component';
 import { DynamicLookupRelationModel } from './dynamic-lookup-relation.model';
 import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
+import { RelationshipService } from '../../../../../../core/data/relationship.service';
+import { Item } from '../../../../../../core/shared/item.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation',
@@ -28,11 +30,12 @@ export class DsDynamicLookupRelationComponent extends DynamicFormControlComponen
 
   modalRef: NgbModalRef;
   modalValuesString = '';
-  selectedResults: DSpaceObject[];
+  selectedResults: Item[];
 
   constructor(private modalService: NgbModal,
               protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService,
+              private relationService: RelationshipService
   ) {
     super(layoutService, validationService);
   }
@@ -45,7 +48,7 @@ export class DsDynamicLookupRelationComponent extends DynamicFormControlComponen
   }
 
   openLookup() {
-    this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent);
+    this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, { size: 'lg' });
     this.modalRef.componentInstance.repeatable = this.model.repeatable;
     this.modalRef.componentInstance.selection = this.selectedResults || [];
     this.modalRef.componentInstance.previousSelection = this.model.value || [];
@@ -65,6 +68,9 @@ export class DsDynamicLookupRelationComponent extends DynamicFormControlComponen
 
     this.modalValuesString = '';
     this.selectedResults = [];
+    this.selectedResults.forEach((item: Item) => {
+      this.relationService.addRelationship(this.model.item, item);
+    })
   }
 
   removeSelection(uuid: string) {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts
index 9530138305..93910fe5d5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts
@@ -1,11 +1,13 @@
 import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import { Item } from '../../../../../../core/shared/item.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_RELATION = 'LOOKUP_RELATION';
 
 export interface DynamicLookupRelationModelConfig extends DsDynamicInputModelConfig {
   value?: any;
   repeatable: boolean;
+  item: Item;
 }
 
 export class DynamicLookupRelationModel extends DsDynamicInputModel {
@@ -13,6 +15,7 @@ export class DynamicLookupRelationModel extends DsDynamicInputModel {
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_RELATION;
   @serializable() value: any[];
   @serializable() repeatable: boolean;
+  item: Item;
 
   constructor(config: DynamicLookupRelationModelConfig, layout?: DynamicFormControlLayout) {
 
@@ -21,6 +24,7 @@ export class DynamicLookupRelationModel extends DsDynamicInputModel {
     this.readOnly = true;
     this.disabled = true;
     this.repeatable = config.repeatable;
+    this.item = config.item;
     this.valueUpdates.next(config.value);
   }
 }
diff --git a/src/app/shared/host-window.reducer.spec.ts b/src/app/shared/host-window.reducer.spec.ts
index fa013b0f10..f0e7aa7245 100644
--- a/src/app/shared/host-window.reducer.spec.ts
+++ b/src/app/shared/host-window.reducer.spec.ts
@@ -1,5 +1,5 @@
 import * as deepFreeze from 'deep-freeze';
-import { hostWindowReducer } from './host-window.reducer';
+import { hostWindowReducer } from './search/host-window.reducer';
 import { HostWindowResizeAction } from './host-window.actions';
 
 class NullAction extends HostWindowResizeAction {
diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts
index 146c616e38..f556c7b7bd 100644
--- a/src/app/shared/host-window.service.ts
+++ b/src/app/shared/host-window.service.ts
@@ -1,7 +1,7 @@
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 
 import { filter, distinctUntilChanged, map } from 'rxjs/operators';
-import { HostWindowState } from './host-window.reducer';
+import { HostWindowState } from './search/host-window.reducer';
 import { Injectable } from '@angular/core';
 import { createSelector, select, Store } from '@ngrx/store';
 
diff --git a/src/app/shared/items/switcher/item-type-switcher.component.ts b/src/app/shared/items/switcher/item-type-switcher.component.ts
index 21a045b8f4..62dc1f612b 100644
--- a/src/app/shared/items/switcher/item-type-switcher.component.ts
+++ b/src/app/shared/items/switcher/item-type-switcher.component.ts
@@ -1,5 +1,5 @@
 import { Component, InjectionToken, Injector, Input, OnInit } from '@angular/core';
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { Item } from '../../../core/shared/item.model';
 import { hasValue } from '../../empty.util';
 import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
diff --git a/src/app/shared/object-collection/shared/claimed-task-my-dspace-result.model.ts b/src/app/shared/object-collection/shared/claimed-task-my-dspace-result.model.ts
index 051bfe6d9f..22ab544cf8 100644
--- a/src/app/shared/object-collection/shared/claimed-task-my-dspace-result.model.ts
+++ b/src/app/shared/object-collection/shared/claimed-task-my-dspace-result.model.ts
@@ -1,7 +1,7 @@
 import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 /**
  * Represents a search result object of a ClaimedTask object
diff --git a/src/app/shared/object-collection/shared/collection-search-result.model.ts b/src/app/shared/object-collection/shared/collection-search-result.model.ts
index 5e9afc59e5..3b32197533 100644
--- a/src/app/shared/object-collection/shared/collection-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/collection-search-result.model.ts
@@ -1,6 +1,6 @@
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { Collection } from '../../../core/shared/collection.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 @searchResultFor(Collection)
 export class CollectionSearchResult extends SearchResult<Collection> {
diff --git a/src/app/shared/object-collection/shared/community-search-result.model.ts b/src/app/shared/object-collection/shared/community-search-result.model.ts
index 8e371c182c..9ce936b5d8 100644
--- a/src/app/shared/object-collection/shared/community-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/community-search-result.model.ts
@@ -1,6 +1,6 @@
 import { Community } from '../../../core/shared/community.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { SearchResult } from '../../search/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 @searchResultFor(Community)
 export class CommunitySearchResult extends SearchResult<Community> {
diff --git a/src/app/shared/object-collection/shared/item-my-dspace-result.model.ts b/src/app/shared/object-collection/shared/item-my-dspace-result.model.ts
index 92724a762f..bd323f9509 100644
--- a/src/app/shared/object-collection/shared/item-my-dspace-result.model.ts
+++ b/src/app/shared/object-collection/shared/item-my-dspace-result.model.ts
@@ -1,6 +1,6 @@
 import { Item } from '../../../core/shared/item.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { SearchResult } from '../../search/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
 
 /**
diff --git a/src/app/shared/object-collection/shared/item-search-result.model.ts b/src/app/shared/object-collection/shared/item-search-result.model.ts
index f20b3db1e3..89a9d782a6 100644
--- a/src/app/shared/object-collection/shared/item-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/item-search-result.model.ts
@@ -1,6 +1,6 @@
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { Item } from '../../../core/shared/item.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 @searchResultFor(Item)
 export class ItemSearchResult extends SearchResult<Item> {
diff --git a/src/app/shared/object-collection/shared/pool-task-my-dspace-result.model.ts b/src/app/shared/object-collection/shared/pool-task-my-dspace-result.model.ts
index 1bc2c4c4c2..f0debc964e 100644
--- a/src/app/shared/object-collection/shared/pool-task-my-dspace-result.model.ts
+++ b/src/app/shared/object-collection/shared/pool-task-my-dspace-result.model.ts
@@ -1,7 +1,7 @@
 import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 /**
  * Represents a search result object of a PoolTask object
diff --git a/src/app/shared/object-collection/shared/workflowitem-my-dspace-result.model.ts b/src/app/shared/object-collection/shared/workflowitem-my-dspace-result.model.ts
index 89f6f351ad..8c15694ae9 100644
--- a/src/app/shared/object-collection/shared/workflowitem-my-dspace-result.model.ts
+++ b/src/app/shared/object-collection/shared/workflowitem-my-dspace-result.model.ts
@@ -1,7 +1,7 @@
 import { Workflowitem } from '../../../core/submission/models/workflowitem.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 /**
  * Represents a search result object of a Workflowitem object
diff --git a/src/app/shared/object-collection/shared/workspaceitem-my-dspace-result.model.ts b/src/app/shared/object-collection/shared/workspaceitem-my-dspace-result.model.ts
index 20474c9ad3..bc148e67cb 100644
--- a/src/app/shared/object-collection/shared/workspaceitem-my-dspace-result.model.ts
+++ b/src/app/shared/object-collection/shared/workspaceitem-my-dspace-result.model.ts
@@ -1,7 +1,7 @@
 import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model';
 import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
+import { SearchResult } from '../../search/search-result.model';
 
 /**
  * Represents a search result object of a Workspaceitem object
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index 0961dc96ee..d62de6fc7f 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject } from '@angular/core';
 
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index 227d375f2a..79e936ed19 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { hasValue } from '../../empty.util';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 834e2dbcfe..014f01f152 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -15,7 +15,7 @@ import { isNumeric } from 'rxjs/internal-compatibility';
 import { isEqual, isObject, transform } from 'lodash';
 
 import { HostWindowService } from '../host-window.service';
-import { HostWindowState } from '../host-window.reducer';
+import { HostWindowState } from '../search/host-window.reducer';
 import { PaginationComponentOptions } from './pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { hasValue, isNotEmpty } from '../empty.util';
@@ -513,5 +513,4 @@ export class PaginationComponent implements OnDestroy, OnInit {
   get shouldShowBottomPager(): boolean {
     return this.hasMultiplePages || !this.hidePagerWhenSinglePage
   }
-
 }
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index a60aeb8054..c17e84c6c8 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -8,7 +8,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { Community } from '../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchService } from '../../core/shared/search/search.service';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 10c3a3ede7..4ecf5de7b6 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { hasValue, isNotEmpty } from '../empty.util';
 import { QueryParamsHandling } from '@angular/router/src/config';
 import { MYDSPACE_ROUTE } from '../../+my-dspace-page/my-dspace-page.component';
-import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchService } from '../../core/shared/search/search.service';
 
 /**
  * This component renders a simple item page.
diff --git a/src/app/+search-page/search-service/facet-value.model.ts b/src/app/shared/search/facet-value.model.ts
similarity index 100%
rename from src/app/+search-page/search-service/facet-value.model.ts
rename to src/app/shared/search/facet-value.model.ts
diff --git a/src/app/+search-page/search-service/filter-type.model.ts b/src/app/shared/search/filter-type.model.ts
similarity index 100%
rename from src/app/+search-page/search-service/filter-type.model.ts
rename to src/app/shared/search/filter-type.model.ts
diff --git a/src/app/shared/host-window.reducer.ts b/src/app/shared/search/host-window.reducer.ts
similarity index 83%
rename from src/app/shared/host-window.reducer.ts
rename to src/app/shared/search/host-window.reducer.ts
index f8287efdc1..17be02c992 100644
--- a/src/app/shared/host-window.reducer.ts
+++ b/src/app/shared/search/host-window.reducer.ts
@@ -1,4 +1,4 @@
-import { HostWindowAction, HostWindowActionTypes } from './host-window.actions';
+import { HostWindowAction, HostWindowActionTypes } from '../host-window.actions';
 
 export interface HostWindowState {
   width: number;
diff --git a/src/app/+search-page/normalized-search-result.model.ts b/src/app/shared/search/normalized-search-result.model.ts
similarity index 74%
rename from src/app/+search-page/normalized-search-result.model.ts
rename to src/app/shared/search/normalized-search-result.model.ts
index 32f3217b54..7f5631920a 100644
--- a/src/app/+search-page/normalized-search-result.model.ts
+++ b/src/app/shared/search/normalized-search-result.model.ts
@@ -1,6 +1,6 @@
 import { autoserialize, autoserializeAs } from 'cerialize';
-import { MetadataMap } from '../core/shared/metadata.models';
-import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
+import { MetadataMap } from '../../core/shared/metadata.models';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
 
 /**
  * Represents a normalized version of a search result object of a certain DSpaceObject
diff --git a/src/app/+search-page/paginated-search-options.model.spec.ts b/src/app/shared/search/paginated-search-options.model.spec.ts
similarity index 83%
rename from src/app/+search-page/paginated-search-options.model.spec.ts
rename to src/app/shared/search/paginated-search-options.model.spec.ts
index 22b3f146b2..2702c3ff01 100644
--- a/src/app/+search-page/paginated-search-options.model.spec.ts
+++ b/src/app/shared/search/paginated-search-options.model.spec.ts
@@ -1,7 +1,7 @@
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from './paginated-search-options.model';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 import { SearchFilter } from './search-filter.model';
 
 describe('PaginatedSearchOptions', () => {
diff --git a/src/app/+search-page/paginated-search-options.model.ts b/src/app/shared/search/paginated-search-options.model.ts
similarity index 82%
rename from src/app/+search-page/paginated-search-options.model.ts
rename to src/app/shared/search/paginated-search-options.model.ts
index 45cd0b8f09..13ab4cabea 100644
--- a/src/app/+search-page/paginated-search-options.model.ts
+++ b/src/app/shared/search/paginated-search-options.model.ts
@@ -1,9 +1,9 @@
-import { SortOptions } from '../core/cache/models/sort-options.model';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { isNotEmpty } from '../shared/empty.util';
+import { SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { isNotEmpty } from '../empty.util';
 import { SearchOptions } from './search-options.model';
 import { SearchFilter } from './search-filter.model';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 
 /**
  * This model class represents all parameters needed to request information about a certain page of a search request, in a certain order
diff --git a/src/app/+search-page/search-service/search-filter-config.model.ts b/src/app/shared/search/search-filter-config.model.ts
similarity index 100%
rename from src/app/+search-page/search-service/search-filter-config.model.ts
rename to src/app/shared/search/search-filter-config.model.ts
diff --git a/src/app/+search-page/search-filter.model.ts b/src/app/shared/search/search-filter.model.ts
similarity index 87%
rename from src/app/+search-page/search-filter.model.ts
rename to src/app/shared/search/search-filter.model.ts
index 2f81f67d83..9e93bafed8 100644
--- a/src/app/+search-page/search-filter.model.ts
+++ b/src/app/shared/search/search-filter.model.ts
@@ -1,7 +1,7 @@
 /**
  * Represents a search filter
  */
-import { hasValue } from '../shared/empty.util';
+import { hasValue } from '../empty.util';
 
 export class SearchFilter {
   key: string;
diff --git a/src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
similarity index 80%
rename from src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
index 33e354f2d8..c1252d7167 100644
--- a/src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../../../styles/variables';
+@import '../../../../../../styles/mixins';
 
 .filters {
     a {
diff --git a/src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
similarity index 88%
rename from src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index 83131e1344..99e9bfac2e 100644
--- a/src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FilterType } from '../../../search-service/filter-type.model';
+import { FilterType } from '../../../filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { FacetValue } from '../../../search-service/facet-value.model';
+import { FacetValue } from '../../../facet-value.model';
 
 @Component({
   selector: 'ds-search-authority-filter',
diff --git a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
similarity index 68%
rename from src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
index a28db359b5..fffa4d9fed 100644
--- a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../../../styles/variables';
+@import '../../../../../../styles/mixins';
 
 .filters {
     .toggle-more-filters a {
diff --git a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
similarity index 90%
rename from src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
index 5deaa34d29..49f361e75e 100644
--- a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FilterType } from '../../../search-service/filter-type.model';
+import { FilterType } from '../../../filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import {
   facetLoad,
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
similarity index 74%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
index 6452f2469b..0ff0933576 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../styles/variables';
 
 a {
     color: $body-color;
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
similarity index 88%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 245c0e3ddb..ff5db664db 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -3,17 +3,17 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { SearchFacetOptionComponent } from './search-facet-option.component';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../../search-service/filter-type.model';
-import { FacetValue } from '../../../../search-service/facet-value.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { FilterType } from '../../../../filter-type.model';
+import { FacetValue } from '../../../../facet-value.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../../shared/testing/search-service-stub';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../../testing/search-service-stub';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../../shared/testing/router-stub';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { SearchFilterService } from '../../search-filter.service';
+import { RouterStub } from '../../../../../testing/router-stub';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { By } from '@angular/platform-browser';
 
 describe('SearchFacetOptionComponent', () => {
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
similarity index 87%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index 1fccee3736..c22b487f5d 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -2,13 +2,13 @@ import { combineLatest as observableCombineLatest, Observable, Subscription } fr
 import { map } from 'rxjs/operators';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { FacetValue } from '../../../../search-service/facet-value.model';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchFilterService } from '../../search-filter.service';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { hasValue } from '../../../../../shared/empty.util';
-import { FilterType } from '../../../../search-service/filter-type.model';
+import { FacetValue } from '../../../../facet-value.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { hasValue } from '../../../../../empty.util';
+import { FilterType } from '../../../../filter-type.model';
 
 @Component({
   selector: 'ds-search-facet-option',
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss
similarity index 77%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss
index 7b5448b980..ce8caefe8c 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../styles/variables';
 
 a {
     color: $link-color;
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
similarity index 86%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
index d3264214ed..e6878dadd1 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
@@ -2,17 +2,17 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../../search-service/filter-type.model';
-import { FacetValue } from '../../../../search-service/facet-value.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { FilterType } from '../../../../filter-type.model';
+import { FacetValue } from '../../../../facet-value.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../../shared/testing/search-service-stub';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../../testing/search-service-stub';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../../shared/testing/router-stub';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { SearchFilterService } from '../../search-filter.service';
+import { RouterStub } from '../../../../../testing/router-stub';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { By } from '@angular/platform-browser';
 import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
 import {
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
similarity index 86%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index 54d5d535df..6b454f6ee2 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -2,16 +2,16 @@ import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { FacetValue } from '../../../../search-service/facet-value.model';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchFilterService } from '../../search-filter.service';
+import { FacetValue } from '../../../../facet-value.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import {
   RANGE_FILTER_MAX_SUFFIX,
   RANGE_FILTER_MIN_SUFFIX
 } from '../../search-range-filter/search-range-filter.component';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { hasValue } from '../../../../../shared/empty.util';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { hasValue } from '../../../../../empty.util';
 
 const rangeDelimiter = '-';
 
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
similarity index 74%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
index 6452f2469b..0ff0933576 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../styles/variables';
 
 a {
     color: $body-color;
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
similarity index 89%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
index 01defb9893..4ea6571a87 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
@@ -2,18 +2,18 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../../search-service/filter-type.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { FilterType } from '../../../../filter-type.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../../shared/testing/search-service-stub';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../../testing/search-service-stub';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../../shared/testing/router-stub';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { SearchFilterService } from '../../search-filter.service';
+import { RouterStub } from '../../../../../testing/router-stub';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { SearchFacetSelectedOptionComponent } from './search-facet-selected-option.component';
-import { FacetValue } from '../../../../search-service/facet-value.model';
+import { FacetValue } from '../../../../facet-value.model';
 
 describe('SearchFacetSelectedOptionComponent', () => {
   let comp: SearchFacetSelectedOptionComponent;
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
similarity index 85%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 78dde92c2b..1020340d46 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -1,13 +1,13 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchFilterService } from '../../search-filter.service';
-import { hasValue } from '../../../../../shared/empty.util';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { FacetValue } from '../../../../search-service/facet-value.model';
-import { FilterType } from '../../../../search-service/filter-type.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
+import { hasValue } from '../../../../../empty.util';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { FacetValue } from '../../../../facet-value.model';
+import { FilterType } from '../../../../filter-type.model';
 
 @Component({
   selector: 'ds-search-facet-selected-option',
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
similarity index 84%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
index 6720b30681..da0d1776e3 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
@@ -1,9 +1,9 @@
 import { Component, Injector, Input, OnInit } from '@angular/core';
 import { renderFilterType } from '../search-filter-type-decorator';
-import { FilterType } from '../../../search-service/filter-type.model';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { FILTER_CONFIG, IN_PLACE_SEARCH } from '../search-filter.service';
-import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { FilterType } from '../../../filter-type.model';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { FILTER_CONFIG, IN_PLACE_SEARCH } from '../../../../../core/shared/search/search-filter.service';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import { SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 
 @Component({
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
similarity index 87%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 5d8b51de96..7d679bedba 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -2,23 +2,23 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../search-filter.service';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../search-service/filter-type.model';
-import { FacetValue } from '../../../search-service/facet-value.model';
+import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { FilterType } from '../../../filter-type.model';
+import { FacetValue } from '../../../facet-value.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RouterStub } from '../../../../shared/testing/router-stub';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../testing/search-service-stub';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { RouterStub } from '../../../../testing/router-stub';
 import { Router } from '@angular/router';
-import { PageInfo } from '../../../../core/shared/page-info.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchFacetFilterComponent } from './search-facet-filter.component';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service-stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service-stub';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component';
 import { tap } from 'rxjs/operators';
 
 describe('SearchFacetFilterComponent', () => {
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
similarity index 90%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index ee980a0599..011d259c54 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -10,20 +10,20 @@ import { distinctUntilChanged, map, switchMap, take, tap } from 'rxjs/operators'
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../../shared/empty.util';
-import { EmphasizePipe } from '../../../../shared/utils/emphasize.pipe';
-import { FacetValue } from '../../../search-service/facet-value.model';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { SearchService } from '../../../search-service/search.service';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../search-filter.service';
-import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
-import { getSucceededRemoteData } from '../../../../core/shared/operators';
-import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../../empty.util';
+import { EmphasizePipe } from '../../../../utils/emphasize.pipe';
+import { FacetValue } from '../../../facet-value.model';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { getSucceededRemoteData } from '../../../../../core/shared/operators';
+import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 import { SearchOptions } from '../../../search-options.model';
-import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component';
 
 @Component({
   selector: 'ds-search-facet-filter',
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter-type-decorator.ts b/src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
similarity index 92%
rename from src/app/+search-page/search-filters/search-filter/search-filter-type-decorator.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
index bcc22be82c..40cff30d41 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter-type-decorator.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
@@ -1,5 +1,5 @@
 
-import { FilterType } from '../../search-service/filter-type.model';
+import { FilterType } from '../../filter-type.model';
 
 /**
  * Contains the mapping between a facet component and a FilterType
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.actions.ts b/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
similarity index 95%
rename from src/app/+search-page/search-filters/search-filter/search-filter.actions.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
index f7f80eefff..59a1903eb8 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.actions.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
-import { type } from '../../../shared/ngrx/type';
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
+import { type } from '../../../ngrx/type';
+import { SearchFilterConfig } from '../../search-filter-config.model';
 
 /**
  * For each action type in an action group, make a simple
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
similarity index 71%
rename from src/app/+search-page/search-filters/search-filter/search-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-filter.component.scss
index 1db5e9a1b2..5fe15a0bd6 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
@@ -1,5 +1,5 @@
-@import '../../../../styles/variables.scss';
-@import '../../../../styles/mixins.scss';
+@import '../../../../../styles/variables';
+@import '../../../../../styles/mixins';
 
 :host .facet-filter {
   border: 1px solid map-get($theme-colors, light);
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
similarity index 89%
rename from src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index 23c4ab3b53..d1899958b3 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -5,14 +5,14 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterService } from './search-filter.service';
-import { SearchService } from '../../search-service/search.service';
+import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchFilterComponent } from './search-filter.component';
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
-import { FilterType } from '../../search-service/filter-type.model';
-import { SearchConfigurationService } from '../../search-service/search-configuration.service';
-import { SearchConfigurationServiceStub } from '../../../shared/testing/search-configuration-service-stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SearchFilterConfig } from '../../search-filter-config.model';
+import { FilterType } from '../../filter-type.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service-stub';
+import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
 
 describe('SearchFilterComponent', () => {
   let comp: SearchFilterComponent;
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
similarity index 88%
rename from src/app/+search-page/search-filters/search-filter/search-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index bfe9f3be63..a54f593c64 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -3,13 +3,13 @@ import { Component, Inject, Input, OnInit } from '@angular/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, startWith, switchMap, take } from 'rxjs/operators';
 
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
-import { SearchFilterService } from './search-filter.service';
-import { slide } from '../../../shared/animations/slide';
-import { isNotEmpty } from '../../../shared/empty.util';
-import { SearchService } from '../../search-service/search.service';
-import { SearchConfigurationService } from '../../search-service/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SearchFilterConfig } from '../../search-filter-config.model';
+import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
+import { slide } from '../../../animations/slide';
+import { isNotEmpty } from '../../../empty.util';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
 
 @Component({
   selector: 'ds-search-filter',
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.reducer.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-filter.reducer.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.reducer.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-filter.reducer.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
diff --git a/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
similarity index 68%
rename from src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
index d8bb1ff1b3..d71a0a0d08 100644
--- a/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../../../styles/variables';
+@import '../../../../../../styles/mixins';
 
 .filters {
     .toggle-more-filters a {
diff --git a/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
similarity index 90%
rename from src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index b048a9ccd0..3b16f84ea5 100644
--- a/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FilterType } from '../../../search-service/filter-type.model';
+import { FilterType } from '../../../filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import {
   facetLoad,
diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
similarity index 86%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
index caaef5985e..21f7ff5b43 100644
--- a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../../../styles/variables';
+@import '../../../../../../styles/mixins';
 
 
 .filters {
diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
similarity index 80%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 119f3f92a9..0f0bf46325 100644
--- a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -2,24 +2,24 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../search-filter.service';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../search-service/filter-type.model';
-import { FacetValue } from '../../../search-service/facet-value.model';
+import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { FilterType } from '../../../filter-type.model';
+import { FacetValue } from '../../../facet-value.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs'
-import { SearchService } from '../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RouterStub } from '../../../../shared/testing/router-stub';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../testing/search-service-stub';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { RouterStub } from '../../../../testing/router-stub';
 import { Router } from '@angular/router';
-import { PageInfo } from '../../../../core/shared/page-info.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchRangeFilterComponent } from './search-range-filter.component';
-import { RouteService } from '../../../../shared/services/route.service';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service-stub';
+import { RouteService } from '../../../../services/route.service';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service-stub';
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
similarity index 86%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 95d7441184..c04eedf88b 100644
--- a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -2,22 +2,22 @@ import { combineLatest as observableCombineLatest, Subscription } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { isPlatformBrowser } from '@angular/common';
 import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { FilterType } from '../../../search-service/filter-type.model';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { FilterType } from '../../../filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import {
   facetLoad,
   SearchFacetFilterComponent
 } from '../search-facet-filter/search-facet-filter.component';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../search-filter.service';
-import { SearchService } from '../../../search-service/search.service';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import { Router } from '@angular/router';
 import * as moment from 'moment';
-import { RouteService } from '../../../../shared/services/route.service';
-import { hasValue } from '../../../../shared/empty.util';
-import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
+import { RouteService } from '../../../../services/route.service';
+import { hasValue } from '../../../../empty.util';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component';
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
diff --git a/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
similarity index 68%
rename from src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
index d8bb1ff1b3..d71a0a0d08 100644
--- a/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../../../styles/variables';
+@import '../../../../../../styles/mixins';
 
 .filters {
     .toggle-more-filters a {
diff --git a/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
similarity index 92%
rename from src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index fd14d6d3de..678cbbfdd5 100644
--- a/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FilterType } from '../../../search-service/filter-type.model';
+import { FilterType } from '../../../filter-type.model';
 import {
   facetLoad,
   SearchFacetFilterComponent
diff --git a/src/app/+search-page/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filters.component.html
rename to src/app/shared/search/search-filters/search-filters.component.html
diff --git a/src/app/shared/search/search-filters/search-filters.component.scss b/src/app/shared/search/search-filters/search-filters.component.scss
new file mode 100644
index 0000000000..b5b2816e89
--- /dev/null
+++ b/src/app/shared/search/search-filters/search-filters.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
\ No newline at end of file
diff --git a/src/app/+search-page/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
similarity index 86%
rename from src/app/+search-page/search-filters/search-filters.component.spec.ts
rename to src/app/shared/search/search-filters/search-filters.component.spec.ts
index dc883cd290..3c88f90222 100644
--- a/src/app/+search-page/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -4,12 +4,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterService } from './search-filter/search-filter.service';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SearchFiltersComponent } from './search-filters.component';
-import { SearchService } from '../search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { of as observableOf } from 'rxjs';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service-stub';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service-stub';
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
diff --git a/src/app/+search-page/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
similarity index 79%
rename from src/app/+search-page/search-filters/search-filters.component.ts
rename to src/app/shared/search/search-filters/search-filters.component.ts
index e970647747..81d6c72b5a 100644
--- a/src/app/+search-page/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -3,13 +3,13 @@ import { Component, Inject, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
-import { SearchService } from '../search-service/search.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { SearchFilterConfig } from '../search-service/search-filter-config.model';
-import { SearchConfigurationService } from '../search-service/search-configuration.service';
-import { SearchFilterService } from './search-filter/search-filter.service';
-import { getSucceededRemoteData } from '../../core/shared/operators';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { SearchFilterConfig } from '../search-filter-config.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
+import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
 
 @Component({
   selector: 'ds-search-filters',
diff --git a/src/app/+search-page/search-labels/search-labels.component.html b/src/app/shared/search/search-labels/search-labels.component.html
similarity index 100%
rename from src/app/+search-page/search-labels/search-labels.component.html
rename to src/app/shared/search/search-labels/search-labels.component.html
diff --git a/src/app/+search-page/search-labels/search-labels.component.scss b/src/app/shared/search/search-labels/search-labels.component.scss
similarity index 100%
rename from src/app/+search-page/search-labels/search-labels.component.scss
rename to src/app/shared/search/search-labels/search-labels.component.scss
diff --git a/src/app/+search-page/search-labels/search-labels.component.spec.ts b/src/app/shared/search/search-labels/search-labels.component.spec.ts
similarity index 100%
rename from src/app/+search-page/search-labels/search-labels.component.spec.ts
rename to src/app/shared/search/search-labels/search-labels.component.spec.ts
diff --git a/src/app/+search-page/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
similarity index 88%
rename from src/app/+search-page/search-labels/search-labels.component.ts
rename to src/app/shared/search/search-labels/search-labels.component.ts
index 104ed5b08b..cadc61c9df 100644
--- a/src/app/+search-page/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -1,11 +1,11 @@
 import { Component, Inject, Input } from '@angular/core';
-import { SearchService } from '../search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { Observable } from 'rxjs';
 import { Params } from '@angular/router';
 import { map } from 'rxjs/operators';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { SearchConfigurationService } from '../search-service/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+import { hasValue, isNotEmpty } from '../../empty.util';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
 
 @Component({
   selector: 'ds-search-labels',
diff --git a/src/app/+search-page/search-options.model.spec.ts b/src/app/shared/search/search-options.model.spec.ts
similarity index 93%
rename from src/app/+search-page/search-options.model.spec.ts
rename to src/app/shared/search/search-options.model.spec.ts
index a0ef2b31dd..3b047b578f 100644
--- a/src/app/+search-page/search-options.model.spec.ts
+++ b/src/app/shared/search/search-options.model.spec.ts
@@ -1,7 +1,7 @@
 import { PaginatedSearchOptions } from './paginated-search-options.model';
 import { SearchOptions } from './search-options.model';
 import { SearchFilter } from './search-filter.model';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 
 describe('SearchOptions', () => {
   let options: PaginatedSearchOptions;
diff --git a/src/app/+search-page/search-options.model.ts b/src/app/shared/search/search-options.model.ts
similarity index 89%
rename from src/app/+search-page/search-options.model.ts
rename to src/app/shared/search/search-options.model.ts
index 2b18854e1e..1cc88ccfd8 100644
--- a/src/app/+search-page/search-options.model.ts
+++ b/src/app/shared/search/search-options.model.ts
@@ -1,9 +1,9 @@
-import { isNotEmpty } from '../shared/empty.util';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { isNotEmpty } from '../empty.util';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
 import 'core-js/library/fn/object/entries';
 import { SearchFilter } from './search-filter.model';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
-import { SetViewMode } from '../shared/view-mode';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+import { SetViewMode } from '../view-mode';
 
 /**
  * This model class represents all parameters needed to request information about a certain search request
diff --git a/src/app/+search-page/search-service/search-query-response.model.ts b/src/app/shared/search/search-query-response.model.ts
similarity index 95%
rename from src/app/+search-page/search-service/search-query-response.model.ts
rename to src/app/shared/search/search-query-response.model.ts
index bca6e644fc..da15a60631 100644
--- a/src/app/+search-page/search-service/search-query-response.model.ts
+++ b/src/app/shared/search/search-query-response.model.ts
@@ -1,6 +1,6 @@
 import { autoserialize, autoserializeAs } from 'cerialize';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { NormalizedSearchResult } from '../normalized-search-result.model';
+import { NormalizedSearchResult } from './normalized-search-result.model';
 
 /**
  * Class representing the response returned by the server when performing a search request
diff --git a/src/app/+search-page/search-service/search-result-element-decorator.ts b/src/app/shared/search/search-result-element-decorator.ts
similarity index 91%
rename from src/app/+search-page/search-service/search-result-element-decorator.ts
rename to src/app/shared/search/search-result-element-decorator.ts
index 59446480a3..446236c1b7 100644
--- a/src/app/+search-page/search-service/search-result-element-decorator.ts
+++ b/src/app/shared/search/search-result-element-decorator.ts
@@ -1,6 +1,6 @@
 import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { isNull } from '../../shared/empty.util';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { isNull } from '../empty.util';
 
 /**
  * Contains the mapping between a search result component and a DSpaceObject
diff --git a/src/app/+search-page/search-result.model.ts b/src/app/shared/search/search-result.model.ts
similarity index 60%
rename from src/app/+search-page/search-result.model.ts
rename to src/app/shared/search/search-result.model.ts
index 0354edbc6b..57a44c8cc5 100644
--- a/src/app/+search-page/search-result.model.ts
+++ b/src/app/shared/search/search-result.model.ts
@@ -1,6 +1,6 @@
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { MetadataMap } from '../core/shared/metadata.models';
-import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { MetadataMap } from '../../core/shared/metadata.models';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
 
 /**
  * Represents a search result object of a certain (<T>) DSpaceObject
diff --git a/src/app/+search-page/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
similarity index 100%
rename from src/app/+search-page/search-results/search-results.component.html
rename to src/app/shared/search/search-results/search-results.component.html
diff --git a/src/app/+search-page/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
similarity index 97%
rename from src/app/+search-page/search-results/search-results.component.spec.ts
rename to src/app/shared/search/search-results/search-results.component.spec.ts
index 518829e69f..1f8af3f456 100644
--- a/src/app/+search-page/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -2,11 +2,11 @@ import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ResourceType } from '../../core/shared/resource-type';
-import { Community } from '../../core/shared/community.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { Community } from '../../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchResultsComponent } from './search-results.component';
-import { QueryParamsDirectiveStub } from '../../shared/testing/query-params-directive-stub';
+import { QueryParamsDirectiveStub } from '../../testing/query-params-directive-stub';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
diff --git a/src/app/+search-page/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
similarity index 79%
rename from src/app/+search-page/search-results/search-results.component.ts
rename to src/app/shared/search/search-results/search-results.component.ts
index ea6b407ee7..03f0d117fc 100644
--- a/src/app/+search-page/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -1,13 +1,13 @@
 import { Component, Input } from '@angular/core';
-import { RemoteData } from '../../core/data/remote-data';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { SetViewMode } from '../../shared/view-mode';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { fadeIn, fadeInOut } from '../../animations/fade';
+import { SetViewMode } from '../../view-mode';
 import { SearchOptions } from '../search-options.model';
 import { SearchResult } from '../search-result.model';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { hasNoValue, isNotEmpty } from '../../shared/empty.util';
-import { SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { hasNoValue, isNotEmpty } from '../../empty.util';
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
 
 @Component({
   selector: 'ds-search-results',
diff --git a/src/app/+search-page/search-settings/search-settings.component.html b/src/app/shared/search/search-settings/search-settings.component.html
similarity index 100%
rename from src/app/+search-page/search-settings/search-settings.component.html
rename to src/app/shared/search/search-settings/search-settings.component.html
diff --git a/src/app/+search-page/search-settings/search-settings.component.scss b/src/app/shared/search/search-settings/search-settings.component.scss
similarity index 63%
rename from src/app/+search-page/search-settings/search-settings.component.scss
rename to src/app/shared/search/search-settings/search-settings.component.scss
index 0a3824f815..d23c9483e9 100644
--- a/src/app/+search-page/search-settings/search-settings.component.scss
+++ b/src/app/shared/search/search-settings/search-settings.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@import '../../../../styles/variables';
 
 .setting-option {
   border: 1px solid map-get($theme-colors, light);
diff --git a/src/app/+search-page/search-settings/search-settings.component.spec.ts b/src/app/shared/search/search-settings/search-settings.component.spec.ts
similarity index 88%
rename from src/app/+search-page/search-settings/search-settings.component.spec.ts
rename to src/app/shared/search/search-settings/search-settings.component.spec.ts
index b9b5c5a5eb..770bb2f23d 100644
--- a/src/app/+search-page/search-settings/search-settings.component.spec.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.spec.ts
@@ -1,21 +1,21 @@
-import { SearchService } from '../search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { SearchSettingsComponent } from './search-settings.component';
 import { of as observableOf } from 'rxjs';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ActivatedRoute } from '@angular/router';
-import { SearchSidebarService } from '../search-sidebar/search-sidebar.service';
+import { SearchSidebarService } from '../../../core/shared/search/search-sidebar.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
 import { By } from '@angular/platform-browser';
-import { SearchFilterService } from '../search-filters/search-filter/search-filter.service';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { hot } from 'jasmine-marbles';
-import { VarDirective } from '../../shared/utils/var.directive';
+import { VarDirective } from '../../utils/var.directive';
 import { first } from 'rxjs/operators';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
 
 describe('SearchSettingsComponent', () => {
 
diff --git a/src/app/+search-page/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts
similarity index 89%
rename from src/app/+search-page/search-settings/search-settings.component.ts
rename to src/app/shared/search/search-settings/search-settings.component.ts
index aac861c64f..a88ef5b9ee 100644
--- a/src/app/+search-page/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -1,11 +1,11 @@
 import { Component, Inject, Input, OnInit } from '@angular/core';
-import { SearchService } from '../search-service/search.service';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { PaginatedSearchOptions } from '../paginated-search-options.model';
 import { Observable } from 'rxjs';
-import { SearchConfigurationService } from '../search-service/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
 
 @Component({
   selector: 'ds-search-settings',
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.actions.ts b/src/app/shared/search/search-sidebar/search-sidebar.actions.ts
similarity index 96%
rename from src/app/+search-page/search-sidebar/search-sidebar.actions.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.actions.ts
index 84a34b2790..bcbb543de2 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.actions.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.actions.ts
@@ -1,6 +1,5 @@
 import { Action } from '@ngrx/store';
-
-import { type } from '../../shared/ngrx/type';
+import { type } from '../../ngrx/type';
 
 /**
  * For each action type in an action group, make a simple
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
similarity index 100%
rename from src/app/+search-page/search-sidebar/search-sidebar.component.html
rename to src/app/shared/search/search-sidebar/search-sidebar.component.html
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.scss b/src/app/shared/search/search-sidebar/search-sidebar.component.scss
similarity index 82%
rename from src/app/+search-page/search-sidebar/search-sidebar.component.scss
rename to src/app/shared/search/search-sidebar/search-sidebar.component.scss
index 35ce5eebce..cb5ec6caa5 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.component.scss
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.scss
@@ -1,5 +1,5 @@
-@import '../../../styles/variables.scss';
-@import '../../../styles/mixins.scss';
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
 
 :host {
     .results {
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.spec.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
similarity index 100%
rename from src/app/+search-page/search-sidebar/search-sidebar.component.spec.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
similarity index 100%
rename from src/app/+search-page/search-sidebar/search-sidebar.component.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.component.ts
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.effects.spec.ts b/src/app/shared/search/search-sidebar/search-sidebar.effects.spec.ts
similarity index 100%
rename from src/app/+search-page/search-sidebar/search-sidebar.effects.spec.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.effects.spec.ts
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.effects.ts b/src/app/shared/search/search-sidebar/search-sidebar.effects.ts
similarity index 94%
rename from src/app/+search-page/search-sidebar/search-sidebar.effects.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.effects.ts
index 1f5fb0ef60..b9d8498d8e 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.effects.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.effects.ts
@@ -4,7 +4,7 @@ import { Effect, Actions, ofType } from '@ngrx/effects'
 import * as fromRouter from '@ngrx/router-store';
 
 import { SearchSidebarCollapseAction } from './search-sidebar.actions';
-import { URLBaser } from '../../core/url-baser/url-baser';
+import { URLBaser } from '../../../core/url-baser/url-baser';
 
 /**
  * Makes sure that if the user navigates to another route, the sidebar is collapsed
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.reducer.spec.ts b/src/app/shared/search/search-sidebar/search-sidebar.reducer.spec.ts
similarity index 100%
rename from src/app/+search-page/search-sidebar/search-sidebar.reducer.spec.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.reducer.spec.ts
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.reducer.ts b/src/app/shared/search/search-sidebar/search-sidebar.reducer.ts
similarity index 100%
rename from src/app/+search-page/search-sidebar/search-sidebar.reducer.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.reducer.ts
diff --git a/src/app/+search-page/search-switch-configuration/search-configuration-option.model.ts b/src/app/shared/search/search-switch-configuration/search-configuration-option.model.ts
similarity index 100%
rename from src/app/+search-page/search-switch-configuration/search-configuration-option.model.ts
rename to src/app/shared/search/search-switch-configuration/search-configuration-option.model.ts
diff --git a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.html b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
similarity index 100%
rename from src/app/+search-page/search-switch-configuration/search-switch-configuration.component.html
rename to src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
diff --git a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.scss b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.scss
similarity index 100%
rename from src/app/+search-page/search-switch-configuration/search-switch-configuration.component.scss
rename to src/app/shared/search/search-switch-configuration/search-switch-configuration.component.scss
diff --git a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
similarity index 100%
rename from src/app/+search-page/search-switch-configuration/search-switch-configuration.component.spec.ts
rename to src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
diff --git a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
similarity index 86%
rename from src/app/+search-page/search-switch-configuration/search-switch-configuration.component.ts
rename to src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
index 1ce1bf84ec..ebe520667b 100644
--- a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
@@ -3,12 +3,12 @@ import { NavigationExtras, Router } from '@angular/router';
 
 import { Subscription } from 'rxjs';
 
-import { hasValue } from '../../shared/empty.util';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../search-service/search-configuration.service';
-import { MyDSpaceConfigurationValueType } from '../../+my-dspace-page/my-dspace-configuration-value-type';
+import { hasValue } from '../../empty.util';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { MyDSpaceConfigurationValueType } from '../../../+my-dspace-page/my-dspace-configuration-value-type';
 import { SearchConfigurationOption } from './search-configuration-option.model';
-import { SearchService } from '../search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 @Component({
   selector: 'ds-search-switch-configuration',
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index ef867e8a7f..96dfb87321 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -140,7 +140,26 @@ import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component
 import { ClaimedTaskActionsReturnToPoolComponent } from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
 import { ItemDetailPreviewFieldComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
 import { DsDynamicLookupRelationModalComponent } from './form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component';
-import { SearchResultsComponent } from '../+search-page/search-results/search-results.component';
+import { SearchResultsComponent } from './search/search-results/search-results.component';
+import { SearchSidebarComponent } from './search/search-sidebar/search-sidebar.component';
+import { SearchSettingsComponent } from './search/search-settings/search-settings.component';
+import { ItemSearchResultGridElementComponent } from './object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component';
+import { CollectionSearchResultGridElementComponent } from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
+import { CommunitySearchResultGridElementComponent } from './object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
+import { SearchFiltersComponent } from './search/search-filters/search-filters.component';
+import { SearchFilterComponent } from './search/search-filters/search-filter/search-filter.component';
+import { SearchFacetFilterComponent } from './search/search-filters/search-filter/search-facet-filter/search-facet-filter.component';
+import { SearchLabelsComponent } from './search/search-labels/search-labels.component';
+import { SearchFacetFilterWrapperComponent } from './search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
+import { SearchRangeFilterComponent } from './search/search-filters/search-filter/search-range-filter/search-range-filter.component';
+import { SearchTextFilterComponent } from './search/search-filters/search-filter/search-text-filter/search-text-filter.component';
+import { SearchHierarchyFilterComponent } from './search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { SearchBooleanFilterComponent } from './search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
+import { SearchFacetOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
+import { SearchFacetSelectedOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
+import { SearchFacetRangeOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
+import { SearchSwitchConfigurationComponent } from './search/search-switch-configuration/search-switch-configuration.component';
+import { SearchAuthorityFilterComponent } from './search/search-filters/search-filter/search-authority-filter/search-authority-filter.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -263,7 +282,27 @@ const COMPONENTS = [
   TypedItemSearchResultListElementComponent,
   ItemTypeSwitcherComponent,
   BrowseByComponent,
-  SearchResultsComponent
+  SearchResultsComponent,
+  SearchSidebarComponent,
+  SearchSettingsComponent,
+  ItemSearchResultGridElementComponent,
+  CollectionSearchResultGridElementComponent,
+  CommunitySearchResultGridElementComponent,
+  SearchFiltersComponent,
+  SearchFilterComponent,
+  SearchFacetFilterComponent,
+  SearchLabelsComponent,
+  SearchFacetFilterComponent,
+  SearchFacetFilterWrapperComponent,
+  SearchRangeFilterComponent,
+  SearchTextFilterComponent,
+  SearchHierarchyFilterComponent,
+  SearchBooleanFilterComponent,
+  SearchFacetOptionComponent,
+  SearchFacetSelectedOptionComponent,
+  SearchFacetRangeOptionComponent,
+  SearchSwitchConfigurationComponent,
+  SearchAuthorityFilterComponent,
 ];
 
 const ENTRY_COMPONENTS = [
@@ -309,7 +348,19 @@ const ENTRY_COMPONENTS = [
   PlainTextMetadataListElementComponent,
   ItemMetadataListElementComponent,
   MetadataRepresentationListElementComponent,
-  SearchResultsComponent
+  SearchResultsComponent,
+  ItemSearchResultGridElementComponent,
+  CollectionSearchResultGridElementComponent,
+  CommunitySearchResultGridElementComponent,
+  SearchFacetFilterComponent,
+  SearchRangeFilterComponent,
+  SearchTextFilterComponent,
+  SearchHierarchyFilterComponent,
+  SearchBooleanFilterComponent,
+  SearchFacetOptionComponent,
+  SearchFacetSelectedOptionComponent,
+  SearchFacetRangeOptionComponent,
+  SearchAuthorityFilterComponent
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
index 2fe405de3f..93619095bd 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
@@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 
-import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchService } from '../../core/shared/search/search.service';
 import { ViewModeSwitchComponent } from './view-mode-switch.component';
 import { SetViewMode } from '../view-mode';
 import { SearchServiceStub } from '../testing/search-service-stub';
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
index dc355c6409..2ed6b8c165 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 
 import { Subscription } from 'rxjs';
 
-import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchService } from '../../core/shared/search/search.service';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { isEmpty } from '../empty.util';