diff --git a/lib/core/test.ts b/lib/core/test.ts
index 13507a1267..b3bd2a70a5 100644
--- a/lib/core/test.ts
+++ b/lib/core/test.ts
@@ -19,7 +19,7 @@ import 'zone.js';
 import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
-import pdfjsLibMock from './src/lib/viewer/components/mock/pdfjs-lib.mock';
+import pdfjsLibMock from './viewer/src/components/mock/pdfjs-lib.mock';
 
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
diff --git a/lib/core/viewer/ng-package.json b/lib/core/viewer/ng-package.json
index caac2fd9f1..a0ee548883 100644
--- a/lib/core/viewer/ng-package.json
+++ b/lib/core/viewer/ng-package.json
@@ -2,7 +2,7 @@
   "lib": {
     "entryFile": "src/index.ts",
     "styleIncludePaths": [
-      "../src/lib/styles"
+      "../src/lib"
     ]
   }
 }
diff --git a/lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts b/lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts
index c849c012f6..602853e2f8 100644
--- a/lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts
+++ b/lib/core/viewer/src/components/download-prompt-dialog/download-prompt-dialog.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialogRef } from '@angular/material/dialog';
-import { CoreTestingModule, UnitTestingUtils } from '../../../testing';
+import { CoreTestingModule, UnitTestingUtils } from '@alfresco/adf-core';
 import { DownloadPromptActions } from '../../models/download-prompt.actions';
 import { DownloadPromptDialogComponent } from './download-prompt-dialog.component';
 
