diff --git a/frontend/src/app/shared/components/search/queries/query-path.component.ts b/frontend/src/app/shared/components/search/queries/query-path.component.ts
index 71d745e23..527c2fec8 100644
--- a/frontend/src/app/shared/components/search/queries/query-path.component.ts
+++ b/frontend/src/app/shared/components/search/queries/query-path.component.ts
@@ -6,8 +6,7 @@
  */
 
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
-import { FilterableField } from '@app/shared';
-import { QueryModel } from '@app/shared/internal';
+import { FilterableField, QueryModel } from '@app/shared/internal';
 
 @Component({
     selector: 'sqx-query-path[model]',
diff --git a/frontend/src/app/shared/guards/app-must-exist.guard.spec.ts b/frontend/src/app/shared/guards/app-must-exist.guard.spec.ts
index 2dfde313e..2c4b6c170 100644
--- a/frontend/src/app/shared/guards/app-must-exist.guard.spec.ts
+++ b/frontend/src/app/shared/guards/app-must-exist.guard.spec.ts
@@ -8,7 +8,7 @@
 import { Router } from '@angular/router';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
-import { AppsState } from '@app/shared';
+import { AppsState } from '@app/shared/internal';
 import { AppMustExistGuard } from './app-must-exist.guard';
 
 describe('AppMustExistGuard', () => {
diff --git a/frontend/src/app/shared/guards/load-apps.guard.spec.ts b/frontend/src/app/shared/guards/load-apps.guard.spec.ts
index 379a9b030..29979c586 100644
--- a/frontend/src/app/shared/guards/load-apps.guard.spec.ts
+++ b/frontend/src/app/shared/guards/load-apps.guard.spec.ts
@@ -7,7 +7,7 @@
 
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
-import { AppsState } from '@app/shared';
+import { AppsState } from '@app/shared/internal';
 import { LoadAppsGuard } from './load-apps.guard';
 
 describe('LoadAppsGuard', () => {
diff --git a/frontend/src/app/shared/guards/load-languages.guard.spec.ts b/frontend/src/app/shared/guards/load-languages.guard.spec.ts
index 8bbba30cc..7d7513a85 100644
--- a/frontend/src/app/shared/guards/load-languages.guard.spec.ts
+++ b/frontend/src/app/shared/guards/load-languages.guard.spec.ts
@@ -7,7 +7,7 @@
 
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
-import { LanguagesState } from '@app/shared';
+import { LanguagesState } from '@app/shared/internal';
 import { LoadLanguagesGuard } from './load-languages.guard';
 
 describe('LoadLanguagesGuard', () => {
diff --git a/frontend/src/app/shared/guards/load-schemas.guard.spec.ts b/frontend/src/app/shared/guards/load-schemas.guard.spec.ts
index 7e17eac50..6bea07f9d 100644
--- a/frontend/src/app/shared/guards/load-schemas.guard.spec.ts
+++ b/frontend/src/app/shared/guards/load-schemas.guard.spec.ts
@@ -7,7 +7,7 @@
 
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
-import { SchemasState } from '@app/shared';
+import { SchemasState } from '@app/shared/internal';
 import { LoadSchemasGuard } from './load-schemas.guard';
 
 describe('LoadSchemasGuard', () => {
diff --git a/frontend/src/app/shared/guards/must-be-authenticated.guard.spec.ts b/frontend/src/app/shared/guards/must-be-authenticated.guard.spec.ts
index bbd038f94..8d851cc8a 100644
--- a/frontend/src/app/shared/guards/must-be-authenticated.guard.spec.ts
+++ b/frontend/src/app/shared/guards/must-be-authenticated.guard.spec.ts
@@ -8,7 +8,7 @@
 import { Router } from '@angular/router';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
-import { AuthService, UIOptions } from '@app/shared';
+import { AuthService, UIOptions } from '@app/shared/internal';
 import { MustBeAuthenticatedGuard } from './must-be-authenticated.guard';
 
 describe('MustBeAuthenticatedGuard', () => {
diff --git a/frontend/src/app/shared/guards/must-be-not-authenticated.guard.spec.ts b/frontend/src/app/shared/guards/must-be-not-authenticated.guard.spec.ts
index 676f704f1..2e9af64e2 100644
--- a/frontend/src/app/shared/guards/must-be-not-authenticated.guard.spec.ts
+++ b/frontend/src/app/shared/guards/must-be-not-authenticated.guard.spec.ts
@@ -8,7 +8,7 @@
 import { Router } from '@angular/router';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
-import { AuthService, UIOptions } from '@app/shared';
+import { AuthService, UIOptions } from '@app/shared/internal';
 import { MustBeNotAuthenticatedGuard } from './must-be-not-authenticated.guard';
 
 describe('MustBeNotAuthenticatedGuard', () => {