diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index d6315ce4f6..5b78e3462f 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -44,8 +44,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { RouteService } from './core/services/route.service';
 import { MockActivatedRoute } from './shared/mocks/mock-active-router';
 import { MockRouter } from './shared/mocks/mock-router';
-import { CookieService } from './shared/services/cookie.service';
 import { MockCookieService } from './shared/mocks/mock-cookie.service';
+import { CookieService } from './core/services/cookie.service';
 
 let comp: AppComponent;
 let fixture: ComponentFixture<AppComponent>;
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0c6fd538fa..50baaf6e57 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -32,9 +32,8 @@ import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
 import { slideSidebarPadding } from './shared/animations/slide';
 import { HostWindowService } from './shared/host-window.service';
 import { Theme } from '../config/theme.inferface';
-import { ClientCookieService } from './shared/services/client-cookie.service';
 import { isNotEmpty } from './shared/empty.util';
-import { CookieService } from './shared/services/cookie.service';
+import { CookieService } from './core/services/cookie.service';
 
 export const LANG_COOKIE = 'language_cookie';
 
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3781edf532..916788df8c 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -39,7 +39,7 @@ import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/e
 import { NavbarModule } from './navbar/navbar.module';
 import { JournalEntitiesModule } from './entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from './entity-groups/research-entities/research-entities.module';
-import { ClientCookieService } from './shared/services/client-cookie.service';
+import { ClientCookieService } from './core/services/client-cookie.service';
 
 export function getConfig() {
   return ENV_CONFIG;
diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts
index 0f84901fbc..5b10578f77 100644
--- a/src/app/shared/lang-switch/lang-switch.component.spec.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts
@@ -7,8 +7,8 @@ import { GLOBAL_CONFIG } from '../../../config';
 import {LangConfig} from '../../../config/lang-config.interface';
 import {Observable, of} from 'rxjs';
 import { By } from '@angular/platform-browser';
-import { CookieService } from '../services/cookie.service';
 import { MockCookieService } from '../mocks/mock-cookie.service';
+import { CookieService } from '../../core/services/cookie.service';
 
 // This test is completely independent from any message catalogs or keys in the codebase
 // The translation module is instantiated with these bogus messages that we aren't using anyway.
diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts
index 3b490b98d4..e91ed5c9a2 100644
--- a/src/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.ts
@@ -2,9 +2,8 @@ import {Component, Inject, OnInit} from '@angular/core';
 import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
 import {TranslateService} from '@ngx-translate/core';
 import {LangConfig} from '../../../config/lang-config.interface';
-import { ClientCookieService } from '../services/client-cookie.service';
 import { LANG_COOKIE } from '../../app.component';
-import { CookieService } from '../services/cookie.service';
+import { CookieService } from '../../core/services/cookie.service';
 
 @Component({
   selector: 'ds-lang-switch',