diff --git a/lib/core/viewer/src/components/img-viewer/img-viewer.component.scss b/lib/core/viewer/src/components/img-viewer/img-viewer.component.scss
index 7450127d54..5bfca6985a 100644
--- a/lib/core/viewer/src/components/img-viewer/img-viewer.component.scss
+++ b/lib/core/viewer/src/components/img-viewer/img-viewer.component.scss
@@ -1,4 +1,4 @@
-@use 'mat-selectors' as ms;
+@use 'styles/mat-selectors' as ms;
 
 .adf-image-viewer {
     width: 100%;
diff --git a/lib/core/viewer/src/components/img-viewer/img-viewer.component.spec.ts b/lib/core/viewer/src/components/img-viewer/img-viewer.component.spec.ts
index 6e47d40526..4a9d389403 100644
--- a/lib/core/viewer/src/components/img-viewer/img-viewer.component.spec.ts
+++ b/lib/core/viewer/src/components/img-viewer/img-viewer.component.spec.ts
@@ -17,9 +17,7 @@
 
 import { SimpleChange } from '@angular/core';
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { AppConfigService } from '../../../app-config';
-import { UrlService } from '../../../common';
-import { CoreTestingModule, UnitTestingUtils } from '../../../testing';
+import { AppConfigService, UrlService, CoreTestingModule, UnitTestingUtils } from '@alfresco/adf-core';
 import { ImgViewerComponent } from './img-viewer.component';
 
 describe('Test Img viewer component ', () => {
diff --git a/lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.spec.ts b/lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.spec.ts
index 6a290510dc..f29218ee27 100644
--- a/lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.spec.ts
+++ b/lib/core/viewer/src/components/pdf-viewer-password-dialog/pdf-viewer-password-dialog.spec.ts
@@ -17,7 +17,7 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { CoreTestingModule } from '../../../testing';
+import { CoreTestingModule } from '@alfresco/adf-core';
 import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog';
 
 declare const pdfjsLib: any;
diff --git a/lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.spec.ts b/lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.spec.ts
index 1ff2e68996..9aaf075548 100644
--- a/lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.spec.ts
+++ b/lib/core/viewer/src/components/pdf-viewer-thumb/pdf-viewer-thumb.component.spec.ts
@@ -18,7 +18,7 @@
 import { DomSanitizer } from '@angular/platform-browser';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { PdfThumbComponent } from './pdf-viewer-thumb.component';
-import { CoreTestingModule } from '../../../testing';
+import { CoreTestingModule } from '@alfresco/adf-core';
 
 describe('PdfThumbComponent', () => {
     let fixture: ComponentFixture<PdfThumbComponent>;
diff --git a/lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.spec.ts b/lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.spec.ts
index e0d79e4cb2..c4d5ddaffc 100644
--- a/lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.spec.ts
+++ b/lib/core/viewer/src/components/pdf-viewer-thumbnails/pdf-viewer-thumbnails.component.spec.ts
@@ -17,7 +17,7 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { PdfThumbListComponent } from './pdf-viewer-thumbnails.component';
-import { CoreTestingModule, UnitTestingUtils } from '../../../testing';
+import { CoreTestingModule, UnitTestingUtils } from '@alfresco/adf-core';
 import { DOWN_ARROW, ESCAPE, UP_ARROW } from '@angular/cdk/keycodes';
 
 declare const pdfjsViewer: any;
diff --git a/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.scss b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.scss
index 242b79d61c..fbcea1f981 100644
--- a/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.scss
+++ b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.scss
@@ -1,4 +1,4 @@
-@use 'mat-selectors' as ms;
+@use 'styles/mat-selectors' as ms;
 
 .adf-pdf-viewer {
     width: 100%;
diff --git a/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.spec.ts b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.spec.ts
index 44101957b1..ab140e0c38 100644
--- a/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.spec.ts
+++ b/lib/core/viewer/src/components/pdf-viewer/pdf-viewer.component.spec.ts
@@ -21,13 +21,11 @@ import { ComponentFixture, fakeAsync, flush, TestBed, tick } from '@angular/core
 import { MatDialog } from '@angular/material/dialog';
 import { By } from '@angular/platform-browser';
 import { of } from 'rxjs';
-import { AppConfigService } from '../../../app-config';
-import { EventMock } from '../../../mock';
-import { NoopAuthModule, NoopTranslateModule, UnitTestingUtils } from '../../../testing';
 import { RenderingQueueServices } from '../../services/rendering-queue.services';
 import { PdfThumbListComponent } from '../pdf-viewer-thumbnails/pdf-viewer-thumbnails.component';
 import { PDFJS_MODULE, PDFJS_VIEWER_MODULE, PdfViewerComponent } from './pdf-viewer.component';
 import pdfjsLibMock from '../mock/pdfjs-lib.mock';
+import { UnitTestingUtils, NoopAuthModule, NoopTranslateModule, AppConfigService, EventMock } from '@alfresco/adf-core';
 
 declare const pdfjsLib: any;
 
diff --git a/lib/core/viewer/src/components/viewer-render/viewer-render.component.spec.ts b/lib/core/viewer/src/components/viewer-render/viewer-render.component.spec.ts
index 0c99ad0589..a7bed51e3c 100644
--- a/lib/core/viewer/src/components/viewer-render/viewer-render.component.spec.ts
+++ b/lib/core/viewer/src/components/viewer-render/viewer-render.component.spec.ts
@@ -21,11 +21,14 @@ import { SpyLocation } from '@angular/common/testing';
 import { Component, DebugElement, TemplateRef, ViewChild } from '@angular/core';
 import { ComponentFixture, DeferBlockBehavior, TestBed } from '@angular/core/testing';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
-import { NoopTranslateModule, UnitTestingUtils } from '../../../testing';
 import { RenderingQueueServices } from '../../services/rendering-queue.services';
 import { ViewerRenderComponent } from './viewer-render.component';
-import { ImgViewerComponent, MediaPlayerComponent, PdfViewerComponent, ViewerExtensionDirective } from '@alfresco/adf-core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ViewerExtensionDirective } from '../../directives/viewer-extension.directive';
+import { NoopTranslateModule, UnitTestingUtils } from '@alfresco/adf-core';
+import { PdfViewerComponent } from '../pdf-viewer/pdf-viewer.component';
+import { ImgViewerComponent } from '../img-viewer/img-viewer.component';
+import { MediaPlayerComponent } from '../media-player/media-player.component';
 
 @Component({
     selector: 'adf-double-viewer',
diff --git a/lib/core/viewer/src/components/viewer.component.scss b/lib/core/viewer/src/components/viewer.component.scss
index 5ddbc68f32..7c2a01573f 100644
--- a/lib/core/viewer/src/components/viewer.component.scss
+++ b/lib/core/viewer/src/components/viewer.component.scss
@@ -1,5 +1,5 @@
 /* stylelint-disable scss/at-extend-no-missing-placeholder */
-@use 'mat-selectors' as ms;
+@use 'styles/mat-selectors' as ms;
 
 .adf-full-screen {
     width: 100%;
@@ -48,7 +48,7 @@
         flex-direction: row;
         align-items: center;
 
-        @media screen and (width <= 1450px) {
+        @media screen and (width <=1450px) {
             left: 30%;
         }
     }
diff --git a/lib/core/viewer/src/components/viewer.component.spec.ts b/lib/core/viewer/src/components/viewer.component.spec.ts
index 9ac7e4b251..a20db78200 100644
--- a/lib/core/viewer/src/components/viewer.component.spec.ts
+++ b/lib/core/viewer/src/components/viewer.component.spec.ts
@@ -21,9 +21,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatDialog } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { of } from 'rxjs';
-import { AppConfigService } from '../../app-config';
-import { EventMock } from '../../mock';
-import { CoreTestingModule, UnitTestingUtils } from '../../testing';
+import { AppConfigService, EventMock, CoreTestingModule, UnitTestingUtils, ThumbnailService } from '@alfresco/adf-core';
 import { DownloadPromptActions } from '../models/download-prompt.actions';
 import { CloseButtonPosition } from '../models/viewer.model';
 import { ViewUtilService } from '../services/view-util.service';
@@ -34,7 +32,6 @@ import { ViewerWithCustomSidebarComponent } from './mock/adf-viewer-container-si
 import { ViewerWithCustomToolbarActionsComponent } from './mock/adf-viewer-container-toolbar-actions.component.mock';
 import { ViewerWithCustomToolbarComponent } from './mock/adf-viewer-container-toolbar.component.mock';
 import { ViewerComponent } from './viewer.component';
-import { ThumbnailService } from '../../common/services/thumbnail.service';
 
 @Component({
     selector: 'adf-dialog-dummy',
diff --git a/lib/core/viewer/src/directives/viewer-extension.directive.spec.ts b/lib/core/viewer/src/directives/viewer-extension.directive.spec.ts
index bf3adf7b8b..4bfd6f7dd0 100644
--- a/lib/core/viewer/src/directives/viewer-extension.directive.spec.ts
+++ b/lib/core/viewer/src/directives/viewer-extension.directive.spec.ts
@@ -21,7 +21,7 @@ import { ChangeDetectorRef, ElementRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { ViewerRenderComponent } from '../components/viewer-render/viewer-render.component';
 import { ViewerExtensionDirective } from './viewer-extension.directive';
-import { CoreTestingModule } from '../../testing';
+import { CoreTestingModule } from '@alfresco/adf-core';
 
 describe('ExtensionViewerDirective', () => {
     let extensionViewerDirective: ViewerExtensionDirective;
diff --git a/lib/core/viewer/src/index.ts b/lib/core/viewer/src/index.ts
index 9d60324639..b6d851a450 100644
--- a/lib/core/viewer/src/index.ts
+++ b/lib/core/viewer/src/index.ts
@@ -35,6 +35,8 @@ export * from './components/viewer-render/viewer-render.component';
 export * from './components/viewer.component';
 export * from './components/download-prompt-dialog/download-prompt-dialog.component';
 
+export * from './widgets/base-viewer/base-viewer.widget';
+
 export * from './directives/viewer-extension.directive';
 
 export * from './viewer.module';