diff --git a/src/app/notifications/suggestions.service.ts b/src/app/notifications/suggestions.service.ts
index 3b2ce081f1d..b1f2c9ca883 100644
--- a/src/app/notifications/suggestions.service.ts
+++ b/src/app/notifications/suggestions.service.ts
@@ -6,7 +6,6 @@ import { catchError, map, mergeMap, take } from 'rxjs/operators';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
 import { RemoteData } from '../core/data/remote-data';
 import { PaginatedList } from '../core/data/paginated-list.model';
-import { SuggestionTarget } from '../core/suggestion-notifications/models/suggestion-target.model';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { ResearcherProfile } from '../core/profile/model/researcher-profile.model';
 import {
@@ -15,7 +14,6 @@ import {
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteListPayload
 } from '../core/shared/operators';
-import { Suggestion } from '../core/suggestion-notifications/models/suggestion.model';
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
 import { TranslateService } from '@ngx-translate/core';
 import { NoContent } from '../core/shared/NoContent.model';
@@ -24,13 +22,11 @@ import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
 import {FindListOptions} from '../core/data/find-list-options.model';
 import {SuggestionConfig} from '../../config/suggestion-config.interfaces';
 import { ResearcherProfileDataService } from '../core/profile/researcher-profile-data.service';
-import {
-  SuggestionTargetDataService
-} from '../core/suggestion-notifications/target/suggestion-target-data.service';
-import {
-  SuggestionsDataService
-} from '../core/suggestion-notifications/suggestions-data.service';
 import { getSuggestionPageRoute } from '../suggestions-page/suggestions-page-routing-paths';
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { Suggestion } from '../core/notifications/models/suggestion.model';
 
 /**
  * useful for multiple approvals and ignores operation