diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
index be99a0eae4..7c2001c909 100644
--- a/src/app/+search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -4,12 +4,12 @@ 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 { ItemSearchResultListElementComponent } from '../object-list/search-result-list-element/item-search-result/item-search-result-list-element.component';
-import { CollectionSearchResultListElementComponent } from '../object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
-import { CommunitySearchResultListElementComponent } from '../object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
-import { ItemSearchResultGridElementComponent } from '../object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component';
-import { CommunitySearchResultGridElementComponent } from '../object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component'
-import { CollectionSearchResultGridElementComponent } from '../object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
+import { ItemSearchResultListElementComponent } from '../shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component';
+import { CollectionSearchResultListElementComponent } from '../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
+import { CommunitySearchResultListElementComponent } from '../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.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 { SearchService } from './search-service/search.service';
 import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
 import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
diff --git a/src/app/+search-page/search-result.model.ts b/src/app/+search-page/search-result.model.ts
index 602d8ac9c2..cc2bd8cd58 100644
--- a/src/app/+search-page/search-result.model.ts
+++ b/src/app/+search-page/search-result.model.ts
@@ -1,6 +1,6 @@
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { Metadatum } from '../core/shared/metadatum.model';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
 
 export class SearchResult<T extends DSpaceObject> implements ListableObject {
 
diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/+search-page/search-service/search.service.ts
index 5258756bfb..63b1b04dce 100644
--- a/src/app/+search-page/search-service/search.service.ts
+++ b/src/app/+search-page/search-service/search.service.ts
@@ -15,6 +15,7 @@ import { FacetValue } from './facet-value.model';
 import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
 import { ViewMode } from '../../+search-page/search-options.model';
 import { Router, NavigationExtras, ActivatedRoute } from '@angular/router';
+import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
 import { RouteService } from '../../shared/route.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortOptions } from '../../core/cache/models/sort-options.model';
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index a17a6b31ce..8f96f2485a 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -3,7 +3,7 @@ import { isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { RemoteData } from '../data/remote-data';
 import { ResourceType } from './resource-type';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { Observable } from 'rxjs/Observable';
 
 /**
diff --git a/src/app/object-collection/object-collection.component.scss b/src/app/object-collection/object-collection.component.scss
deleted file mode 100644
index da97dd7a62..0000000000
--- a/src/app/object-collection/object-collection.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../styles/variables.scss';
diff --git a/src/app/object-collection/shared/item-search-result.model.ts b/src/app/object-collection/shared/item-search-result.model.ts
deleted file mode 100644
index 75d56a2488..0000000000
--- a/src/app/object-collection/shared/item-search-result.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SearchResult } from '../../+search-page/search-result.model';
-import { Item } from '../../core/shared/item.model';
-
-export class ItemSearchResult extends SearchResult<Item> {
-}
diff --git a/src/app/object-grid/collection-grid-element/collection-grid-element.component.scss b/src/app/object-grid/collection-grid-element/collection-grid-element.component.scss
deleted file mode 100644
index 48e2b121d4..0000000000
--- a/src/app/object-grid/collection-grid-element/collection-grid-element.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../styles/variables.scss';
-@import '../grid-card-styling.scss';
diff --git a/src/app/object-grid/community-grid-element/community-grid-element.component.scss b/src/app/object-grid/community-grid-element/community-grid-element.component.scss
deleted file mode 100644
index 48e2b121d4..0000000000
--- a/src/app/object-grid/community-grid-element/community-grid-element.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../styles/variables.scss';
-@import '../grid-card-styling.scss';
diff --git a/src/app/object-grid/grid-thumbnail/grid-thumbnail.component.scss b/src/app/object-grid/grid-thumbnail/grid-thumbnail.component.scss
deleted file mode 100644
index 50be6f5ad0..0000000000
--- a/src/app/object-grid/grid-thumbnail/grid-thumbnail.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../styles/variables.scss';
diff --git a/src/app/object-grid/item-grid-element/item-grid-element.component.scss b/src/app/object-grid/item-grid-element/item-grid-element.component.scss
deleted file mode 100644
index 48e2b121d4..0000000000
--- a/src/app/object-grid/item-grid-element/item-grid-element.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../styles/variables.scss';
-@import '../grid-card-styling.scss';
diff --git a/src/app/object-grid/object-grid-element/object-grid-element.component.scss b/src/app/object-grid/object-grid-element/object-grid-element.component.scss
deleted file mode 100644
index 0351acf15f..0000000000
--- a/src/app/object-grid/object-grid-element/object-grid-element.component.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import '../../../styles/variables.scss';
-@import '../grid-card-styling.scss';
-:host {
-  display: block;
-  margin-bottom: $spacer;
-}
diff --git a/src/app/object-grid/object-grid.component.scss b/src/app/object-grid/object-grid.component.scss
deleted file mode 100644
index da97dd7a62..0000000000
--- a/src/app/object-grid/object-grid.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../styles/variables.scss';
diff --git a/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss b/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss
deleted file mode 100644
index 790f794381..0000000000
--- a/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../../styles/variables.scss';
-@import '../../grid-card-styling.scss';
diff --git a/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result.model.ts b/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result.model.ts
deleted file mode 100644
index fa7945dedd..0000000000
--- a/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { Collection } from '../../../core/shared/collection.model';
-
-export class CollectionSearchResult extends SearchResult<Collection> {
-}
diff --git a/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss b/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss
deleted file mode 100644
index 790f794381..0000000000
--- a/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../../styles/variables.scss';
-@import '../../grid-card-styling.scss';
diff --git a/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result.model.ts b/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result.model.ts
deleted file mode 100644
index 79ea34b6cd..0000000000
--- a/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { Community } from '../../../core/shared/community.model';
-
-export class CommunitySearchResult extends SearchResult<Community> {
-}
diff --git a/src/app/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss b/src/app/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss
deleted file mode 100644
index 790f794381..0000000000
--- a/src/app/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../../styles/variables.scss';
-@import '../../grid-card-styling.scss';
diff --git a/src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss b/src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss
deleted file mode 100644
index 48e2b121d4..0000000000
--- a/src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../styles/variables.scss';
-@import '../grid-card-styling.scss';
diff --git a/src/app/object-list/collection-list-element/collection-list-element.component.scss b/src/app/object-list/collection-list-element/collection-list-element.component.scss
deleted file mode 100644
index ad84b72f8c..0000000000
--- a/src/app/object-list/collection-list-element/collection-list-element.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/object-list/community-list-element/community-list-element.component.scss b/src/app/object-list/community-list-element/community-list-element.component.scss
deleted file mode 100644
index ad84b72f8c..0000000000
--- a/src/app/object-list/community-list-element/community-list-element.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/object-list/item-list-element/item-list-element.component.scss b/src/app/object-list/item-list-element/item-list-element.component.scss
deleted file mode 100644
index ad84b72f8c..0000000000
--- a/src/app/object-list/item-list-element/item-list-element.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/object-list/object-list.component.scss b/src/app/object-list/object-list.component.scss
deleted file mode 100644
index b14c7376e3..0000000000
--- a/src/app/object-list/object-list.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss b/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss
deleted file mode 100644
index 88eb98509a..0000000000
--- a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts b/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts
deleted file mode 100644
index fa7945dedd..0000000000
--- a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { Collection } from '../../../core/shared/collection.model';
-
-export class CollectionSearchResult extends SearchResult<Collection> {
-}
diff --git a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss b/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss
deleted file mode 100644
index 88eb98509a..0000000000
--- a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/object-list/search-result-list-element/community-search-result/community-search-result.model.ts b/src/app/object-list/search-result-list-element/community-search-result/community-search-result.model.ts
deleted file mode 100644
index 79ea34b6cd..0000000000
--- a/src/app/object-list/search-result-list-element/community-search-result/community-search-result.model.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { Community } from '../../../core/shared/community.model';
-
-export class CommunitySearchResult extends SearchResult<Community> {
-}
diff --git a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss b/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss
deleted file mode 100644
index 88eb98509a..0000000000
--- a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../../styles/variables.scss';
\ No newline at end of file
diff --git a/src/app/object-list/wrapper-list-element/wrapper-list-element.component.scss b/src/app/object-list/wrapper-list-element/wrapper-list-element.component.scss
deleted file mode 100644
index 6f997644cc..0000000000
--- a/src/app/object-list/wrapper-list-element/wrapper-list-element.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '../../../styles/variables.scss';
-
diff --git a/src/app/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
similarity index 100%
rename from src/app/object-collection/object-collection.component.html
rename to src/app/shared/object-collection/object-collection.component.html
diff --git a/src/app/shared/object-collection/object-collection.component.scss b/src/app/shared/object-collection/object-collection.component.scss
new file mode 100644
index 0000000000..48e6526dff
--- /dev/null
+++ b/src/app/shared/object-collection/object-collection.component.scss
@@ -0,0 +1 @@
+@import '../../../styles/variables';
diff --git a/src/app/object-collection/object-collection.component.spec.ts b/src/app/shared/object-collection/object-collection.component.spec.ts
similarity index 90%
rename from src/app/object-collection/object-collection.component.spec.ts
rename to src/app/shared/object-collection/object-collection.component.spec.ts
index abbf66e4f1..a56a3e56dc 100644
--- a/src/app/object-collection/object-collection.component.spec.ts
+++ b/src/app/shared/object-collection/object-collection.component.spec.ts
@@ -1,13 +1,13 @@
 import { ObjectCollectionComponent } from './object-collection.component';
-import { ViewMode } from '../+search-page/search-options.model';
+import { ViewMode } from '../../+search-page/search-options.model';
 import { element } from 'protractor';
 import { By } from '@angular/platform-browser';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Config } from '../../config/config.interface';
+import { Config } from '../../../config/config.interface';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
-import { RouterStub } from '../shared/testing/router-stub';
+import { RouterStub } from '../testing/router-stub';
 
 describe('ObjectCollectionComponent', () => {
   let fixture: ComponentFixture<ObjectCollectionComponent>;
diff --git a/src/app/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
similarity index 87%
rename from src/app/object-collection/object-collection.component.ts
rename to src/app/shared/object-collection/object-collection.component.ts
index a79653d970..8d5a9ce3c7 100644
--- a/src/app/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -6,16 +6,16 @@ import { ActivatedRoute, Router } from '@angular/router';
 
 import { Observable } from 'rxjs/Observable';
 
-import { RemoteData } from '../core/data/remote-data';
-import { PageInfo } from '../core/shared/page-info.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PageInfo } from '../../core/shared/page-info.model';
 
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 
 import { ListableObject } from './shared/listable-object.model';
-import { ViewMode } from '../+search-page/search-options.model';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
+import { ViewMode } from '../../+search-page/search-options.model';
+import { hasValue, isNotEmpty } from '../empty.util';
 
 @Component({
   selector: 'ds-viewable-collection',
diff --git a/src/app/object-collection/shared/dso-element-decorator.spec.ts b/src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
similarity index 80%
rename from src/app/object-collection/shared/dso-element-decorator.spec.ts
rename to src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
index 952afb9ac3..b4b27bb52a 100644
--- a/src/app/object-collection/shared/dso-element-decorator.spec.ts
+++ b/src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
@@ -1,6 +1,6 @@
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 import { renderElementsFor } from './dso-element-decorator';
-import { Item } from '../../core/shared/item.model';
+import { Item } from '../../../core/shared/item.model';
 
 describe('ElementDecorator', () => {
   let gridDecorator = renderElementsFor(Item, ViewMode.Grid);
diff --git a/src/app/object-collection/shared/dso-element-decorator.ts b/src/app/shared/object-collection/shared/dso-element-decorator.ts
similarity index 77%
rename from src/app/object-collection/shared/dso-element-decorator.ts
rename to src/app/shared/object-collection/shared/dso-element-decorator.ts
index 310a65f056..5dc085d3a7 100644
--- a/src/app/object-collection/shared/dso-element-decorator.ts
+++ b/src/app/shared/object-collection/shared/dso-element-decorator.ts
@@ -1,6 +1,6 @@
-import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { ListableObject } from './listable-object.model';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 const dsoElementMap = new Map();
 export function renderElementsFor(listable: GenericConstructor<ListableObject>, viewMode : ViewMode) {
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
new file mode 100644
index 0000000000..d9af3539a0
--- /dev/null
+++ b/src/app/shared/object-collection/shared/item-search-result.model.ts
@@ -0,0 +1,5 @@
+import { SearchResult } from '../../../+search-page/search-result.model';
+import { Item } from '../../../core/shared/item.model';
+
+export class ItemSearchResult extends SearchResult<Item> {
+}
diff --git a/src/app/object-collection/shared/listable-object.model.ts b/src/app/shared/object-collection/shared/listable-object.model.ts
similarity index 100%
rename from src/app/object-collection/shared/listable-object.model.ts
rename to src/app/shared/object-collection/shared/listable-object.model.ts
diff --git a/src/app/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
similarity index 100%
rename from src/app/object-grid/collection-grid-element/collection-grid-element.component.html
rename to src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.scss b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.scss
new file mode 100644
index 0000000000..946c8a6a31
--- /dev/null
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../styles/variables';
+@import '../grid-card-styling';
diff --git a/src/app/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
similarity index 100%
rename from src/app/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
rename to src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
diff --git a/src/app/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
similarity index 80%
rename from src/app/object-grid/collection-grid-element/collection-grid-element.component.ts
rename to src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
index 7e2ae5f468..09aadab15e 100644
--- a/src/app/object-grid/collection-grid-element/collection-grid-element.component.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
@@ -1,9 +1,9 @@
 import { Component, Inject } from '@angular/core';
 
-import { Collection } from '../../core/shared/collection.model';
+import { Collection } from '../../../core/shared/collection.model';
 import { ObjectGridElementComponent } from '../object-grid-element/object-grid-element.component';
 import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 
 @Component({
diff --git a/src/app/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
similarity index 100%
rename from src/app/object-grid/community-grid-element/community-grid-element.component.html
rename to src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.scss b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.scss
new file mode 100644
index 0000000000..946c8a6a31
--- /dev/null
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../styles/variables';
+@import '../grid-card-styling';
diff --git a/src/app/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
similarity index 80%
rename from src/app/object-grid/community-grid-element/community-grid-element.component.ts
rename to src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
index 76ee6736be..d40bd717a4 100644
--- a/src/app/object-grid/community-grid-element/community-grid-element.component.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, Inject } from '@angular/core';
 
-import { Community } from '../../core/shared/community.model';
+import { Community } from '../../../core/shared/community.model';
 import { ObjectGridElementComponent } from '../object-grid-element/object-grid-element.component';
 import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-community-grid-element',
diff --git a/src/app/object-grid/grid-card-styling.scss b/src/app/shared/object-grid/grid-card-styling.scss
similarity index 94%
rename from src/app/object-grid/grid-card-styling.scss
rename to src/app/shared/object-grid/grid-card-styling.scss
index b25c603b55..2fe199d1ce 100644
--- a/src/app/object-grid/grid-card-styling.scss
+++ b/src/app/shared/object-grid/grid-card-styling.scss
@@ -1,4 +1,4 @@
-@import '../../styles/custom_variables';
+@import '../../../styles/custom_variables';
 
 .card-title{
   line-height: $line-height-base;
diff --git a/src/app/object-grid/grid-thumbnail/grid-thumbnail.component.html b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html
similarity index 100%
rename from src/app/object-grid/grid-thumbnail/grid-thumbnail.component.html
rename to src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html
diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.scss b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.scss
new file mode 100644
index 0000000000..45a533cd01
--- /dev/null
+++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.scss
@@ -0,0 +1 @@
+@import '../../../../styles/variables';
diff --git a/src/app/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts
similarity index 91%
rename from src/app/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts
rename to src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts
index 209ac52997..2d2bd6305a 100644
--- a/src/app/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts
+++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts
@@ -3,8 +3,8 @@ import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 
 import { GridThumbnailComponent } from './grid-thumbnail.component';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { SafeUrlPipe } from '../../shared/utils/safe-url-pipe';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { SafeUrlPipe } from '../../utils/safe-url-pipe';
 
 describe('ThumbnailComponent', () => {
   let comp: GridThumbnailComponent;
diff --git a/src/app/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
similarity index 95%
rename from src/app/object-grid/grid-thumbnail/grid-thumbnail.component.ts
rename to src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
index 7baa47b39e..8ca93470da 100644
--- a/src/app/object-grid/grid-thumbnail/grid-thumbnail.component.ts
+++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { Bitstream } from '../../core/shared/bitstream.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
 
 /**
  * This component renders a given Bitstream as a thumbnail.
diff --git a/src/app/object-grid/item-grid-element/item-grid-element.component.html b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
similarity index 100%
rename from src/app/object-grid/item-grid-element/item-grid-element.component.html
rename to src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
diff --git a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.scss b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.scss
new file mode 100644
index 0000000000..946c8a6a31
--- /dev/null
+++ b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../styles/variables';
+@import '../grid-card-styling';
diff --git a/src/app/object-grid/item-grid-element/item-grid-element.component.spec.ts b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
similarity index 100%
rename from src/app/object-grid/item-grid-element/item-grid-element.component.spec.ts
rename to src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
diff --git a/src/app/object-grid/item-grid-element/item-grid-element.component.ts b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
similarity index 80%
rename from src/app/object-grid/item-grid-element/item-grid-element.component.ts
rename to src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
index e11c51312a..c41a6c9352 100644
--- a/src/app/object-grid/item-grid-element/item-grid-element.component.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, Inject } from '@angular/core';
 
-import { Item } from '../../core/shared/item.model';
+import { Item } from '../../../core/shared/item.model';
 import { renderElementsFor} from '../../object-collection/shared/dso-element-decorator';
 import { ObjectGridElementComponent } from '../object-grid-element/object-grid-element.component';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-item-grid-element',
diff --git a/src/app/object-grid/object-grid-element/object-grid-element.component.html b/src/app/shared/object-grid/object-grid-element/object-grid-element.component.html
similarity index 100%
rename from src/app/object-grid/object-grid-element/object-grid-element.component.html
rename to src/app/shared/object-grid/object-grid-element/object-grid-element.component.html
diff --git a/src/app/shared/object-grid/object-grid-element/object-grid-element.component.scss b/src/app/shared/object-grid/object-grid-element/object-grid-element.component.scss
new file mode 100644
index 0000000000..d299edd0ab
--- /dev/null
+++ b/src/app/shared/object-grid/object-grid-element/object-grid-element.component.scss
@@ -0,0 +1,6 @@
+@import '../../../../styles/variables';
+@import '../grid-card-styling';
+:host {
+  display: block;
+  margin-bottom: $spacer;
+}
diff --git a/src/app/object-grid/object-grid-element/object-grid-element.component.ts b/src/app/shared/object-grid/object-grid-element/object-grid-element.component.ts
similarity index 100%
rename from src/app/object-grid/object-grid-element/object-grid-element.component.ts
rename to src/app/shared/object-grid/object-grid-element/object-grid-element.component.ts
diff --git a/src/app/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
similarity index 100%
rename from src/app/object-grid/object-grid.component.html
rename to src/app/shared/object-grid/object-grid.component.html
diff --git a/src/app/shared/object-grid/object-grid.component.scss b/src/app/shared/object-grid/object-grid.component.scss
new file mode 100644
index 0000000000..48e6526dff
--- /dev/null
+++ b/src/app/shared/object-grid/object-grid.component.scss
@@ -0,0 +1 @@
+@import '../../../styles/variables';
diff --git a/src/app/object-grid/object-grid.component.spec.ts b/src/app/shared/object-grid/object-grid.component.spec.ts
similarity index 100%
rename from src/app/object-grid/object-grid.component.spec.ts
rename to src/app/shared/object-grid/object-grid.component.spec.ts
diff --git a/src/app/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts
similarity index 88%
rename from src/app/object-grid/object-grid.component.ts
rename to src/app/shared/object-grid/object-grid.component.ts
index a6b62d735f..c811d90d62 100644
--- a/src/app/object-grid/object-grid.component.ts
+++ b/src/app/shared/object-grid/object-grid.component.ts
@@ -8,13 +8,13 @@ import {
 } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 
-import { RemoteData } from '../core/data/remote-data';
-import { PageInfo } from '../core/shared/page-info.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PageInfo } from '../../core/shared/page-info.model';
 
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
-import { SortOptions, SortDirection } from '../core/cache/models/sort-options.model';
-import { fadeIn } from '../shared/animations/fade';
+import { SortOptions, SortDirection } from '../../core/cache/models/sort-options.model';
+import { fadeIn } from '../animations/fade';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 
 @Component({
diff --git a/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
similarity index 100%
rename from src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
rename to src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss
new file mode 100644
index 0000000000..2867dd78ac
--- /dev/null
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../../styles/variables';
+@import '../../grid-card-styling';
diff --git a/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
similarity index 84%
rename from src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
rename to src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
index 6c5e526d15..0228107a57 100644
--- a/src/app/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
@@ -4,8 +4,8 @@ import { renderElementsFor} from '../../../object-collection/shared/dso-element-
 
 import { CollectionSearchResult } from './collection-search-result.model';
 import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { ViewMode } from '../../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-collection-search-result-grid-element',
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result.model.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result.model.ts
new file mode 100644
index 0000000000..ad48247e70
--- /dev/null
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result.model.ts
@@ -0,0 +1,5 @@
+import { SearchResult } from '../../../../+search-page/search-result.model';
+import { Collection } from '../../../../core/shared/collection.model';
+
+export class CollectionSearchResult extends SearchResult<Collection> {
+}
diff --git a/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
similarity index 100%
rename from src/app/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
rename to src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss
new file mode 100644
index 0000000000..2867dd78ac
--- /dev/null
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../../styles/variables';
+@import '../../grid-card-styling';
diff --git a/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
similarity index 84%
rename from src/app/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
rename to src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
index b6aa4bdb6d..4876a784fc 100644
--- a/src/app/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 
 import { CommunitySearchResult } from './community-search-result.model';
-import { Community } from '../../../core/shared/community.model';
+import { Community } from '../../../../core/shared/community.model';
 import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
 import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { ViewMode } from '../../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-community-search-result-grid-element',
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result.model.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result.model.ts
new file mode 100644
index 0000000000..efeb328e11
--- /dev/null
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result.model.ts
@@ -0,0 +1,5 @@
+import { SearchResult } from '../../../../+search-page/search-result.model';
+import { Community } from '../../../../core/shared/community.model';
+
+export class CommunitySearchResult extends SearchResult<Community> {
+}
diff --git a/src/app/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html
similarity index 100%
rename from src/app/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html
rename to src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss
new file mode 100644
index 0000000000..2867dd78ac
--- /dev/null
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../../styles/variables';
+@import '../../grid-card-styling';
diff --git a/src/app/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
similarity index 84%
rename from src/app/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
rename to src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
index d4989d2efd..f9fe13cb88 100644
--- a/src/app/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
 
 import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
 import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
-import { Item } from '../../../core/shared/item.model';
+import { Item } from '../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { ViewMode } from '../../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-item-search-result-grid-element',
diff --git a/src/app/object-grid/search-result-grid-element/search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.scss
similarity index 51%
rename from src/app/object-grid/search-result-grid-element/search-result-grid-element.component.scss
rename to src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.scss
index 0f2684f1f1..ebec5817e6 100644
--- a/src/app/object-grid/search-result-grid-element/search-result-grid-element.component.scss
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.scss
@@ -1,5 +1,5 @@
- @import '../../../styles/variables.scss';
- @import '../grid-card-styling.scss';
+ @import '../../../../styles/variables';
+ @import '../grid-card-styling';
 :host {
     /deep/ em {
         font-weight: bold;
diff --git a/src/app/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
similarity index 83%
rename from src/app/object-grid/search-result-grid-element/search-result-grid-element.component.ts
rename to src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index ba98a58d4b..052a9377b5 100644
--- a/src/app/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,9 +1,9 @@
 import { Component, Inject } from '@angular/core';
 
-import { SearchResult } from '../../+search-page/search-result.model';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { Metadatum } from '../../core/shared/metadatum.model';
-import { isEmpty, hasNoValue } from '../../shared/empty.util';
+import { SearchResult } from '../../../+search-page/search-result.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Metadatum } from '../../../core/shared/metadatum.model';
+import { isEmpty, hasNoValue } from '../../empty.util';
 import { ObjectGridElementComponent } from '../object-grid-element/object-grid-element.component';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 
diff --git a/src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.html b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.html
similarity index 100%
rename from src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.html
rename to src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.html
diff --git a/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss
new file mode 100644
index 0000000000..946c8a6a31
--- /dev/null
+++ b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../styles/variables';
+@import '../grid-card-styling';
diff --git a/src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.spec.ts b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.spec.ts
similarity index 100%
rename from src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.spec.ts
rename to src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.spec.ts
diff --git a/src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
similarity index 86%
rename from src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
rename to src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
index 000c826188..912df16786 100644
--- a/src/app/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
+++ b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, Injector, ReflectiveInjector, OnInit } from '@angular/core';
-import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { rendersDSOType } from '../../object-collection/shared/dso-element-decorator';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-wrapper-grid-element',
diff --git a/src/app/object-list/collection-list-element/collection-list-element.component.html b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
similarity index 100%
rename from src/app/object-list/collection-list-element/collection-list-element.component.html
rename to src/app/shared/object-list/collection-list-element/collection-list-element.component.html
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.scss b/src/app/shared/object-list/collection-list-element/collection-list-element.component.scss
new file mode 100644
index 0000000000..45a533cd01
--- /dev/null
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.scss
@@ -0,0 +1 @@
+@import '../../../../styles/variables';
diff --git a/src/app/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
similarity index 80%
rename from src/app/object-list/collection-list-element/collection-list-element.component.ts
rename to src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index c065a64b72..5e08e8ef3a 100644
--- a/src/app/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,9 +1,9 @@
 import { Component, Inject } from '@angular/core';
 
-import { Collection } from '../../core/shared/collection.model';
+import { Collection } from '../../../core/shared/collection.model';
 import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
 import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-collection-list-element',
diff --git a/src/app/object-list/community-list-element/community-list-element.component.html b/src/app/shared/object-list/community-list-element/community-list-element.component.html
similarity index 100%
rename from src/app/object-list/community-list-element/community-list-element.component.html
rename to src/app/shared/object-list/community-list-element/community-list-element.component.html
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.scss b/src/app/shared/object-list/community-list-element/community-list-element.component.scss
new file mode 100644
index 0000000000..45a533cd01
--- /dev/null
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.scss
@@ -0,0 +1 @@
+@import '../../../../styles/variables';
diff --git a/src/app/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
similarity index 80%
rename from src/app/object-list/community-list-element/community-list-element.component.ts
rename to src/app/shared/object-list/community-list-element/community-list-element.component.ts
index 11ff392942..cd6e6f7574 100644
--- a/src/app/object-list/community-list-element/community-list-element.component.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, Inject } from '@angular/core';
 
-import { Community } from '../../core/shared/community.model';
+import { Community } from '../../../core/shared/community.model';
 import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
 import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-community-list-element',
diff --git a/src/app/object-list/item-list-element/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-list-element.component.html
similarity index 100%
rename from src/app/object-list/item-list-element/item-list-element.component.html
rename to src/app/shared/object-list/item-list-element/item-list-element.component.html
diff --git a/src/app/shared/object-list/item-list-element/item-list-element.component.scss b/src/app/shared/object-list/item-list-element/item-list-element.component.scss
new file mode 100644
index 0000000000..45a533cd01
--- /dev/null
+++ b/src/app/shared/object-list/item-list-element/item-list-element.component.scss
@@ -0,0 +1 @@
+@import '../../../../styles/variables';
diff --git a/src/app/object-list/item-list-element/item-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-list-element.component.ts
similarity index 80%
rename from src/app/object-list/item-list-element/item-list-element.component.ts
rename to src/app/shared/object-list/item-list-element/item-list-element.component.ts
index bdc5733dcd..43c59f0980 100644
--- a/src/app/object-list/item-list-element/item-list-element.component.ts
+++ b/src/app/shared/object-list/item-list-element/item-list-element.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, Inject } from '@angular/core';
 
-import { Item } from '../../core/shared/item.model';
+import { Item } from '../../../core/shared/item.model';
 import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
 import { renderElementsFor } from '../../object-collection/shared/dso-element-decorator';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-item-list-element',
diff --git a/src/app/object-list/object-list-element/object-list-element.component.html b/src/app/shared/object-list/object-list-element/object-list-element.component.html
similarity index 100%
rename from src/app/object-list/object-list-element/object-list-element.component.html
rename to src/app/shared/object-list/object-list-element/object-list-element.component.html
diff --git a/src/app/object-list/object-list-element/object-list-element.component.scss b/src/app/shared/object-list/object-list-element/object-list-element.component.scss
similarity index 56%
rename from src/app/object-list/object-list-element/object-list-element.component.scss
rename to src/app/shared/object-list/object-list-element/object-list-element.component.scss
index 1a22768fe8..f96f4ae744 100644
--- a/src/app/object-list/object-list-element/object-list-element.component.scss
+++ b/src/app/shared/object-list/object-list-element/object-list-element.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@import '../../../../styles/variables';
 
 :host {
   display: block;
diff --git a/src/app/object-list/object-list-element/object-list-element.component.ts b/src/app/shared/object-list/object-list-element/object-list-element.component.ts
similarity index 100%
rename from src/app/object-list/object-list-element/object-list-element.component.ts
rename to src/app/shared/object-list/object-list-element/object-list-element.component.ts
diff --git a/src/app/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
similarity index 100%
rename from src/app/object-list/object-list.component.html
rename to src/app/shared/object-list/object-list.component.html
diff --git a/src/app/shared/object-list/object-list.component.scss b/src/app/shared/object-list/object-list.component.scss
new file mode 100644
index 0000000000..48e6526dff
--- /dev/null
+++ b/src/app/shared/object-list/object-list.component.scss
@@ -0,0 +1 @@
+@import '../../../styles/variables';
diff --git a/src/app/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
similarity index 90%
rename from src/app/object-list/object-list.component.ts
rename to src/app/shared/object-list/object-list.component.ts
index 9422d1d843..c1e3d21760 100644
--- a/src/app/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -9,9 +9,14 @@ import {
 
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
 
-import { RemoteData } from '../core/data/remote-data';
-import { PageInfo } from '../core/shared/page-info.model';
-import { fadeIn } from '../shared/animations/fade';
+import { RemoteData } from '../../core/data/remote-data';
+import { PageInfo } from '../../core/shared/page-info.model';
+
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+
+import { SortOptions, SortDirection } from '../../core/cache/models/sort-options.model';
+
+import { fadeIn } from '../animations/fade';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { hasValue } from '../shared/empty.util';
 
diff --git a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
similarity index 100%
rename from src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
rename to src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss
new file mode 100644
index 0000000000..1d0786105c
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss
@@ -0,0 +1 @@
+@import '../../../../../styles/variables';
diff --git a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
similarity index 84%
rename from src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
rename to src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 1b5d7ef0ba..5545ea17ec 100644
--- a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
 import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
 import { CollectionSearchResult } from './collection-search-result.model';
 import { SearchResultListElementComponent } from '../search-result-list-element.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { Collection } from '../../../../core/shared/collection.model';
+import { ViewMode } from '../../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-collection-search-result-list-element',
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts
new file mode 100644
index 0000000000..ad48247e70
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result.model.ts
@@ -0,0 +1,5 @@
+import { SearchResult } from '../../../../+search-page/search-result.model';
+import { Collection } from '../../../../core/shared/collection.model';
+
+export class CollectionSearchResult extends SearchResult<Collection> {
+}
diff --git a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
similarity index 100%
rename from src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
rename to src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss
new file mode 100644
index 0000000000..1d0786105c
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss
@@ -0,0 +1 @@
+@import '../../../../../styles/variables';
diff --git a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
similarity index 84%
rename from src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
rename to src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index d9ab001f58..2d96f61833 100644
--- a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
 import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
 import { CommunitySearchResult } from './community-search-result.model';
 import { SearchResultListElementComponent } from '../search-result-list-element.component';
-import { Community } from '../../../core/shared/community.model';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { Community } from '../../../../core/shared/community.model';
+import { ViewMode } from '../../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-community-search-result-list-element',
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result.model.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result.model.ts
new file mode 100644
index 0000000000..efeb328e11
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result.model.ts
@@ -0,0 +1,5 @@
+import { SearchResult } from '../../../../+search-page/search-result.model';
+import { Community } from '../../../../core/shared/community.model';
+
+export class CommunitySearchResult extends SearchResult<Community> {
+}
diff --git a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
similarity index 100%
rename from src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
rename to src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss
new file mode 100644
index 0000000000..1d0786105c
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss
@@ -0,0 +1 @@
+@import '../../../../../styles/variables';
diff --git a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
similarity index 84%
rename from src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
rename to src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
index 929233f1a3..d1011c8c45 100644
--- a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
 
 import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator';
 import { SearchResultListElementComponent } from '../search-result-list-element.component';
-import { Item } from '../../../core/shared/item.model';
+import { Item } from '../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { ViewMode } from '../../../+search-page/search-options.model';
+import { ViewMode } from '../../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-item-search-result-list-element',
diff --git a/src/app/object-list/search-result-list-element/search-result-list-element.component.scss b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.scss
similarity index 67%
rename from src/app/object-list/search-result-list-element/search-result-list-element.component.scss
rename to src/app/shared/object-list/search-result-list-element/search-result-list-element.component.scss
index 5ec8b5d81b..7134c43dad 100644
--- a/src/app/object-list/search-result-list-element/search-result-list-element.component.scss
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.scss
@@ -1,7 +1,7 @@
-@import '../../../styles/variables.scss';
+@import '../../../../styles/variables';
 :host {
     ::ng-deep em {
         font-weight: bold;
         font-style: normal;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/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
similarity index 83%
rename from src/app/object-list/search-result-list-element/search-result-list-element.component.ts
rename to src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index ec0afde65d..b89bb56da6 100644
--- a/src/app/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,10 +1,10 @@
 import { Component, Inject } from '@angular/core';
 
 import { ObjectListElementComponent } from '../object-list-element/object-list-element.component';
-import { SearchResult } from '../../+search-page/search-result.model';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { Metadatum } from '../../core/shared/metadatum.model';
-import { isEmpty, hasNoValue } from '../../shared/empty.util';
+import { SearchResult } from '../../../+search-page/search-result.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Metadatum } from '../../../core/shared/metadatum.model';
+import { isEmpty, hasNoValue } from '../../empty.util';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 
 @Component({
diff --git a/src/app/object-list/wrapper-list-element/wrapper-list-element.component.html b/src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.html
similarity index 100%
rename from src/app/object-list/wrapper-list-element/wrapper-list-element.component.html
rename to src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.html
diff --git a/src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.scss b/src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.scss
new file mode 100644
index 0000000000..51a7fc6a55
--- /dev/null
+++ b/src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../styles/variables';
+
diff --git a/src/app/object-list/wrapper-list-element/wrapper-list-element.component.ts b/src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
similarity index 86%
rename from src/app/object-list/wrapper-list-element/wrapper-list-element.component.ts
rename to src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
index ff5591442d..6450babae8 100644
--- a/src/app/object-list/wrapper-list-element/wrapper-list-element.component.ts
+++ b/src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, Injector, ReflectiveInjector, OnInit } from '@angular/core';
 import { rendersDSOType } from '../../object-collection/shared/dso-element-decorator'
-import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
-import { ViewMode } from '../../+search-page/search-options.model';
+import { ViewMode } from '../../../+search-page/search-options.model';
 
 @Component({
   selector: 'ds-wrapper-list-element',
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 8ef05b2f89..7ee5ba56df 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -14,21 +14,21 @@ import { FileSizePipe } from './utils/file-size-pipe';
 import { SafeUrlPipe } from './utils/safe-url-pipe';
 import { TruncatePipe } from './utils/truncate.pipe';
 
-import { CollectionListElementComponent } from '../object-list/collection-list-element/collection-list-element.component';
-import { CommunityListElementComponent } from '../object-list/community-list-element/community-list-element.component';
-import { ItemListElementComponent } from '../object-list/item-list-element/item-list-element.component';
-import { ObjectListElementComponent } from '../object-list/object-list-element/object-list-element.component';
-import { SearchResultListElementComponent } from '../object-list/search-result-list-element/search-result-list-element.component';
-import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
-import { ObjectListComponent } from '../object-list/object-list.component';
+import { CollectionListElementComponent } from './object-list/collection-list-element/collection-list-element.component';
+import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
+import { ItemListElementComponent } from './object-list/item-list-element/item-list-element.component';
+import { ObjectListElementComponent } from './object-list/object-list-element/object-list-element.component';
+import { SearchResultListElementComponent } from './object-list/search-result-list-element/search-result-list-element.component';
+import { WrapperListElementComponent } from './object-list/wrapper-list-element/wrapper-list-element.component';
+import { ObjectListComponent } from './object-list/object-list.component';
 
-import { CollectionGridElementComponent} from '../object-grid/collection-grid-element/collection-grid-element.component'
-import { CommunityGridElementComponent} from '../object-grid/community-grid-element/community-grid-element.component'
-import { ItemGridElementComponent} from '../object-grid/item-grid-element/item-grid-element.component'
-import { ObjectGridElementComponent} from '../object-grid/object-grid-element/object-grid-element.component'
-import { WrapperGridElementComponent} from '../object-grid/wrapper-grid-element/wrapper-grid-element.component'
-import { ObjectGridComponent } from '../object-grid/object-grid.component';
-import { ObjectCollectionComponent } from '../object-collection/object-collection.component';
+import { CollectionGridElementComponent} from './object-grid/collection-grid-element/collection-grid-element.component'
+import { CommunityGridElementComponent} from './object-grid/community-grid-element/community-grid-element.component'
+import { ItemGridElementComponent} from './object-grid/item-grid-element/item-grid-element.component'
+import { ObjectGridElementComponent} from './object-grid/object-grid-element/object-grid-element.component'
+import { WrapperGridElementComponent} from './object-grid/wrapper-grid-element/wrapper-grid-element.component'
+import { ObjectGridComponent } from './object-grid/object-grid.component';
+import { ObjectCollectionComponent } from './object-collection/object-collection.component';
 import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
 import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
 import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
@@ -38,9 +38,9 @@ import { LoadingComponent } from './loading/loading.component';
 import { PaginationComponent } from './pagination/pagination.component';
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
 import { SearchFormComponent } from './search-form/search-form.component';
-import { SearchResultGridElementComponent } from '../object-grid/search-result-grid-element/search-result-grid-element.component';
+import { SearchResultGridElementComponent } from './object-grid/search-result-grid-element/search-result-grid-element.component';
 import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
-import { GridThumbnailComponent } from '../object-grid/grid-thumbnail/grid-thumbnail.component';
+import { GridThumbnailComponent } from './object-grid/grid-thumbnail/grid-thumbnail.component';
 import { VarDirective } from './utils/var.directive';
 
 const MODULES = [