diff --git a/docs/tutorials/file-lists.md b/docs/tutorials/file-lists.md
index d9f514b4a..bef99199c 100644
--- a/docs/tutorials/file-lists.md
+++ b/docs/tutorials/file-lists.md
@@ -106,7 +106,7 @@ As first step we can create our custom component in our extension:
 ```typescript
 import { NameColumnComponent } from '@alfresco/adf-content-services';
 import { Component, ChangeDetectionStrategy, ViewEncapsulation, ElementRef, OnInit, OnDestroy } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 
 @Component({
   selector: 'custom-template-column',
diff --git a/migrations.json b/migrations.json
new file mode 100644
index 000000000..bf34ec259
--- /dev/null
+++ b/migrations.json
@@ -0,0 +1,11 @@
+{
+  "migrations": [
+    {
+      "description": "Update alfresco-api imports",
+      "version": "6.10.0-10366268804",
+      "factory": "./7_0_0/index#updateAlfrescoApiImports",
+      "package": "@alfresco/adf-core",
+      "name": "move-out-alfresco-api"
+    }
+  ]
+}
diff --git a/package-lock.json b/package-lock.json
index 6433104fd..80fde25e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,11 +9,11 @@
       "version": "5.1.1",
       "license": "LGPL-3.0",
       "dependencies": {
-        "@alfresco/adf-content-services": "7.0.0-alpha.2-10705302287",
-        "@alfresco/adf-core": "7.0.0-alpha.2-10705302287",
-        "@alfresco/adf-extensions": "7.0.0-alpha.2-10705302287",
-        "@alfresco/eslint-plugin-eslint-angular": "7.0.0-alpha.2-10705302287",
-        "@alfresco/js-api": "8.0.0-alpha.2-10705302287",
+        "@alfresco/adf-content-services": "7.0.0-alpha.2-10742047850",
+        "@alfresco/adf-core": "7.0.0-alpha.2-10742047850",
+        "@alfresco/adf-extensions": "7.0.0-alpha.2-10742047850",
+        "@alfresco/eslint-plugin-eslint-angular": "7.0.0-alpha.2-10742047850",
+        "@alfresco/js-api": "8.0.0-alpha.2-10742047850",
         "@angular/animations": "15.2.10",
         "@angular/cdk": "15.2.9",
         "@angular/common": "15.2.10",
@@ -41,7 +41,7 @@
         "zone.js": "0.11.8"
       },
       "devDependencies": {
-        "@alfresco/adf-cli": "7.0.0-alpha.2-10705302287",
+        "@alfresco/adf-cli": "7.0.0-alpha.2-10742047850",
         "@angular-devkit/build-angular": "15.2.10",
         "@angular-devkit/core": "15.2.10",
         "@angular-devkit/schematics": "15.2.10",
@@ -106,12 +106,12 @@
       "dev": true
     },
     "node_modules/@alfresco/adf-cli": {
-      "version": "7.0.0-alpha.2-10705302287",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-7.0.0-alpha.2-10705302287.tgz",
-      "integrity": "sha512-Uxr7lH+l9AoCq+1yYn1D6ADJQ4UuoZteCByv+K6E1I3m+cDrIhRkXFI3DbnCeARSlD32c4ZCMykpUTeYPvJsoQ==",
+      "version": "7.0.0-alpha.2-10742047850",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-7.0.0-alpha.2-10742047850.tgz",
+      "integrity": "sha512-HFdrJJOK2dY6p57ymrowms2InUib6ioRMEH6ufCE0+zSbZGj5pY+TWOQDIMoRBQj0IMpize2w9xkFXOlVpHvmg==",
       "dev": true,
       "dependencies": {
-        "@alfresco/js-api": ">=8.0.0-alpha.2-10705302287",
+        "@alfresco/js-api": ">=8.0.0-alpha.2-10742047850",
         "commander": "^6.2.1",
         "ejs": "^3.1.9",
         "license-checker": "^25.0.1",
@@ -126,15 +126,15 @@
       }
     },
     "node_modules/@alfresco/adf-content-services": {
-      "version": "7.0.0-alpha.2-10705302287",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-7.0.0-alpha.2-10705302287.tgz",
-      "integrity": "sha512-fV21wtPMA/4ZqKzGhGgiB9O7qhRTReS7iBJHme9UVa81YYuwY6oP4NpSzxyC79oD6pN6GTcM0IbIVzr0aLBJBA==",
+      "version": "7.0.0-alpha.2-10742047850",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-7.0.0-alpha.2-10742047850.tgz",
+      "integrity": "sha512-AYOh1KK8SvI6oXd+7kDyWn91OJIohyrcfuQY9IMgAmZBK1Qd19iAlHBbW7hHLS2a/HX7BVNs1qZXJ4UJbx9orA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/adf-core": ">=7.0.0-alpha.2-10705302287",
-        "@alfresco/js-api": ">=8.0.0-alpha.2-10705302287",
+        "@alfresco/adf-core": ">=7.0.0-alpha.2-10742047850",
+        "@alfresco/js-api": ">=8.0.0-alpha.2-10742047850",
         "@angular/animations": ">=14.1.3",
         "@angular/cdk": ">=14.1.2",
         "@angular/common": ">=14.1.3",
@@ -149,9 +149,9 @@
       }
     },
     "node_modules/@alfresco/adf-core": {
-      "version": "7.0.0-alpha.2-10705302287",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-7.0.0-alpha.2-10705302287.tgz",
-      "integrity": "sha512-Q2MnTqQWZ6j8foGULxG5/35DmWOrSRwnnu9TNoHwrzoB85UI+vDDKfcJJtoIgsoy5r3en0mbcNAD6NqTsuh/LQ==",
+      "version": "7.0.0-alpha.2-10742047850",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-7.0.0-alpha.2-10742047850.tgz",
+      "integrity": "sha512-V4UrZcRmgZBHLlZPg5CvFCbCOhQtKTx4zUpO8mhVFI8UyKB1bkrWTfxU4zwqQVgMIcIEfld1+xLfEtpLs4R0GA==",
       "dependencies": {
         "angular-oauth2-oidc": "^13.0.1",
         "angular-oauth2-oidc-jwks": "^17.0.2",
@@ -159,8 +159,8 @@
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/adf-extensions": ">=7.0.0-alpha.2-10705302287",
-        "@alfresco/js-api": ">=8.0.0-alpha.2-10705302287",
+        "@alfresco/adf-extensions": ">=7.0.0-alpha.2-10742047850",
+        "@alfresco/js-api": ">=8.0.0-alpha.2-10742047850",
         "@angular/animations": ">=14.1.3",
         "@angular/cdk": ">=14.1.2",
         "@angular/common": ">=14.1.3",
@@ -171,35 +171,36 @@
         "@mat-datetimepicker/core": ">=10.1.1",
         "@ngx-translate/core": ">=14.0.0",
         "minimatch-browser": ">=1.0.0",
-        "pdfjs-dist": ">=3.3.122"
+        "pdfjs-dist": ">=3.3.122",
+        "ts-morph": "^20.0.0"
       }
     },
     "node_modules/@alfresco/adf-extensions": {
-      "version": "7.0.0-alpha.2-10705302287",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-7.0.0-alpha.2-10705302287.tgz",
-      "integrity": "sha512-KgSM+1eA5951LoyeojuXijLOJHBGryYpHgiHNKNAsqqa9aXpWQIlP1zEoUP3CIK7VX9sIXwK4EgNWFBTZ2ZU7g==",
+      "version": "7.0.0-alpha.2-10742047850",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-7.0.0-alpha.2-10742047850.tgz",
+      "integrity": "sha512-aCLrq9nfRqGxFqjH7qa9b4uyTPPPsYumOPEHEY0V//QTMSBoBC+Xra5Da6ta41Degu/ShtYQu0IebxJN8Wy+sg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/js-api": ">=8.0.0-alpha.2-10705302287",
+        "@alfresco/js-api": ">=8.0.0-alpha.2-10742047850",
         "@angular/common": ">=14.1.3",
         "@angular/core": ">=14.1.3"
       }
     },
     "node_modules/@alfresco/eslint-plugin-eslint-angular": {
-      "version": "7.0.0-alpha.2-10705302287",
-      "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-7.0.0-alpha.2-10705302287.tgz",
-      "integrity": "sha512-cmzU1wWMtc4htf9Rz08nSClDBF7Yzz6rZ0swiZaggmrWhpl88nCIzhPYbQBy7TEKpVswA8+KdcOVtqkzHLhATg==",
+      "version": "7.0.0-alpha.2-10742047850",
+      "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-7.0.0-alpha.2-10742047850.tgz",
+      "integrity": "sha512-Bi4ZocNjDDqWidcSIo4OCVQJWzPLERhxZ7CJKn+3WFVWnAYSIAy9YM2YJCNW1FWoQ4njBy9uwP7+H0abiVuD1g==",
       "dependencies": {
         "@angular-eslint/utils": "15.2.1",
         "@typescript-eslint/utils": "5.48.2"
       }
     },
     "node_modules/@alfresco/js-api": {
-      "version": "8.0.0-alpha.2-10705302287",
-      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-8.0.0-alpha.2-10705302287.tgz",
-      "integrity": "sha512-vc25roaQOLG9LLRVndrAEJCi6WFRZ4GGhvvHVqneEZUgzm+SaKBuL7iCTbg+AqetMkn/0VJ6fh/wylvl9da7YA==",
+      "version": "8.0.0-alpha.2-10742047850",
+      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-8.0.0-alpha.2-10742047850.tgz",
+      "integrity": "sha512-ZTwMb+zkrFtczJnOWYmGpxRnQp98UZ+U86LhFs2ak9ERCKGvL/id5RJO3893B35VIHcEgt3Z8VdGpnHiinyrOA==",
       "dependencies": {
         "event-emitter": "0.3.5",
         "superagent": "9.0.2",
@@ -10238,6 +10239,73 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/@ts-morph/common": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.21.0.tgz",
+      "integrity": "sha512-ES110Mmne5Vi4ypUKrtVQfXFDtCsDXiUiGxF6ILVlE90dDD4fdpC1LSjydl/ml7xJWKSDZwUYD2zkOePMSrPBA==",
+      "peer": true,
+      "dependencies": {
+        "fast-glob": "^3.2.12",
+        "minimatch": "^7.4.3",
+        "mkdirp": "^2.1.6",
+        "path-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "peer": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "peer": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/minimatch": {
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz",
+      "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==",
+      "peer": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@ts-morph/common/node_modules/mkdirp": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
+      "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
+      "peer": true,
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
@@ -13083,6 +13151,12 @@
         "node": ">= 0.12.0"
       }
     },
+    "node_modules/code-block-writer": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
+      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
+      "peer": true
+    },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
@@ -25099,6 +25173,12 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "peer": true
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -30558,6 +30638,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/ts-morph": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-20.0.0.tgz",
+      "integrity": "sha512-JVmEJy2Wow5n/84I3igthL9sudQ8qzjh/6i4tmYCm6IqYyKFlNbJZi7oBdjyqcWSWYRu3CtL0xbT6fS03ESZIg==",
+      "peer": true,
+      "dependencies": {
+        "@ts-morph/common": "~0.21.0",
+        "code-block-writer": "^12.0.0"
+      }
+    },
     "node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
diff --git a/package.json b/package.json
index 2168924fe..598e36702 100644
--- a/package.json
+++ b/package.json
@@ -30,11 +30,11 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "7.0.0-alpha.2-10705302287",
-    "@alfresco/adf-core": "7.0.0-alpha.2-10705302287",
-    "@alfresco/adf-extensions": "7.0.0-alpha.2-10705302287",
-    "@alfresco/eslint-plugin-eslint-angular": "7.0.0-alpha.2-10705302287",
-    "@alfresco/js-api": "8.0.0-alpha.2-10705302287",
+    "@alfresco/adf-content-services": "7.0.0-alpha.2-10742047850",
+    "@alfresco/adf-core": "7.0.0-alpha.2-10742047850",
+    "@alfresco/adf-extensions": "7.0.0-alpha.2-10742047850",
+    "@alfresco/eslint-plugin-eslint-angular": "7.0.0-alpha.2-10742047850",
+    "@alfresco/js-api": "8.0.0-alpha.2-10742047850",
     "@angular/animations": "15.2.10",
     "@angular/cdk": "15.2.9",
     "@angular/common": "15.2.10",
@@ -62,7 +62,7 @@
     "zone.js": "0.11.8"
   },
   "devDependencies": {
-    "@alfresco/adf-cli": "7.0.0-alpha.2-10705302287",
+    "@alfresco/adf-cli": "7.0.0-alpha.2-10742047850",
     "@angular-devkit/build-angular": "15.2.10",
     "@angular-devkit/core": "15.2.10",
     "@angular-devkit/schematics": "15.2.10",
diff --git a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts
index 11515944a..1cc83ba71 100644
--- a/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts
@@ -48,6 +48,7 @@ import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatProgressBarHarness } from '@angular/material/progress-bar/testing';
 import { MatSlideToggleHarness } from '@angular/material/slide-toggle/testing';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('ManageRulesSmartComponent', () => {
   let fixture: ComponentFixture<ManageRulesSmartComponent>;
@@ -71,6 +72,7 @@ describe('ManageRulesSmartComponent', () => {
             toggleAppNavBar$: new Subject()
           }
         },
+        { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
         { provide: Store, useValue: { dispatch: () => {} } },
         { provide: ActivatedRoute, useValue: { params: of({ nodeId: owningFolderIdMock }) } }
       ]
diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.spec.ts
index a7e53a8e9..972ca1bf5 100644
--- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.spec.ts
@@ -28,6 +28,7 @@ import { RuleActionListUiComponent } from './rule-action-list.ui-component';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 import { RuleActionUiComponent } from './rule-action.ui-component';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('RuleActionListUiComponent', () => {
   let fixture: ComponentFixture<RuleActionListUiComponent>;
@@ -38,7 +39,8 @@ describe('RuleActionListUiComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CoreTestingModule]
+      imports: [CoreTestingModule],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     fixture = TestBed.createComponent(RuleActionListUiComponent);
diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts
index f3249e92a..add41943b 100644
--- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts
@@ -34,7 +34,7 @@ import {
 import { By } from '@angular/platform-browser';
 import { dummyCategoriesConstraints, dummyConstraints, dummyTagsConstraints } from '../../mock/action-parameter-constraints.mock';
 import { securityMarksResponseMock, updateNotificationMock } from '../../mock/security-marks.mock';
-import { CategoryService, NodeAction, TagService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoApiServiceMock, CategoryService, NodeAction, TagService } from '@alfresco/adf-content-services';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
@@ -63,7 +63,8 @@ describe('RuleActionUiComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleActionUiComponent]
+      imports: [CoreTestingModule, RuleActionUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     fixture = TestBed.createComponent(RuleActionUiComponent);
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.spec.ts
index b946f9795..faecaf077 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.spec.ts
@@ -33,13 +33,15 @@ import {
   compositeConditionWithThreeConditionMock
 } from '../../mock/conditions.mock';
 import { RuleSimpleConditionUiComponent } from './rule-simple-condition.ui-component';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('RuleCompositeConditionUiComponent', () => {
   let fixture: ComponentFixture<RuleCompositeConditionUiComponent>;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleCompositeConditionUiComponent, RuleSimpleConditionUiComponent]
+      imports: [CoreTestingModule, RuleCompositeConditionUiComponent, RuleSimpleConditionUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     fixture = TestBed.createComponent(RuleCompositeConditionUiComponent);
diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
index bccce97e4..5d44d3938 100644
--- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
@@ -28,7 +28,7 @@ import { CoreTestingModule } from '@alfresco/adf-core';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 import { tagMock, mimeTypeMock, simpleConditionUnknownFieldMock, categoriesListMock } from '../../mock/conditions.mock';
-import { CategoryService, TagService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoApiServiceMock, CategoryService, TagService } from '@alfresco/adf-content-services';
 import { of } from 'rxjs';
 import { RuleSimpleCondition } from '../../model/rule-simple-condition.model';
 import { delay } from 'rxjs/operators';
@@ -83,7 +83,8 @@ describe('RuleSimpleConditionUiComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleSimpleConditionUiComponent]
+      imports: [CoreTestingModule, RuleSimpleConditionUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     fixture = TestBed.createComponent(RuleSimpleConditionUiComponent);
diff --git a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.smart-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.smart-component.spec.ts
index dce6f7e78..5c721f013 100644
--- a/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.smart-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.smart-component.spec.ts
@@ -29,6 +29,7 @@ import { RuleDetailsUiComponent } from './rule-details.ui-component';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { CoreTestingModule } from '@alfresco/adf-core';
 import { of, timer } from 'rxjs';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('EditRuleDialogSmartComponent', () => {
   let fixture: ComponentFixture<EditRuleDialogUiComponent>;
@@ -43,7 +44,8 @@ describe('EditRuleDialogSmartComponent', () => {
       imports: [CoreTestingModule, EditRuleDialogUiComponent],
       providers: [
         { provide: MatDialogRef, useValue: dialogRef },
-        { provide: MAT_DIALOG_DATA, useValue: dialogOptions }
+        { provide: MAT_DIALOG_DATA, useValue: dialogOptions },
+        { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
       ]
     });
 
diff --git a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts
index ba7f24c1f..157089ca5 100644
--- a/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts
@@ -33,6 +33,7 @@ import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatSelectHarness } from '@angular/material/select/testing';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('RuleOptionsUiComponent', () => {
   let fixture: ComponentFixture<RuleOptionsUiComponent>;
@@ -62,7 +63,16 @@ describe('RuleOptionsUiComponent', () => {
     TestBed.configureTestingModule({
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
       imports: [FormsModule, ReactiveFormsModule, CoreTestingModule, RuleOptionsUiComponent],
-      providers: [{ provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { floatLabel: 'auto' } }]
+      providers: [
+        {
+          provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
+          useValue: { floatLabel: 'auto' }
+        },
+        {
+          provide: AlfrescoApiService,
+          useClass: AlfrescoApiServiceMock
+        }
+      ]
     });
 
     fixture = TestBed.createComponent(RuleOptionsUiComponent);
diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts
index e5b3caf2c..9cd982013 100644
--- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts
@@ -30,7 +30,7 @@ import { By } from '@angular/platform-browser';
 import { RuleTriggersUiComponent } from './triggers/rule-triggers.ui-component';
 import { RuleOptionsUiComponent } from './options/rule-options.ui-component';
 import { RuleActionListUiComponent } from './actions/rule-action-list.ui-component';
-import { CategoryService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoApiServiceMock, CategoryService } from '@alfresco/adf-content-services';
 
 describe('RuleDetailsUiComponent', () => {
   let fixture: ComponentFixture<RuleDetailsUiComponent>;
@@ -55,7 +55,8 @@ describe('RuleDetailsUiComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleDetailsUiComponent]
+      imports: [CoreTestingModule, RuleDetailsUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     fixture = TestBed.createComponent(RuleDetailsUiComponent);
diff --git a/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.spec.ts
index 0a4fc1e63..ad73816a5 100644
--- a/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.spec.ts
@@ -27,6 +27,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CoreTestingModule } from '@alfresco/adf-core';
 import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('RuleTriggerUiComponent', () => {
   let fixture: ComponentFixture<RuleTriggersUiComponent>;
@@ -41,7 +42,8 @@ describe('RuleTriggerUiComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleTriggersUiComponent]
+      imports: [CoreTestingModule, RuleTriggersUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     fixture = TestBed.createComponent(RuleTriggersUiComponent);
diff --git a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.spec.ts
index db1eca223..d08296510 100644
--- a/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.spec.ts
@@ -30,6 +30,7 @@ import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { owningFolderIdMock } from '../../mock/node.mock';
 import { of } from 'rxjs';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('RuleListUiComponent', () => {
   let fixture: ComponentFixture<RuleListUiComponent>;
@@ -38,7 +39,8 @@ describe('RuleListUiComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CoreTestingModule, RuleListUiComponent]
+      imports: [CoreTestingModule, RuleListUiComponent],
+      providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     fixture = TestBed.createComponent(RuleListUiComponent);
diff --git a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts
index 1622c62ca..ab1f89624 100644
--- a/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts
@@ -32,6 +32,7 @@ import { of } from 'rxjs';
 import { ownedRuleSetMock, ruleSetWithLinkMock, ruleSetWithNoRulesToLinkMock, ruleSetWithOwnedRulesToLinkMock } from '../mock/rule-sets.mock';
 import { ContentApiService } from '@alfresco/aca-shared';
 import { By } from '@angular/platform-browser';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('RuleSetPickerSmartComponent', () => {
   let fixture: ComponentFixture<RuleSetPickerSmartComponent>;
@@ -55,6 +56,7 @@ describe('RuleSetPickerSmartComponent', () => {
     TestBed.configureTestingModule({
       imports: [CoreTestingModule, RuleSetPickerSmartComponent],
       providers: [
+        { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
         { provide: MatDialogRef, useValue: dialogRef },
         { provide: MAT_DIALOG_DATA, useValue: dialogOptions },
         {
diff --git a/projects/aca-content/folder-rules/src/services/actions.service.spec.ts b/projects/aca-content/folder-rules/src/services/actions.service.spec.ts
index 80c28b479..ed49ed202 100644
--- a/projects/aca-content/folder-rules/src/services/actions.service.spec.ts
+++ b/projects/aca-content/folder-rules/src/services/actions.service.spec.ts
@@ -30,6 +30,7 @@ import { actionDefListMock, actionsTransformedListMock } from '../mock/actions.m
 import { take } from 'rxjs/operators';
 import { dummyConstraints, rawConstraints } from '../mock/action-parameter-constraints.mock';
 import { of } from 'rxjs';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('ActionsService', () => {
   let actionsService: ActionsService;
@@ -37,7 +38,7 @@ describe('ActionsService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [CoreTestingModule],
-      providers: [ActionsService]
+      providers: [ActionsService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     actionsService = TestBed.inject(ActionsService);
diff --git a/projects/aca-content/folder-rules/src/services/actions.service.ts b/projects/aca-content/folder-rules/src/services/actions.service.ts
index e1ca4fe66..597e62c0b 100644
--- a/projects/aca-content/folder-rules/src/services/actions.service.ts
+++ b/projects/aca-content/folder-rules/src/services/actions.service.ts
@@ -24,7 +24,7 @@
 
 import { Injectable } from '@angular/core';
 import { ActionDefinition, ActionDefinitionEntry, ActionDefinitionList, ActionsApi } from '@alfresco/js-api';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { BehaviorSubject, forkJoin, from, Observable, of } from 'rxjs';
 import { finalize, map, switchMap } from 'rxjs/operators';
 import { ActionDefinitionTransformed, ActionParameterDefinitionTransformed } from '../model/rule-action.model';
diff --git a/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.spec.ts b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.spec.ts
index 67411f36f..a1d70bcb4 100644
--- a/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.spec.ts
+++ b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.spec.ts
@@ -32,6 +32,7 @@ import { of } from 'rxjs';
 import { getDefaultRuleSetResponseMock, getRuleSetsResponseMock, inheritedRuleSetMock, ownedRuleSetMock } from '../mock/rule-sets.mock';
 import { take } from 'rxjs/operators';
 import { inheritedRulesMock, linkedRulesMock, ownedRulesMock, ruleMock } from '../mock/rules.mock';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('FolderRuleSetsService', () => {
   let folderRuleSetsService: FolderRuleSetsService;
@@ -45,7 +46,7 @@ describe('FolderRuleSetsService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [CoreTestingModule],
-      providers: [FolderRuleSetsService, FolderRulesService, ContentApiService]
+      providers: [FolderRuleSetsService, FolderRulesService, ContentApiService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     folderRuleSetsService = TestBed.inject(FolderRuleSetsService);
diff --git a/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts
index 2a96c4d85..69af4930a 100644
--- a/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts
+++ b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts
@@ -23,7 +23,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { BehaviorSubject, combineLatest, from, Observable, of } from 'rxjs';
 import { NodeInfo } from '@alfresco/aca-shared/store';
 import { catchError, finalize, map, switchMap, tap } from 'rxjs/operators';
diff --git a/projects/aca-content/folder-rules/src/services/folder-rules.service.spec.ts b/projects/aca-content/folder-rules/src/services/folder-rules.service.spec.ts
index 1a41e15c2..e9dd64a2f 100644
--- a/projects/aca-content/folder-rules/src/services/folder-rules.service.spec.ts
+++ b/projects/aca-content/folder-rules/src/services/folder-rules.service.spec.ts
@@ -38,6 +38,7 @@ import {
 import { ruleSetMock } from '../mock/rule-sets.mock';
 import { owningFolderIdMock } from '../mock/node.mock';
 import { take } from 'rxjs/operators';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 
 describe('FolderRulesService', () => {
   let folderRulesService: FolderRulesService;
@@ -56,7 +57,7 @@ describe('FolderRulesService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [CoreTestingModule],
-      providers: [FolderRulesService]
+      providers: [FolderRulesService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }]
     });
 
     folderRulesService = TestBed.inject<FolderRulesService>(FolderRulesService);
diff --git a/projects/aca-content/folder-rules/src/services/folder-rules.service.ts b/projects/aca-content/folder-rules/src/services/folder-rules.service.ts
index de3479ea1..9c2464886 100644
--- a/projects/aca-content/folder-rules/src/services/folder-rules.service.ts
+++ b/projects/aca-content/folder-rules/src/services/folder-rules.service.ts
@@ -23,7 +23,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { BehaviorSubject, from, Observable } from 'rxjs';
 import { finalize, map } from 'rxjs/operators';
 import { Rule, RuleForForm, RuleOptions, RuleSettings } from '../model/rule.model';
diff --git a/projects/aca-content/src/lib/components/details/details.component.spec.ts b/projects/aca-content/src/lib/components/details/details.component.spec.ts
index dd39459ff..0c9412dc7 100644
--- a/projects/aca-content/src/lib/components/details/details.component.spec.ts
+++ b/projects/aca-content/src/lib/components/details/details.component.spec.ts
@@ -37,6 +37,7 @@ import { AuthenticationService, CORE_PIPES, PageTitleService } from '@alfresco/a
 import { BreadcrumbComponent, ContentService, SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { By } from '@angular/platform-browser';
 import { ContentActionRef } from '@alfresco/adf-extensions';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('DetailsComponent', () => {
   let component: DetailsComponent;
@@ -63,7 +64,7 @@ describe('DetailsComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, DetailsComponent, ...CORE_PIPES],
+      imports: [AppTestingModule, DetailsComponent, ...CORE_PIPES, MatSnackBarModule],
       providers: [
         RouterTestingModule,
         SearchQueryBuilderService,
diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts
index 0d68a60ff..1f98607e6 100644
--- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts
+++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts
@@ -24,7 +24,8 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
+import { UserPreferencesService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { FavoriteLibrariesComponent } from './favorite-libraries.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { AppHookService, ContentApiService } from '@alfresco/aca-shared';
@@ -34,6 +35,7 @@ import { of, throwError } from 'rxjs';
 import { LibraryEffects } from '../../store/effects';
 import { NodeEntry } from '@alfresco/js-api';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('FavoriteLibrariesComponent', () => {
   let fixture: ComponentFixture<FavoriteLibrariesComponent>;
@@ -56,7 +58,7 @@ describe('FavoriteLibrariesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([RouterEffects, LibraryEffects]), FavoriteLibrariesComponent]
+      imports: [AppTestingModule, EffectsModule.forRoot([RouterEffects, LibraryEffects]), FavoriteLibrariesComponent, MatSnackBarModule]
     });
 
     fixture = TestBed.createComponent(FavoriteLibrariesComponent);
diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts b/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts
index 36a908941..b1b51b126 100644
--- a/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts
+++ b/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts
@@ -30,6 +30,7 @@ import { FavoritesComponent } from './favorites.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { AppService, ContentApiService } from '@alfresco/aca-shared';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('FavoritesComponent', () => {
   let fixture: ComponentFixture<FavoritesComponent>;
@@ -40,7 +41,7 @@ describe('FavoritesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, FavoritesComponent],
+      imports: [AppTestingModule, FavoritesComponent, MatSnackBarModule],
       providers: [
         {
           provide: AppService,
diff --git a/projects/aca-content/src/lib/components/files/files.component.spec.ts b/projects/aca-content/src/lib/components/files/files.component.spec.ts
index 3ffe2a3b5..aecf55b6c 100644
--- a/projects/aca-content/src/lib/components/files/files.component.spec.ts
+++ b/projects/aca-content/src/lib/components/files/files.component.spec.ts
@@ -34,6 +34,7 @@ import { of, Subject, throwError } from 'rxjs';
 import { By } from '@angular/platform-browser';
 import { NodeEntry, NodePaging, Node, PathElement } from '@alfresco/js-api';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('FilesComponent', () => {
   let node;
@@ -66,7 +67,7 @@ describe('FilesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, FilesComponent],
+      imports: [AppTestingModule, FilesComponent, MatSnackBarModule],
       providers: [
         {
           provide: Router,
diff --git a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.ts b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.ts
index fbc748ebb..ac23ad491 100644
--- a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.ts
@@ -46,7 +46,7 @@ import {
   isAdmin
 } from '@alfresco/aca-shared/store';
 import { debounceTime, filter, mergeMap, takeUntil } from 'rxjs/operators';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { Observable, from, Subject } from 'rxjs';
 import { ErrorStateMatcher, MatOptionModule } from '@angular/material/core';
 import { CommonModule } from '@angular/common';
diff --git a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
index 6426371a7..52eaf45e9 100644
--- a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
@@ -34,6 +34,7 @@ import { Actions } from '@ngrx/effects';
 import { of, Subject } from 'rxjs';
 import { ContentActionType } from '@alfresco/adf-extensions';
 import { CategoryService, ContentMetadataComponent, ContentMetadataService, TagService } from '@alfresco/adf-content-services';
+import { MatDialogModule } from '@angular/material/dialog';
 
 describe('MetadataTabComponent', () => {
   let fixture: ComponentFixture<MetadataTabComponent>;
@@ -54,7 +55,7 @@ describe('MetadataTabComponent', () => {
   beforeEach(() => {
     actions$ = new Subject<EditOfflineAction>();
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, MetadataTabComponent, PipeModule],
+      imports: [AppTestingModule, MetadataTabComponent, PipeModule, MatDialogModule],
       providers: [
         {
           provide: Actions,
diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts b/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts
index 1c7f07d02..9a40f2a23 100644
--- a/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts
+++ b/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts
@@ -24,13 +24,14 @@
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { Router } from '@angular/router';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { LibrariesComponent } from './libraries.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { EffectsModule } from '@ngrx/effects';
 import { LibraryEffects } from '../../store/effects';
 import { ContentApiService } from '@alfresco/aca-shared';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('LibrariesComponent', () => {
   let fixture: ComponentFixture<LibrariesComponent>;
@@ -51,7 +52,7 @@ describe('LibrariesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([LibraryEffects]), LibrariesComponent]
+      imports: [AppTestingModule, EffectsModule.forRoot([LibraryEffects]), LibrariesComponent, MatSnackBarModule]
     });
 
     fixture = TestBed.createComponent(LibrariesComponent);
diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts b/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts
index e601f22fb..c5ae08ba7 100644
--- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts
+++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts
@@ -30,6 +30,7 @@ import { Router } from '@angular/router';
 import { NodePaging, SearchApi } from '@alfresco/js-api';
 import { of } from 'rxjs';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('RecentFilesComponent', () => {
   let fixture: ComponentFixture<RecentFilesComponent>;
@@ -39,7 +40,7 @@ describe('RecentFilesComponent', () => {
     const searchApi = jasmine.createSpyObj('SearchApi', ['search']);
 
     const testBed = TestBed.configureTestingModule({
-      imports: [AppTestingModule, RecentFilesComponent],
+      imports: [AppTestingModule, RecentFilesComponent, MatSnackBarModule],
       providers: [{ provide: SearchApi, useValue: searchApi }]
     });
 
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-query-builder.service.spec.ts b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-query-builder.service.spec.ts
index be9a3e822..fb4dc6009 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-query-builder.service.spec.ts
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-query-builder.service.spec.ts
@@ -24,7 +24,7 @@
 
 import { TestBed } from '@angular/core/testing';
 import { AppTestingModule } from '../../../testing/app-testing.module';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { SearchLibrariesQueryBuilderService, LibrarySearchQuery } from './search-libraries-query-builder.service';
 
 describe('SearchLibrariesQueryBuilderService', () => {
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-query-builder.service.ts b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-query-builder.service.ts
index b4c740216..931511206 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-query-builder.service.ts
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-query-builder.service.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { Injectable } from '@angular/core';
 import { QueriesApi, SitePaging } from '@alfresco/js-api';
 import { Subject } from 'rxjs';
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.spec.ts b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.spec.ts
index fb812fee3..0716806ff 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.spec.ts
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.spec.ts
@@ -29,6 +29,7 @@ import { SearchLibrariesResultsComponent } from './search-libraries-results.comp
 import { SearchLibrariesQueryBuilderService } from './search-libraries-query-builder.service';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { AppService } from '@alfresco/aca-shared';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('SearchLibrariesResultsComponent', () => {
   let component: SearchLibrariesResultsComponent;
@@ -44,7 +45,7 @@ describe('SearchLibrariesResultsComponent', () => {
   beforeEach(() => {
     appServiceMock.setAppNavbarMode.calls.reset();
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, SearchLibrariesResultsComponent],
+      imports: [AppTestingModule, SearchLibrariesResultsComponent, MatSnackBarModule],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
         {
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.spec.ts b/projects/aca-content/src/lib/components/search/search-results/search-results.component.spec.ts
index 72425d502..274a971bd 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.spec.ts
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.spec.ts
@@ -33,6 +33,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { AppTestingModule } from '../../../testing/app-testing.module';
 import { AppService } from '@alfresco/aca-shared';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('SearchComponent', () => {
   let component: SearchResultsComponent;
@@ -49,7 +50,7 @@ describe('SearchComponent', () => {
   beforeEach(() => {
     params = new BehaviorSubject({ q: 'TYPE: "cm:folder" AND %28=cm: name: email OR cm: name: budget%29' });
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, SearchResultsComponent],
+      imports: [AppTestingModule, SearchResultsComponent, MatSnackBarModule],
       providers: [
         {
           provide: AppService,
diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts b/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts
index 1b108d51d..2b873f3c7 100644
--- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts
+++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts
@@ -32,6 +32,7 @@ import { SharedLinkPaging } from '@alfresco/js-api';
 import { AppService } from '@alfresco/aca-shared';
 import { getTitleElementText } from '../../testing/test-utils';
 import { ActivatedRoute, Router } from '@angular/router';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('SharedFilesComponent', () => {
   let fixture: ComponentFixture<SharedFilesComponent>;
@@ -56,7 +57,7 @@ describe('SharedFilesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, SharedFilesComponent],
+      imports: [AppTestingModule, SharedFilesComponent, MatSnackBarModule],
       providers: [
         { provide: ActivatedRoute, useValue: route },
         {
diff --git a/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts b/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts
index d8a39f421..84d35ca46 100644
--- a/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts
+++ b/projects/aca-content/src/lib/components/shared-link-view/shared-link-view.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { AppStore, SetSelectedNodesAction } from '@alfresco/aca-shared/store';
-import { AlfrescoApiService, ViewerModule } from '@alfresco/adf-core';
+import { ViewerModule } from '@alfresco/adf-core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
 import { SharedLinkEntry, SharedlinksApi } from '@alfresco/js-api';
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
@@ -33,7 +33,7 @@ import { forkJoin, from, of, Subject } from 'rxjs';
 import { catchError, mergeMap, takeUntil } from 'rxjs/operators';
 import { AppExtensionService, AppService, ToolbarComponent } from '@alfresco/aca-shared';
 import { CommonModule } from '@angular/common';
-import { AlfrescoViewerModule } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoViewerModule } from '@alfresco/adf-content-services';
 
 @Component({
   standalone: true,
diff --git a/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts b/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
index 63692fbc8..6b5cca33c 100644
--- a/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
+++ b/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
@@ -27,7 +27,8 @@ import { NodeEntry, SharedLinkEntry, Node, NodesApi } from '@alfresco/js-api';
 import { Component, inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { AppExtensionService, isLocked } from '@alfresco/aca-shared';
-import { AlfrescoApiService, NotificationService } from '@alfresco/adf-core';
+import { NotificationService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatMenuModule } from '@angular/material/menu';
diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts
index a1b15b984..c55f08ede 100644
--- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts
+++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts
@@ -23,10 +23,11 @@
  */
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { TrashcanComponent } from './trashcan.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { getTitleElementText } from '../../testing/test-utils';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('TrashcanComponent', () => {
   let fixture: ComponentFixture<TrashcanComponent>;
@@ -35,7 +36,7 @@ describe('TrashcanComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, TrashcanComponent]
+      imports: [AppTestingModule, TrashcanComponent, MatSnackBarModule]
     });
 
     fixture = TestBed.createComponent(TrashcanComponent);
diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.component.ts b/projects/aca-content/src/lib/components/view-profile/view-profile.component.ts
index 827e84cd5..9d8ef3c27 100644
--- a/projects/aca-content/src/lib/components/view-profile/view-profile.component.ts
+++ b/projects/aca-content/src/lib/components/view-profile/view-profile.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { PeopleApi, Person } from '@alfresco/js-api';
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
diff --git a/projects/aca-content/src/lib/services/content-url.service.ts b/projects/aca-content/src/lib/services/content-url.service.ts
index f512c57f1..3943ff8a5 100644
--- a/projects/aca-content/src/lib/services/content-url.service.ts
+++ b/projects/aca-content/src/lib/services/content-url.service.ts
@@ -29,8 +29,7 @@ import { take, map, catchError, mergeMap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { ContentApiService } from '@alfresco/aca-shared';
 import { DirectAccessUrlEntry } from '@alfresco/js-api';
-import { ContentVersionService } from '@alfresco/adf-content-services';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService, ContentVersionService } from '@alfresco/adf-content-services';
 
 @Injectable({ providedIn: 'root' })
 export class ContentUrlService extends ContentVersionService {
diff --git a/projects/aca-content/src/lib/services/node-actions.service.spec.ts b/projects/aca-content/src/lib/services/node-actions.service.spec.ts
index 3dd2946e5..9ff28596f 100644
--- a/projects/aca-content/src/lib/services/node-actions.service.spec.ts
+++ b/projects/aca-content/src/lib/services/node-actions.service.spec.ts
@@ -25,8 +25,8 @@
 import { TestBed } from '@angular/core/testing';
 import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { of, throwError, Subject, Observable } from 'rxjs';
-import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
-import { DocumentListService, NodeAction } from '@alfresco/adf-content-services';
+import { TranslationService } from '@alfresco/adf-core';
+import { AlfrescoApiService, DocumentListService, NodeAction } from '@alfresco/adf-content-services';
 import { NodeActionsService } from './node-actions.service';
 import { Node, NodeChildAssociationEntry, NodeEntry } from '@alfresco/js-api';
 import { AppTestingModule } from '../testing/app-testing.module';
diff --git a/projects/aca-content/src/lib/services/node-actions.service.ts b/projects/aca-content/src/lib/services/node-actions.service.ts
index 342dd8be4..22bb3dbf7 100644
--- a/projects/aca-content/src/lib/services/node-actions.service.ts
+++ b/projects/aca-content/src/lib/services/node-actions.service.ts
@@ -25,8 +25,9 @@
 import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Observable, Subject, of, zip, from } from 'rxjs';
-import { AlfrescoApiService, ThumbnailService, TranslationService } from '@alfresco/adf-core';
+import { ThumbnailService, TranslationService } from '@alfresco/adf-core';
 import {
+  AlfrescoApiService,
   DocumentListService,
   ContentNodeSelectorComponent,
   ContentNodeSelectorComponentData,
diff --git a/projects/aca-content/src/lib/services/node-template.service.ts b/projects/aca-content/src/lib/services/node-template.service.ts
index 41c2f3507..0c2ae0fcc 100644
--- a/projects/aca-content/src/lib/services/node-template.service.ts
+++ b/projects/aca-content/src/lib/services/node-template.service.ts
@@ -27,9 +27,15 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { CreateFromTemplateDialogComponent } from '../dialogs/node-template/create-from-template.dialog';
 import { Subject, from, of } from 'rxjs';
 import { Node, ResultNode, PathElement, SearchApi } from '@alfresco/js-api';
-import { AlfrescoApiService, TranslationService, NotificationService } from '@alfresco/adf-core';
+import { TranslationService, NotificationService } from '@alfresco/adf-core';
 import { switchMap, catchError } from 'rxjs/operators';
-import { ContentNodeSelectorComponent, ContentNodeSelectorComponentData, ShareDataRow, NodeAction } from '@alfresco/adf-content-services';
+import {
+  AlfrescoApiService,
+  ContentNodeSelectorComponent,
+  ContentNodeSelectorComponentData,
+  ShareDataRow,
+  NodeAction
+} from '@alfresco/adf-content-services';
 
 export interface TemplateDialogConfig {
   primaryPathName: string;
diff --git a/projects/aca-content/src/lib/store/effects/template.effects.ts b/projects/aca-content/src/lib/store/effects/template.effects.ts
index 85aa62317..46a33c038 100644
--- a/projects/aca-content/src/lib/store/effects/template.effects.ts
+++ b/projects/aca-content/src/lib/store/effects/template.effects.ts
@@ -36,11 +36,11 @@ import {
   AppStore
 } from '@alfresco/aca-shared/store';
 import { NodeTemplateService, TemplateDialogConfig } from '../../services/node-template.service';
-import { AlfrescoApiService, NotificationService } from '@alfresco/adf-core';
+import { NotificationService } from '@alfresco/adf-core';
 import { from, Observable, of } from 'rxjs';
 import { NodeEntry, NodeBodyUpdate, Node, NodesApi } from '@alfresco/js-api';
 import { MatDialog } from '@angular/material/dialog';
-import { DocumentListService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, DocumentListService } from '@alfresco/adf-content-services';
 
 @Injectable()
 export class TemplateEffects {
diff --git a/projects/aca-content/src/lib/testing/app-testing.module.ts b/projects/aca-content/src/lib/testing/app-testing.module.ts
index a2d83ce45..8b47e59cb 100644
--- a/projects/aca-content/src/lib/testing/app-testing.module.ts
+++ b/projects/aca-content/src/lib/testing/app-testing.module.ts
@@ -25,15 +25,8 @@
 import { NgModule } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import {
-  TranslationService,
-  TranslationMock,
-  AuthenticationService,
-  AlfrescoApiService,
-  AlfrescoApiServiceMock,
-  PageTitleService
-} from '@alfresco/adf-core';
-import { DiscoveryApiService, SearchQueryBuilderService } from '@alfresco/adf-content-services';
+import { TranslationService, TranslationMock, AuthenticationService, PageTitleService } from '@alfresco/adf-core';
+import { AlfrescoApiService, AlfrescoApiServiceMock, DiscoveryApiService, SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { RepositoryInfo, VersionInfo } from '@alfresco/js-api';
 import { HttpClientModule } from '@angular/common/http';
 import { StoreModule } from '@ngrx/store';
diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts
index af6e18c63..7560617b5 100644
--- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts
+++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts
@@ -46,12 +46,12 @@ import { ContentActionRef, SelectionState } from '@alfresco/adf-extensions';
 import { Node, VersionEntry, VersionsApi } from '@alfresco/js-api';
 import { Component, HostListener, inject, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, PRIMARY_OUTLET, Router } from '@angular/router';
-import { AlfrescoApiService, ViewerOpenWithComponent, ViewerSidebarComponent, ViewerToolbarActionsComponent } from '@alfresco/adf-core';
+import { ViewerOpenWithComponent, ViewerSidebarComponent, ViewerToolbarActionsComponent } from '@alfresco/adf-core';
 import { Store } from '@ngrx/store';
 import { from, Observable, Subject } from 'rxjs';
 import { debounceTime, takeUntil } from 'rxjs/operators';
 import { Actions, ofType } from '@ngrx/effects';
-import { AlfrescoViewerComponent, DocumentListService, NodesApiService, UploadService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, AlfrescoViewerComponent, DocumentListService, NodesApiService, UploadService } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
 import { ViewerService } from '../../services/viewer.service';
 
diff --git a/projects/aca-shared/src/lib/services/app.service.spec.ts b/projects/aca-shared/src/lib/services/app.service.spec.ts
index b3be7a396..d87774691 100644
--- a/projects/aca-shared/src/lib/services/app.service.spec.ts
+++ b/projects/aca-shared/src/lib/services/app.service.spec.ts
@@ -26,9 +26,7 @@ import { AppService } from './app.service';
 import { TestBed } from '@angular/core/testing';
 import {
   AuthenticationService,
-  AlfrescoApiService,
   PageTitleService,
-  AlfrescoApiServiceMock,
   TranslationMock,
   TranslationService,
   UserPreferencesService,
@@ -37,6 +35,8 @@ import {
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
 import { HttpClientModule } from '@angular/common/http';
 import {
+  AlfrescoApiService,
+  AlfrescoApiServiceMock,
   DiscoveryApiService,
   FileUploadErrorEvent,
   SearchQueryBuilderService,
diff --git a/projects/aca-shared/src/lib/services/app.service.ts b/projects/aca-shared/src/lib/services/app.service.ts
index 23141e94a..67ad52f14 100644
--- a/projects/aca-shared/src/lib/services/app.service.ts
+++ b/projects/aca-shared/src/lib/services/app.service.ts
@@ -23,16 +23,15 @@
  */
 
 import { inject, Injectable, OnDestroy } from '@angular/core';
-import {
-  AuthenticationService,
-  AppConfigService,
-  AlfrescoApiService,
-  PageTitleService,
-  UserPreferencesService,
-  NotificationService
-} from '@alfresco/adf-core';
+import { AuthenticationService, AppConfigService, PageTitleService, UserPreferencesService, NotificationService } from '@alfresco/adf-core';
 import { Observable, BehaviorSubject, Subject } from 'rxjs';
-import { SearchQueryBuilderService, SharedLinksApiService, UploadService, FileUploadErrorEvent } from '@alfresco/adf-content-services';
+import {
+  AlfrescoApiService,
+  SearchQueryBuilderService,
+  SharedLinksApiService,
+  UploadService,
+  FileUploadErrorEvent
+} from '@alfresco/adf-content-services';
 import { OverlayContainer } from '@angular/cdk/overlay';
 import { ActivatedRoute, ActivationEnd, NavigationStart, Router } from '@angular/router';
 import { filter, map } from 'rxjs/operators';
diff --git a/projects/aca-shared/src/lib/services/content-api.service.ts b/projects/aca-shared/src/lib/services/content-api.service.ts
index ccc5ce983..5ad671b91 100644
--- a/projects/aca-shared/src/lib/services/content-api.service.ts
+++ b/projects/aca-shared/src/lib/services/content-api.service.ts
@@ -23,7 +23,8 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
+import { UserPreferencesService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { Observable, from } from 'rxjs';
 import {
   NodePaging,
diff --git a/projects/aca-shared/src/lib/services/user-profile.service.ts b/projects/aca-shared/src/lib/services/user-profile.service.ts
index c36452cac..85b370cb2 100644
--- a/projects/aca-shared/src/lib/services/user-profile.service.ts
+++ b/projects/aca-shared/src/lib/services/user-profile.service.ts
@@ -24,9 +24,8 @@
 
 import { inject, Injectable } from '@angular/core';
 import { ProfileState } from '@alfresco/adf-extensions';
-import { GroupService } from '@alfresco/adf-content-services';
+import { AlfrescoApiService, GroupService } from '@alfresco/adf-content-services';
 import { BehaviorSubject } from 'rxjs';
-import { AlfrescoApiService } from '@alfresco/adf-core';
 import { PeopleApi } from '@alfresco/js-api';
 
 @Injectable({ providedIn: 'root' })
diff --git a/projects/aca-shared/src/lib/testing/lib-testing-module.ts b/projects/aca-shared/src/lib/testing/lib-testing-module.ts
index fb542d948..fc4477977 100644
--- a/projects/aca-shared/src/lib/testing/lib-testing-module.ts
+++ b/projects/aca-shared/src/lib/testing/lib-testing-module.ts
@@ -25,7 +25,8 @@
 import { Injectable, NgModule } from '@angular/core';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { AlfrescoApiService, AlfrescoApiServiceMock, TranslateLoaderService, TranslationMock, TranslationService } from '@alfresco/adf-core';
+import { TranslateLoaderService, TranslationMock, TranslationService } from '@alfresco/adf-core';
+import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 import { HttpClientModule } from '@angular/common/http';
 import { RouterTestingModule } from '@angular/router/testing';
 import { EffectsModule } from '@ngrx/effects';