diff --git a/public/locales/en/file.json b/public/locales/en/file.json
new file mode 100644
index 000000000..56ee0fdac
--- /dev/null
+++ b/public/locales/en/file.json
@@ -0,0 +1,24 @@
+{
+  "tabs": {
+    "metadata": "Metadata"
+  },
+  "subtext": "This file is part of \"{{datasetTitle}}\".",
+  "fileAccess": {
+    "title": "File Access",
+    "restricted": {
+      "name": "Restricted",
+      "icon": "Restricted File Icon"
+    },
+    "restrictedWithAccess": {
+      "name": "Restricted with Access Granted",
+      "icon": "Restricted with access Icon"
+    },
+    "embargoed": {
+      "name": "Embargoed"
+    },
+    "public": {
+      "name": "Public",
+      "icon": "Public File Icon"
+    }
+  }
+}
diff --git a/public/locales/en/files.json b/public/locales/en/files.json
index bbae885f1..1f74f36ca 100644
--- a/public/locales/en/files.json
+++ b/public/locales/en/files.json
@@ -24,24 +24,6 @@
       "published": "Published",
       "deposited": "Deposited"
     },
-    "fileAccess": {
-      "title": "File Access",
-      "restricted": {
-        "name": "Restricted",
-        "icon": "Restricted File Icon"
-      },
-      "restrictedWithAccess": {
-        "name": "Restricted with Access Granted",
-        "icon": "Restricted with access Icon"
-      },
-      "embargoed": {
-        "name": "Embargoed"
-      },
-      "public": {
-        "name": "Public",
-        "icon": "Public File Icon"
-      }
-    },
     "copyToClipboard": {
       "clickToCopy": "Click to copy",
       "correctlyCopiedIcon": "Correctly copied to clipboard icon",
diff --git a/public/locales/en/pageNotFound.json b/public/locales/en/pageNotFound.json
index 1fb88259b..19d0dcf7e 100644
--- a/public/locales/en/pageNotFound.json
+++ b/public/locales/en/pageNotFound.json
@@ -1,4 +1,4 @@
 {
   "heading": "Page Not Found",
-  "message": "The page you are looking for was not found. If you believe this is an error, please contact Demo Dataverse Support for assistance."
+  "message": "The page you are looking for was not found."
 }
diff --git a/src/Router.tsx b/src/Router.tsx
index 286a80f63..73deb4eef 100644
--- a/src/Router.tsx
+++ b/src/Router.tsx
@@ -2,6 +2,7 @@ import { createBrowserRouter, RouterProvider } from 'react-router-dom'
 import { Layout } from './sections/layout/Layout'
 import { Route } from './sections/Route.enum'
 import { DatasetFactory } from './sections/dataset/DatasetFactory'
+import { FileFactory } from './sections/file/FileFactory'
 import { HomeFactory } from './sections/home/HomeFactory'
 
 const router = createBrowserRouter(
@@ -15,8 +16,12 @@ const router = createBrowserRouter(
           element: HomeFactory.create()
         },
         {
-          path: `${Route.DATASETS}`,
+          path: Route.DATASETS,
           element: DatasetFactory.create()
+        },
+        {
+          path: Route.FILES,
+          element: FileFactory.create()
         }
       ]
     }
diff --git a/src/dataset/domain/models/Dataset.ts b/src/dataset/domain/models/Dataset.ts
index af9eb9125..b0f465d6b 100644
--- a/src/dataset/domain/models/Dataset.ts
+++ b/src/dataset/domain/models/Dataset.ts
@@ -1,5 +1,5 @@
 import { Alert, AlertMessageKey } from '../../../alert/domain/models/Alert'
-import { FileDownloadSize } from '../../../files/domain/models/File'
+import { FileDownloadSize } from '../../../files/domain/models/FilePreview'
 
 export enum DatasetLabelSemanticMeaning {
   DATASET = 'dataset',
@@ -213,24 +213,112 @@ export enum DatasetNonNumericVersion {
   DRAFT = ':draft'
 }
 
+export class DatasetVersionNumber {
+  constructor(public readonly majorNumber?: number, public readonly minorNumber?: number) {}
+
+  toString(): string | DatasetNonNumericVersion {
+    if (this.majorNumber === undefined || this.minorNumber === undefined) {
+      return DatasetNonNumericVersion.DRAFT
+    }
+    return `${this.majorNumber}.${this.minorNumber}`
+  }
+}
+
 export class DatasetVersion {
   constructor(
     public readonly id: number,
+    public readonly title: string,
+    public readonly number: DatasetVersionNumber,
     public readonly publishingStatus: DatasetPublishingStatus,
+    public readonly citation: string,
+    public readonly labels: DatasetLabel[],
     public readonly isLatest: boolean,
     public readonly isInReview: boolean,
-    public readonly latestVersionStatus: DatasetPublishingStatus,
-    public readonly majorNumber?: number,
-    public readonly minorNumber?: number,
-    // requestedVersion will be set if the user requested a version that did not exist.
-    public readonly requestedVersion?: string
+    public readonly latestVersionPublishingStatus: DatasetPublishingStatus,
+    public readonly someDatasetVersionHasBeenReleased: boolean
   ) {}
 
-  toString(): string | DatasetNonNumericVersion {
-    if (this.majorNumber === undefined || this.minorNumber === undefined) {
-      return DatasetNonNumericVersion.DRAFT
+  static Builder = class {
+    public readonly labels: DatasetLabel[] = []
+
+    constructor(
+      public readonly id: number,
+      public readonly title: string,
+      public readonly number: DatasetVersionNumber,
+      public readonly publishingStatus: DatasetPublishingStatus,
+      public readonly citation: string,
+      public readonly isLatest: boolean,
+      public readonly isInReview: boolean,
+      public readonly latestVersionPublishingStatus: DatasetPublishingStatus,
+      public readonly someDatasetVersionHasBeenReleased: boolean
+    ) {
+      this.createLabels()
+    }
+
+    createLabels() {
+      const statusLabels = this.createStatusLabels()
+      const versionLabels = this.createVersionNumberLabel()
+      this.labels.push(...statusLabels, ...versionLabels)
+    }
+
+    createStatusLabels(): DatasetLabel[] {
+      const labels: DatasetLabel[] = []
+
+      if (this.publishingStatus === DatasetPublishingStatus.DRAFT) {
+        labels.push(new DatasetLabel(DatasetLabelSemanticMeaning.DATASET, DatasetLabelValue.DRAFT))
+      }
+
+      if (!this.someDatasetVersionHasBeenReleased) {
+        labels.push(
+          new DatasetLabel(DatasetLabelSemanticMeaning.WARNING, DatasetLabelValue.UNPUBLISHED)
+        )
+      }
+
+      if (this.publishingStatus === DatasetPublishingStatus.DEACCESSIONED) {
+        labels.push(
+          new DatasetLabel(DatasetLabelSemanticMeaning.DANGER, DatasetLabelValue.DEACCESSIONED)
+        )
+      }
+
+      if (this.publishingStatus === DatasetPublishingStatus.EMBARGOED) {
+        labels.push(
+          new DatasetLabel(DatasetLabelSemanticMeaning.DATASET, DatasetLabelValue.EMBARGOED)
+        )
+      }
+
+      if (this.isInReview) {
+        labels.push(
+          new DatasetLabel(DatasetLabelSemanticMeaning.SUCCESS, DatasetLabelValue.IN_REVIEW)
+        )
+      }
+
+      return labels
+    }
+
+    createVersionNumberLabel(): DatasetLabel[] {
+      const labels: DatasetLabel[] = []
+      if (this.publishingStatus === DatasetPublishingStatus.RELEASED) {
+        labels.push(
+          new DatasetLabel(DatasetLabelSemanticMeaning.FILE, `Version ${this.number.toString()}`)
+        )
+      }
+      return labels
+    }
+
+    build(): DatasetVersion {
+      return new DatasetVersion(
+        this.id,
+        this.title,
+        this.number,
+        this.publishingStatus,
+        this.citation,
+        this.labels,
+        this.isLatest,
+        this.isInReview,
+        this.latestVersionPublishingStatus,
+        this.someDatasetVersionHasBeenReleased
+      )
     }
-    return `${this.majorNumber}.${this.minorNumber}`
   }
 }
 
@@ -273,8 +361,6 @@ export class Dataset {
   constructor(
     public readonly persistentId: string,
     public readonly version: DatasetVersion,
-    public readonly citation: string,
-    public readonly labels: DatasetLabel[],
     public readonly alerts: Alert[],
     public readonly summaryFields: DatasetMetadataBlock[],
     public readonly license: DatasetLicense,
@@ -284,17 +370,13 @@ export class Dataset {
     public readonly hasValidTermsOfAccess: boolean,
     public readonly hasOneTabularFileAtLeast: boolean,
     public readonly isValid: boolean,
-    public readonly isReleased: boolean,
     public readonly downloadUrls: DatasetDownloadUrls,
     public readonly fileDownloadSizes: FileDownloadSize[],
     public readonly thumbnail?: string,
-    public readonly privateUrl?: PrivateUrl
+    public readonly privateUrl?: PrivateUrl,
+    public readonly requestedVersion?: string // will be set if the user requested a version that did not exist
   ) {}
 
-  public get title(): string {
-    return this.metadataBlocks[0].fields.title
-  }
-
   public checkIsLockedFromPublishing(userPersistentId: string): boolean {
     return this.checkIsLockedFromEdits(userPersistentId)
   }
@@ -354,72 +436,12 @@ export class Dataset {
     return false
   }
 
-  static createDatasetLabels(version: DatasetVersion, isReleased: boolean): DatasetLabel[] {
-    const statusLabels = Dataset.createStatusLabels(
-      version.publishingStatus,
-      version.isInReview,
-      isReleased
-    )
-    const versionLabels = Dataset.createVersionLabel(version)
-    return [...statusLabels, ...versionLabels] // combine and return
-  }
-
-  static createStatusLabels(
-    publishingStatus: DatasetPublishingStatus,
-    isInReview: boolean,
-    isReleased: boolean
-  ): DatasetLabel[] {
-    const labels: DatasetLabel[] = []
-
-    if (publishingStatus === DatasetPublishingStatus.DRAFT) {
-      labels.push(new DatasetLabel(DatasetLabelSemanticMeaning.DATASET, DatasetLabelValue.DRAFT))
-    }
-
-    if (!isReleased) {
-      labels.push(
-        new DatasetLabel(DatasetLabelSemanticMeaning.WARNING, DatasetLabelValue.UNPUBLISHED)
-      )
-    }
-
-    if (publishingStatus === DatasetPublishingStatus.DEACCESSIONED) {
-      labels.push(
-        new DatasetLabel(DatasetLabelSemanticMeaning.DANGER, DatasetLabelValue.DEACCESSIONED)
-      )
-    }
-
-    if (publishingStatus === DatasetPublishingStatus.EMBARGOED) {
-      labels.push(
-        new DatasetLabel(DatasetLabelSemanticMeaning.DATASET, DatasetLabelValue.EMBARGOED)
-      )
-    }
-
-    if (isInReview) {
-      labels.push(
-        new DatasetLabel(DatasetLabelSemanticMeaning.SUCCESS, DatasetLabelValue.IN_REVIEW)
-      )
-    }
-
-    return labels
-  }
-
-  static createVersionLabel(version: DatasetVersion): DatasetLabel[] {
-    const labels: DatasetLabel[] = []
-    if (version.publishingStatus === DatasetPublishingStatus.RELEASED) {
-      labels.push(
-        new DatasetLabel(DatasetLabelSemanticMeaning.FILE, `Version ${version.toString()}`)
-      )
-    }
-    return labels
-  }
-
   static Builder = class {
-    public readonly labels: DatasetLabel[] = []
     public readonly alerts: Alert[] = []
 
     constructor(
       public readonly persistentId: string,
       public readonly version: DatasetVersion,
-      public readonly citation: string,
       public readonly summaryFields: DatasetMetadataBlock[],
       public readonly license: DatasetLicense = defaultLicense,
       public readonly metadataBlocks: DatasetMetadataBlocks,
@@ -428,13 +450,12 @@ export class Dataset {
       public readonly hasValidTermsOfAccess: boolean,
       public readonly hasOneTabularFileAtLeast: boolean,
       public readonly isValid: boolean,
-      public readonly isReleased: boolean,
       public readonly downloadUrls: DatasetDownloadUrls,
       public readonly fileDownloadSizes: FileDownloadSize[],
       public readonly thumbnail?: string,
-      public readonly privateUrl?: PrivateUrl
+      public readonly privateUrl?: PrivateUrl,
+      public readonly requestedVersion?: string // will be set if the user requested a version that did not exist
     ) {
-      this.labels = Dataset.createDatasetLabels(version, isReleased)
       this.withAlerts()
     }
 
@@ -445,18 +466,18 @@ export class Dataset {
       ) {
         this.alerts.push(new Alert('warning', AlertMessageKey.DRAFT_VERSION))
       }
-      if (this.version.requestedVersion) {
-        if (this.version.latestVersionStatus == DatasetPublishingStatus.RELEASED) {
+      if (this.requestedVersion) {
+        if (this.version.latestVersionPublishingStatus == DatasetPublishingStatus.RELEASED) {
           const dynamicFields = {
-            requestedVersion: this.version.requestedVersion,
-            returnedVersion: `${this.version.toString()}`
+            requestedVersion: this.requestedVersion,
+            returnedVersion: `${this.version.number.toString()}`
           }
           this.alerts.push(
             new Alert('warning', AlertMessageKey.REQUESTED_VERSION_NOT_FOUND, dynamicFields)
           )
         } else {
           const dynamicFields = {
-            requestedVersion: this.version.requestedVersion
+            requestedVersion: this.requestedVersion
           }
           this.alerts.push(
             new Alert(
@@ -483,8 +504,6 @@ export class Dataset {
       return new Dataset(
         this.persistentId,
         this.version,
-        this.citation,
-        this.labels,
         this.alerts,
         this.summaryFields,
         this.license,
@@ -494,11 +513,11 @@ export class Dataset {
         this.hasValidTermsOfAccess,
         this.hasOneTabularFileAtLeast,
         this.isValid,
-        this.isReleased,
         this.downloadUrls,
         this.fileDownloadSizes,
         this.thumbnail,
-        this.privateUrl
+        this.privateUrl,
+        this.requestedVersion
       )
     }
   }
diff --git a/src/dataset/domain/models/DatasetPreview.ts b/src/dataset/domain/models/DatasetPreview.ts
index d7f850bc0..e7688499d 100644
--- a/src/dataset/domain/models/DatasetPreview.ts
+++ b/src/dataset/domain/models/DatasetPreview.ts
@@ -1,25 +1,13 @@
-import { DatasetLabel, DatasetVersion, Dataset } from './Dataset'
+import { DatasetVersion } from './Dataset'
 
 export class DatasetPreview {
-  public labels: DatasetLabel[]
-
   constructor(
     public persistentId: string,
-    public title: string,
     public version: DatasetVersion,
-    public isReleased: boolean,
-    public citation: string,
-    public isDeaccessioned: boolean,
     public releaseOrCreateDate: Date,
     public description: string,
     public thumbnail?: string
-  ) {
-    this.labels = Dataset.createStatusLabels(
-      version.publishingStatus,
-      version.isInReview,
-      this.isReleased
-    )
-  }
+  ) {}
 
   get abbreviatedDescription(): string {
     if (this.description.length > 280) {
diff --git a/src/dataset/infrastructure/mappers/JSDatasetMapper.ts b/src/dataset/infrastructure/mappers/JSDatasetMapper.ts
index cf807c68e..817ec6ff1 100644
--- a/src/dataset/infrastructure/mappers/JSDatasetMapper.ts
+++ b/src/dataset/infrastructure/mappers/JSDatasetMapper.ts
@@ -4,8 +4,7 @@ import {
   DatasetMetadataBlock as JSDatasetMetadataBlock,
   DatasetMetadataBlocks as JSDatasetMetadataBlocks,
   DatasetMetadataFields as JSDatasetMetadataFields,
-  DatasetUserPermissions as JSDatasetPermissions,
-  DatasetVersionInfo as JSDatasetVersionInfo
+  DatasetUserPermissions as JSDatasetPermissions
 } from '@iqss/dataverse-client-javascript'
 import {
   Dataset,
@@ -20,14 +19,18 @@ import {
   MetadataBlockName,
   PrivateUrl
 } from '../../domain/models/Dataset'
-import { FileDownloadMode, FileDownloadSize, FileSizeUnit } from '../../../files/domain/models/File'
+import {
+  FileDownloadMode,
+  FileDownloadSize,
+  FileSizeUnit
+} from '../../../files/domain/models/FilePreview'
 import { JSDatasetVersionMapper } from './JSDatasetVersionMapper'
 
 export class JSDatasetMapper {
   static toDataset(
     jsDataset: JSDataset,
-    citation: string,
-    summaryFieldsNames: string[],
+    jsDatasetCitation: string,
+    jsDatasetSummaryFieldsNames: string[],
     jsDatasetPermissions: JSDatasetPermissions,
     jsDatasetLocks: JSDatasetLock[],
     jsDatasetFilesTotalOriginalDownloadSize: number,
@@ -35,16 +38,16 @@ export class JSDatasetMapper {
     requestedVersion?: string,
     privateUrl?: PrivateUrl
   ): Dataset {
-    const version = JSDatasetVersionMapper.toDatasetVersion(
+    const version = JSDatasetVersionMapper.toVersion(
       jsDataset.versionId,
       jsDataset.versionInfo,
-      requestedVersion
+      JSDatasetMapper.toDatasetTitle(jsDataset.metadataBlocks),
+      jsDatasetCitation
     )
     return new Dataset.Builder(
       jsDataset.persistentId,
       version,
-      citation,
-      JSDatasetMapper.toSummaryFields(jsDataset.metadataBlocks, summaryFieldsNames),
+      JSDatasetMapper.toSummaryFields(jsDataset.metadataBlocks, jsDatasetSummaryFieldsNames),
       jsDataset.license,
       JSDatasetMapper.toMetadataBlocks(
         jsDataset.metadataBlocks,
@@ -57,17 +60,21 @@ export class JSDatasetMapper {
       true, // TODO Connect with dataset hasValidTermsOfAccess
       true, // TODO Connect with dataset hasOneTabularFileAtLeast
       true, // TODO Connect with dataset isValid
-      JSDatasetMapper.toIsReleased(jsDataset.versionInfo),
       JSDatasetMapper.toDownloadUrls(jsDataset.persistentId, version),
       JSDatasetMapper.toFileDownloadSizes(
         jsDatasetFilesTotalOriginalDownloadSize,
         jsDatasetFilesTotalArchivalDownloadSize
       ),
       undefined, // TODO: get dataset thumbnail from Dataverse https://github.com/IQSS/dataverse-frontend/issues/203
-      privateUrl
+      privateUrl,
+      requestedVersion
     ).build()
   }
 
+  static toDatasetTitle(jsDatasetMetadataBlocks: JSDatasetMetadataBlocks): string {
+    return jsDatasetMetadataBlocks[0].fields.title
+  }
+
   static toSummaryFields(
     jsDatasetMetadataBlocks: JSDatasetMetadataBlocks,
     summaryFieldsNames: string[]
@@ -169,11 +176,14 @@ export class JSDatasetMapper {
     return extraFields
   }
 
-  static toIsReleased(jsDatasetVersionInfo: JSDatasetVersionInfo): boolean {
-    return (
-      jsDatasetVersionInfo.releaseTime !== undefined &&
-      !isNaN(jsDatasetVersionInfo.releaseTime.getTime())
-    )
+  static toDownloadUrls(
+    jsDatasetPersistentId: string,
+    version: DatasetVersion
+  ): DatasetDownloadUrls {
+    return {
+      original: `/api/access/dataset/:persistentId/versions/${version.number.toString()}?persistentId=${jsDatasetPersistentId}&format=original`,
+      archival: `/api/access/dataset/:persistentId/versions/${version.number.toString()}?persistentId=${jsDatasetPersistentId}`
+    }
   }
 
   static toDatasetPermissions(jsDatasetPermissions: JSDatasetPermissions): DatasetPermissions {
@@ -196,16 +206,6 @@ export class JSDatasetMapper {
     })
   }
 
-  static toDownloadUrls(
-    jsDatasetPersistentId: string,
-    version: DatasetVersion
-  ): DatasetDownloadUrls {
-    return {
-      original: `/api/access/dataset/:persistentId/versions/${version.toString()}?persistentId=${jsDatasetPersistentId}&format=original`,
-      archival: `/api/access/dataset/:persistentId/versions/${version.toString()}?persistentId=${jsDatasetPersistentId}`
-    }
-  }
-
   static toFileDownloadSizes(
     jsDatasetFilesTotalOriginalDownloadSize: number,
     jsDatasetFilesTotalArchivalDownloadSize: number
diff --git a/src/dataset/infrastructure/mappers/JSDatasetPreviewMapper.ts b/src/dataset/infrastructure/mappers/JSDatasetPreviewMapper.ts
index b821962f9..e6e69b930 100644
--- a/src/dataset/infrastructure/mappers/JSDatasetPreviewMapper.ts
+++ b/src/dataset/infrastructure/mappers/JSDatasetPreviewMapper.ts
@@ -1,23 +1,18 @@
 import { DatasetPreview as JSDatasetPreview } from '@iqss/dataverse-client-javascript/dist/datasets/domain/models/DatasetPreview'
 import { DatasetPreview } from '../../domain/models/DatasetPreview'
-import {
-  DatasetVersionInfo as JSDatasetVersionInfo,
-  DatasetVersionState as JSDatasetVersionState
-} from '@iqss/dataverse-client-javascript/dist/datasets/domain/models/Dataset'
+import { DatasetVersionInfo as JSDatasetVersionInfo } from '@iqss/dataverse-client-javascript/dist/datasets/domain/models/Dataset'
 import { JSDatasetVersionMapper } from './JSDatasetVersionMapper'
 
 export class JSDatasetPreviewMapper {
   static toDatasetPreview(jsDatasetPreview: JSDatasetPreview): DatasetPreview {
     return new DatasetPreview(
       jsDatasetPreview.persistentId,
-      jsDatasetPreview.title,
-      JSDatasetVersionMapper.toDatasetVersion(
+      JSDatasetVersionMapper.toVersion(
         jsDatasetPreview.versionId,
-        jsDatasetPreview.versionInfo
+        jsDatasetPreview.versionInfo,
+        jsDatasetPreview.title,
+        jsDatasetPreview.citation
       ),
-      jsDatasetPreview.versionInfo.releaseTime != undefined,
-      jsDatasetPreview.citation,
-      jsDatasetPreview.versionInfo.state === JSDatasetVersionState.DEACCESSIONED,
       JSDatasetPreviewMapper.toPreviewDate(jsDatasetPreview.versionInfo),
       jsDatasetPreview.description,
       undefined // TODO: get dataset thumbnail from Dataverse https://github.com/IQSS/dataverse-frontend/issues/203
diff --git a/src/dataset/infrastructure/mappers/JSDatasetVersionMapper.ts b/src/dataset/infrastructure/mappers/JSDatasetVersionMapper.ts
index c537636c9..946ef0e70 100644
--- a/src/dataset/infrastructure/mappers/JSDatasetVersionMapper.ts
+++ b/src/dataset/infrastructure/mappers/JSDatasetVersionMapper.ts
@@ -2,22 +2,35 @@ import {
   DatasetVersionInfo as JSDatasetVersionInfo,
   DatasetVersionState as JSDatasetVersionState
 } from '@iqss/dataverse-client-javascript/dist/datasets/domain/models/Dataset'
-import { DatasetPublishingStatus, DatasetVersion } from '../../domain/models/Dataset'
+import {
+  DatasetPublishingStatus,
+  DatasetVersion,
+  DatasetVersionNumber
+} from '../../domain/models/Dataset'
 export class JSDatasetVersionMapper {
-  static toDatasetVersion(
+  static toVersion(
     jDatasetVersionId: number,
     jsDatasetVersionInfo: JSDatasetVersionInfo,
-    requestedVersion?: string
+    jsDatasetTitle: string,
+    jsDatasetCitation: string
   ): DatasetVersion {
-    return new DatasetVersion(
+    return new DatasetVersion.Builder(
       jDatasetVersionId,
-      JSDatasetVersionMapper.toStatus(jsDatasetVersionInfo.state),
+      jsDatasetTitle,
+      this.toVersionNumber(jsDatasetVersionInfo),
+      this.toStatus(jsDatasetVersionInfo.state),
+      jsDatasetCitation,
       true, // TODO Connect with dataset version isLatest
       false, // TODO Connect with dataset version isInReview
-      JSDatasetVersionMapper.toStatus(jsDatasetVersionInfo.state), // TODO Connect with dataset version latestVersionState
+      this.toStatus(jsDatasetVersionInfo.state),
+      this.toSomeDatasetVersionHasBeenReleased(jsDatasetVersionInfo)
+    )
+  }
+
+  static toVersionNumber(jsDatasetVersionInfo: JSDatasetVersionInfo): DatasetVersionNumber {
+    return new DatasetVersionNumber(
       jsDatasetVersionInfo.majorNumber,
-      jsDatasetVersionInfo.minorNumber,
-      requestedVersion
+      jsDatasetVersionInfo.minorNumber
     )
   }
 
@@ -33,4 +46,11 @@ export class JSDatasetVersionMapper {
         return DatasetPublishingStatus.DRAFT
     }
   }
+
+  static toSomeDatasetVersionHasBeenReleased(jsDatasetVersionInfo: JSDatasetVersionInfo): boolean {
+    return (
+      jsDatasetVersionInfo.releaseTime !== undefined &&
+      !isNaN(jsDatasetVersionInfo.releaseTime.getTime())
+    )
+  }
 }
diff --git a/src/files/domain/models/File.ts b/src/files/domain/models/File.ts
index 491d70e9c..6f1eb29db 100644
--- a/src/files/domain/models/File.ts
+++ b/src/files/domain/models/File.ts
@@ -1,207 +1,12 @@
-import FileTypeToFriendlyTypeMap from './FileTypeToFriendlyTypeMap'
+import { DatasetVersion } from '../../../dataset/domain/models/Dataset'
 
-export enum FileSizeUnit {
-  BYTES = 'B',
-  KILOBYTES = 'KB',
-  MEGABYTES = 'MB',
-  GIGABYTES = 'GB',
-  TERABYTES = 'TB',
-  PETABYTES = 'PB'
+export interface FilePermissions {
+  canDownloadFile: boolean
 }
 
-export class FileSize {
-  static readonly multiplier = {
-    [FileSizeUnit.BYTES]: 1,
-    [FileSizeUnit.KILOBYTES]: 1024,
-    [FileSizeUnit.MEGABYTES]: 1024 ** 2,
-    [FileSizeUnit.GIGABYTES]: 1024 ** 3,
-    [FileSizeUnit.TERABYTES]: 1024 ** 4,
-    [FileSizeUnit.PETABYTES]: 1024 ** 5
-  }
-
-  constructor(readonly value: number, readonly unit: FileSizeUnit) {
-    ;[this.value, this.unit] = FileSize.convertToLargestUnit(value, unit)
-  }
-
-  toString(): string {
-    const formattedValue =
-      this.value % 1 === 0 ? this.value.toFixed(0) : (Math.round(this.value * 10) / 10).toString()
-    return `${formattedValue} ${this.unit}`
-  }
-
-  toBytes(): number {
-    return this.value * FileSize.multiplier[this.unit]
-  }
-
-  static convertToLargestUnit(value: number, unit: FileSizeUnit): [number, FileSizeUnit] {
-    let convertedValue = value
-    let convertedUnit = unit
-
-    while (convertedValue >= 1024 && convertedUnit !== FileSizeUnit.PETABYTES) {
-      convertedValue /= 1024
-      convertedUnit = this.getNextUnit(convertedUnit)
-    }
-
-    return [convertedValue, convertedUnit]
-  }
-
-  static getNextUnit(unit: FileSizeUnit): FileSizeUnit {
-    switch (unit) {
-      case FileSizeUnit.BYTES:
-        return FileSizeUnit.KILOBYTES
-      case FileSizeUnit.KILOBYTES:
-        return FileSizeUnit.MEGABYTES
-      case FileSizeUnit.MEGABYTES:
-        return FileSizeUnit.GIGABYTES
-      case FileSizeUnit.GIGABYTES:
-        return FileSizeUnit.TERABYTES
-      case FileSizeUnit.TERABYTES:
-        return FileSizeUnit.PETABYTES
-      default:
-        return unit
-    }
-  }
-}
-
-export enum FileDownloadMode {
-  ORIGINAL = 'original',
-  ARCHIVAL = 'archival'
-}
-
-export class FileDownloadSize extends FileSize {
-  constructor(
-    readonly value: number,
-    readonly unit: FileSizeUnit,
-    readonly mode: FileDownloadMode
-  ) {
-    super(value, unit)
-    ;[this.value, this.unit] = FileDownloadSize.convertToLargestUnit(value, unit)
-  }
-}
-
-export interface FileAccess {
+export interface File {
+  name: string
+  datasetVersion: DatasetVersion
   restricted: boolean
-  latestVersionRestricted: boolean
-  canBeRequested: boolean
-  requested: boolean
-}
-
-export enum FilePublishingStatus {
-  DRAFT = 'draft',
-  RELEASED = 'released',
-  DEACCESSIONED = 'deaccessioned'
-}
-
-export interface FileVersion {
-  number: number
-  publishingStatus: FilePublishingStatus
-}
-
-export enum FileDateType {
-  METADATA_RELEASED = 'metadataReleased',
-  PUBLISHED = 'published',
-  DEPOSITED = 'deposited'
-}
-
-export enum FileVersionNotNumber {
-  LATEST = 'latest',
-  DRAFT = 'draft'
-}
-
-export interface FileDate {
-  type: FileDateType
-  date: Date
-}
-
-export class FileEmbargo {
-  constructor(readonly dateAvailable: Date) {}
-
-  get isActive(): boolean {
-    return this.dateAvailable > new Date()
-  }
-}
-
-export interface FileTabularData {
-  variablesCount: number
-  observationsCount: number
-  unf?: string
-}
-
-export enum FileLabelType {
-  CATEGORY = 'category',
-  TAG = 'tag'
-}
-
-export interface FileLabel {
-  type: FileLabelType
-  value: string
-}
-
-export class FileType {
-  constructor(readonly value: string, readonly original?: string) {}
-
-  toDisplayFormat(): string {
-    return FileTypeToFriendlyTypeMap[this.value] || FileTypeToFriendlyTypeMap.unknown
-  }
-}
-
-export interface FileChecksum {
-  algorithm: string
-  value: string
-}
-
-export enum FileIngestStatus {
-  NONE = 'none',
-  IN_PROGRESS = 'inProgress',
-  SCHEDULED = 'scheduled',
-  ERROR = 'error'
-}
-
-export interface FileIngest {
-  status: FileIngestStatus
-  reportMessage?: string
-}
-
-export interface FileDownloadUrls {
-  original: string
-  tabular?: string
-  rData?: string
-}
-
-export class File {
-  constructor(
-    readonly id: number,
-    readonly version: FileVersion,
-    readonly name: string,
-    readonly access: FileAccess,
-    readonly type: FileType,
-    readonly size: FileSize,
-    readonly date: FileDate,
-    readonly downloadCount: number,
-    readonly labels: FileLabel[],
-    public readonly isDeleted: boolean,
-    public readonly ingest: FileIngest,
-    public readonly downloadUrls: FileDownloadUrls,
-    public thumbnail?: string,
-    readonly directory?: string,
-    readonly embargo?: FileEmbargo,
-    readonly tabularData?: FileTabularData,
-    readonly description?: string,
-    readonly checksum?: FileChecksum
-  ) {}
-
-  getLink(): string {
-    return `/file?id=${this.id}&version=${this.version.number}`
-  }
-
-  get isActivelyEmbargoed(): boolean {
-    if (this.embargo) {
-      return this.embargo.isActive
-    }
-    return false
-  }
-
-  get isTabularData(): boolean {
-    return this.tabularData !== undefined
-  }
+  permissions: FilePermissions
 }
diff --git a/src/files/domain/models/FileCriteria.ts b/src/files/domain/models/FileCriteria.ts
index 30720deba..11d45fbdc 100644
--- a/src/files/domain/models/FileCriteria.ts
+++ b/src/files/domain/models/FileCriteria.ts
@@ -1,4 +1,4 @@
-import { FileType } from './File'
+import { FileType } from './FilePreview'
 
 export class FileCriteria {
   constructor(
diff --git a/src/files/domain/models/FilePreview.ts b/src/files/domain/models/FilePreview.ts
new file mode 100644
index 000000000..1cdd9bd2d
--- /dev/null
+++ b/src/files/domain/models/FilePreview.ts
@@ -0,0 +1,199 @@
+import FileTypeToFriendlyTypeMap from './FileTypeToFriendlyTypeMap'
+
+export enum FileSizeUnit {
+  BYTES = 'B',
+  KILOBYTES = 'KB',
+  MEGABYTES = 'MB',
+  GIGABYTES = 'GB',
+  TERABYTES = 'TB',
+  PETABYTES = 'PB'
+}
+
+export class FileSize {
+  static readonly multiplier = {
+    [FileSizeUnit.BYTES]: 1,
+    [FileSizeUnit.KILOBYTES]: 1024,
+    [FileSizeUnit.MEGABYTES]: 1024 ** 2,
+    [FileSizeUnit.GIGABYTES]: 1024 ** 3,
+    [FileSizeUnit.TERABYTES]: 1024 ** 4,
+    [FileSizeUnit.PETABYTES]: 1024 ** 5
+  }
+
+  constructor(readonly value: number, readonly unit: FileSizeUnit) {
+    ;[this.value, this.unit] = FileSize.convertToLargestUnit(value, unit)
+  }
+
+  toString(): string {
+    const formattedValue =
+      this.value % 1 === 0 ? this.value.toFixed(0) : (Math.round(this.value * 10) / 10).toString()
+    return `${formattedValue} ${this.unit}`
+  }
+
+  toBytes(): number {
+    return this.value * FileSize.multiplier[this.unit]
+  }
+
+  static convertToLargestUnit(value: number, unit: FileSizeUnit): [number, FileSizeUnit] {
+    let convertedValue = value
+    let convertedUnit = unit
+
+    while (convertedValue >= 1024 && convertedUnit !== FileSizeUnit.PETABYTES) {
+      convertedValue /= 1024
+      convertedUnit = this.getNextUnit(convertedUnit)
+    }
+
+    return [convertedValue, convertedUnit]
+  }
+
+  static getNextUnit(unit: FileSizeUnit): FileSizeUnit {
+    switch (unit) {
+      case FileSizeUnit.BYTES:
+        return FileSizeUnit.KILOBYTES
+      case FileSizeUnit.KILOBYTES:
+        return FileSizeUnit.MEGABYTES
+      case FileSizeUnit.MEGABYTES:
+        return FileSizeUnit.GIGABYTES
+      case FileSizeUnit.GIGABYTES:
+        return FileSizeUnit.TERABYTES
+      case FileSizeUnit.TERABYTES:
+        return FileSizeUnit.PETABYTES
+      default:
+        return unit
+    }
+  }
+}
+
+export enum FileDownloadMode {
+  ORIGINAL = 'original',
+  ARCHIVAL = 'archival'
+}
+
+export class FileDownloadSize extends FileSize {
+  constructor(
+    readonly value: number,
+    readonly unit: FileSizeUnit,
+    readonly mode: FileDownloadMode
+  ) {
+    super(value, unit)
+    ;[this.value, this.unit] = FileDownloadSize.convertToLargestUnit(value, unit)
+  }
+}
+
+export interface FileAccess {
+  restricted: boolean
+  latestVersionRestricted: boolean
+  canBeRequested: boolean
+  requested: boolean
+}
+
+export enum FilePublishingStatus {
+  DRAFT = 'draft',
+  RELEASED = 'released',
+  DEACCESSIONED = 'deaccessioned'
+}
+
+export interface FileVersion {
+  number: number
+  publishingStatus: FilePublishingStatus
+}
+
+export enum FileDateType {
+  METADATA_RELEASED = 'metadataReleased',
+  PUBLISHED = 'published',
+  DEPOSITED = 'deposited'
+}
+
+export enum FileVersionNotNumber {
+  LATEST = 'latest',
+  DRAFT = 'draft'
+}
+
+export interface FileDate {
+  type: FileDateType
+  date: Date
+}
+
+export class FileEmbargo {
+  constructor(readonly dateAvailable: Date) {}
+
+  get isActive(): boolean {
+    return this.dateAvailable > new Date()
+  }
+}
+
+export interface FileTabularData {
+  variablesCount: number
+  observationsCount: number
+  unf?: string
+}
+
+export enum FileLabelType {
+  CATEGORY = 'category',
+  TAG = 'tag'
+}
+
+export interface FileLabel {
+  type: FileLabelType
+  value: string
+}
+
+export class FileType {
+  constructor(readonly value: string, readonly original?: string) {}
+
+  toDisplayFormat(): string {
+    return FileTypeToFriendlyTypeMap[this.value] || FileTypeToFriendlyTypeMap.unknown
+  }
+}
+
+export interface FileChecksum {
+  algorithm: string
+  value: string
+}
+
+export enum FileIngestStatus {
+  NONE = 'none',
+  IN_PROGRESS = 'inProgress',
+  SCHEDULED = 'scheduled',
+  ERROR = 'error'
+}
+
+export interface FileIngest {
+  status: FileIngestStatus
+  reportMessage?: string
+}
+
+export interface FileDownloadUrls {
+  original: string
+  tabular?: string
+  rData?: string
+}
+
+export class FilePreview {
+  constructor(
+    readonly id: number,
+    readonly version: FileVersion,
+    readonly name: string,
+    readonly access: FileAccess,
+    readonly type: FileType,
+    readonly size: FileSize,
+    readonly date: FileDate,
+    readonly downloadCount: number,
+    readonly labels: FileLabel[],
+    public readonly isDeleted: boolean,
+    public readonly ingest: FileIngest,
+    public readonly downloadUrls: FileDownloadUrls,
+    public thumbnail?: string,
+    readonly directory?: string,
+    readonly embargo?: FileEmbargo,
+    readonly tabularData?: FileTabularData,
+    readonly description?: string,
+    readonly checksum?: FileChecksum
+  ) {}
+
+  get isActivelyEmbargoed(): boolean {
+    if (this.embargo) {
+      return this.embargo.isActive
+    }
+    return false
+  }
+}
diff --git a/src/files/domain/models/FilesCountInfo.ts b/src/files/domain/models/FilesCountInfo.ts
index d8a12ee99..bc7aae4ef 100644
--- a/src/files/domain/models/FilesCountInfo.ts
+++ b/src/files/domain/models/FilesCountInfo.ts
@@ -1,4 +1,4 @@
-import { FileType } from './File'
+import { FileType } from './FilePreview'
 import { FileAccessOption, FileTag } from './FileCriteria'
 
 export interface FilesCountInfo {
diff --git a/src/files/domain/repositories/FileRepository.ts b/src/files/domain/repositories/FileRepository.ts
index 278fc9502..5a9e0a76a 100644
--- a/src/files/domain/repositories/FileRepository.ts
+++ b/src/files/domain/repositories/FileRepository.ts
@@ -1,8 +1,9 @@
-import { File, FileDownloadMode } from '../models/File'
+import { FilePreview, FileDownloadMode } from '../models/FilePreview'
+import { File } from '../models/File'
 import { FileCriteria } from '../models/FileCriteria'
 import { FilesCountInfo } from '../models/FilesCountInfo'
 import { FileUserPermissions } from '../models/FileUserPermissions'
-import { DatasetVersion } from '../../../dataset/domain/models/Dataset'
+import { DatasetVersion, DatasetVersionNumber } from '../../../dataset/domain/models/Dataset'
 import { FilePaginationInfo } from '../models/FilePaginationInfo'
 
 export interface FileRepository {
@@ -11,18 +12,19 @@ export interface FileRepository {
     datasetVersion: DatasetVersion,
     paginationInfo?: FilePaginationInfo,
     criteria?: FileCriteria
-  ) => Promise<File[]>
+  ) => Promise<FilePreview[]>
   getFilesCountInfoByDatasetPersistentId: (
     datasetPersistentId: string,
-    datasetVersion: DatasetVersion,
+    datasetVersionNumber: DatasetVersionNumber,
     criteria: FileCriteria
   ) => Promise<FilesCountInfo>
   getFilesTotalDownloadSizeByDatasetPersistentId: (
     datasetPersistentId: string,
-    datasetVersion: DatasetVersion,
+    datasetVersionNumber: DatasetVersionNumber,
     criteria?: FileCriteria
   ) => Promise<number>
   getUserPermissionsById: (id: number) => Promise<FileUserPermissions>
+  getById: (id: number) => Promise<File | undefined>
   getMultipleFileDownloadUrl: (ids: number[], downloadMode: FileDownloadMode) => string
   getFileDownloadUrl: (id: number, downloadMode: FileDownloadMode) => string
 }
diff --git a/src/files/domain/useCases/checkFileDownloadPermission.ts b/src/files/domain/useCases/checkFileDownloadPermission.ts
index 974f0dd5b..091064a07 100644
--- a/src/files/domain/useCases/checkFileDownloadPermission.ts
+++ b/src/files/domain/useCases/checkFileDownloadPermission.ts
@@ -1,9 +1,9 @@
 import { FileRepository } from '../repositories/FileRepository'
-import { File, FilePublishingStatus } from '../models/File'
+import { FilePreview, FilePublishingStatus } from '../models/FilePreview'
 
 export async function checkFileDownloadPermission(
   fileRepository: FileRepository,
-  file: File
+  file: FilePreview
 ): Promise<boolean> {
   if (file.version.publishingStatus === FilePublishingStatus.DEACCESSIONED) {
     return fileRepository.getUserPermissionsById(file.id).then((permissions) => {
diff --git a/src/files/domain/useCases/checkFileEditDatasetPermission.ts b/src/files/domain/useCases/checkFileEditDatasetPermission.ts
index a2a69206f..cbb4c8f0c 100644
--- a/src/files/domain/useCases/checkFileEditDatasetPermission.ts
+++ b/src/files/domain/useCases/checkFileEditDatasetPermission.ts
@@ -1,9 +1,9 @@
 import { FileRepository } from '../repositories/FileRepository'
-import { File } from '../models/File'
+import { FilePreview } from '../models/FilePreview'
 
 export async function checkFileEditDatasetPermission(
   fileRepository: FileRepository,
-  file: File
+  file: FilePreview
 ): Promise<boolean> {
   return fileRepository.getUserPermissionsById(file.id).then((permissions) => {
     return permissions.canEditDataset
diff --git a/src/files/domain/useCases/getFileById.ts b/src/files/domain/useCases/getFileById.ts
new file mode 100644
index 000000000..226c9e711
--- /dev/null
+++ b/src/files/domain/useCases/getFileById.ts
@@ -0,0 +1,11 @@
+import { FileRepository } from '../repositories/FileRepository'
+import { File } from '../models/File'
+
+export async function getFileById(
+  repository: FileRepository,
+  id: number
+): Promise<File | undefined> {
+  return repository.getById(id).catch((error: Error) => {
+    throw new Error(error.message)
+  })
+}
diff --git a/src/files/domain/useCases/getFilesByDatasetPersistentId.ts b/src/files/domain/useCases/getFilesByDatasetPersistentId.ts
index 9370c7ebe..d9937b844 100644
--- a/src/files/domain/useCases/getFilesByDatasetPersistentId.ts
+++ b/src/files/domain/useCases/getFilesByDatasetPersistentId.ts
@@ -1,5 +1,5 @@
 import { FileRepository } from '../repositories/FileRepository'
-import { File } from '../models/File'
+import { FilePreview } from '../models/FilePreview'
 import { FileCriteria } from '../models/FileCriteria'
 import { DatasetVersion } from '../../../dataset/domain/models/Dataset'
 import { FilePaginationInfo } from '../models/FilePaginationInfo'
@@ -10,7 +10,7 @@ export async function getFilesByDatasetPersistentId(
   datasetVersion: DatasetVersion,
   paginationInfo?: FilePaginationInfo,
   criteria?: FileCriteria
-): Promise<File[]> {
+): Promise<FilePreview[]> {
   return fileRepository
     .getAllByDatasetPersistentId(datasetPersistentId, datasetVersion, paginationInfo, criteria)
     .catch((error: Error) => {
diff --git a/src/files/domain/useCases/getFilesCountInfoByDatasetPersistentId.ts b/src/files/domain/useCases/getFilesCountInfoByDatasetPersistentId.ts
index 13b5dfda7..897c3030b 100644
--- a/src/files/domain/useCases/getFilesCountInfoByDatasetPersistentId.ts
+++ b/src/files/domain/useCases/getFilesCountInfoByDatasetPersistentId.ts
@@ -1,16 +1,16 @@
 import { FileRepository } from '../repositories/FileRepository'
 import { FilesCountInfo } from '../models/FilesCountInfo'
-import { DatasetVersion } from '../../../dataset/domain/models/Dataset'
+import { DatasetVersionNumber } from '../../../dataset/domain/models/Dataset'
 import { FileCriteria } from '../models/FileCriteria'
 
 export async function getFilesCountInfoByDatasetPersistentId(
   fileRepository: FileRepository,
   datasetPersistentId: string,
-  datasetVersion: DatasetVersion,
+  datasetVersionNumber: DatasetVersionNumber,
   criteria: FileCriteria = new FileCriteria()
 ): Promise<FilesCountInfo> {
   return fileRepository
-    .getFilesCountInfoByDatasetPersistentId(datasetPersistentId, datasetVersion, criteria)
+    .getFilesCountInfoByDatasetPersistentId(datasetPersistentId, datasetVersionNumber, criteria)
     .catch((error: Error) => {
       throw new Error(error.message)
     })
diff --git a/src/files/domain/useCases/getFilesTotalDownloadSize.ts b/src/files/domain/useCases/getFilesTotalDownloadSize.ts
index c95bb93ba..b69479f09 100644
--- a/src/files/domain/useCases/getFilesTotalDownloadSize.ts
+++ b/src/files/domain/useCases/getFilesTotalDownloadSize.ts
@@ -1,15 +1,19 @@
 import { FileRepository } from '../repositories/FileRepository'
-import { DatasetVersion } from '../../../dataset/domain/models/Dataset'
+import { DatasetVersionNumber } from '../../../dataset/domain/models/Dataset'
 import { FileCriteria } from '../models/FileCriteria'
 
 export async function getFilesTotalDownloadSize(
   fileRepository: FileRepository,
   datasetPersistentId: string,
-  datasetVersion: DatasetVersion,
+  datasetVersionNumber: DatasetVersionNumber,
   criteria?: FileCriteria
 ): Promise<number> {
   return fileRepository
-    .getFilesTotalDownloadSizeByDatasetPersistentId(datasetPersistentId, datasetVersion, criteria)
+    .getFilesTotalDownloadSizeByDatasetPersistentId(
+      datasetPersistentId,
+      datasetVersionNumber,
+      criteria
+    )
     .catch((error: Error) => {
       throw new Error(error.message)
     })
diff --git a/src/files/domain/useCases/getMultipleFileDownloadUrl.ts b/src/files/domain/useCases/getMultipleFileDownloadUrl.ts
index fac6afcf3..a6a1ac247 100644
--- a/src/files/domain/useCases/getMultipleFileDownloadUrl.ts
+++ b/src/files/domain/useCases/getMultipleFileDownloadUrl.ts
@@ -1,5 +1,5 @@
 import { FileRepository } from '../repositories/FileRepository'
-import { FileDownloadMode } from '../models/File'
+import { FileDownloadMode } from '../models/FilePreview'
 
 const ONLY_ONE_FILE = 1
 export function getMultipleFileDownloadUrl(
diff --git a/src/files/infrastructure/FileJSDataverseRepository.ts b/src/files/infrastructure/FileJSDataverseRepository.ts
index 39047c579..1e4053c36 100644
--- a/src/files/infrastructure/FileJSDataverseRepository.ts
+++ b/src/files/infrastructure/FileJSDataverseRepository.ts
@@ -1,5 +1,5 @@
 import { FileRepository } from '../domain/repositories/FileRepository'
-import { File, FileDownloadMode } from '../domain/models/File'
+import { FilePreview, FileDownloadMode } from '../domain/models/FilePreview'
 import { FilesCountInfo } from '../domain/models/FilesCountInfo'
 import { FileUserPermissions } from '../domain/models/FileUserPermissions'
 import {
@@ -17,7 +17,9 @@ import {
 import { FileCriteria } from '../domain/models/FileCriteria'
 import { DomainFileMapper } from './mappers/DomainFileMapper'
 import { JSFileMapper } from './mappers/JSFileMapper'
-import { DatasetVersion } from '../../dataset/domain/models/Dataset'
+import { DatasetVersion, DatasetVersionNumber } from '../../dataset/domain/models/Dataset'
+import { File } from '../domain/models/File'
+import { FileMother } from '../../../tests/component/files/domain/models/FileMother'
 import { FilePaginationInfo } from '../domain/models/FilePaginationInfo'
 
 const includeDeaccessioned = true
@@ -31,11 +33,11 @@ export class FileJSDataverseRepository implements FileRepository {
     datasetVersion: DatasetVersion,
     paginationInfo: FilePaginationInfo = new FilePaginationInfo(),
     criteria: FileCriteria = new FileCriteria()
-  ): Promise<File[]> {
+  ): Promise<FilePreview[]> {
     return getDatasetFiles
       .execute(
         datasetPersistentId,
-        datasetVersion.toString(),
+        datasetVersion.number.toString(),
         includeDeaccessioned,
         paginationInfo.pageSize,
         paginationInfo.offset,
@@ -108,13 +110,13 @@ export class FileJSDataverseRepository implements FileRepository {
 
   getFilesCountInfoByDatasetPersistentId(
     datasetPersistentId: string,
-    datasetVersion: DatasetVersion,
+    datasetVersionNumber: DatasetVersionNumber,
     criteria: FileCriteria
   ): Promise<FilesCountInfo> {
     return getDatasetFileCounts
       .execute(
         datasetPersistentId,
-        datasetVersion.toString(),
+        datasetVersionNumber.toString(),
         includeDeaccessioned,
         DomainFileMapper.toJSFileSearchCriteria(criteria)
       )
@@ -128,13 +130,13 @@ export class FileJSDataverseRepository implements FileRepository {
 
   getFilesTotalDownloadSizeByDatasetPersistentId(
     datasetPersistentId: string,
-    datasetVersion: DatasetVersion,
+    datasetVersionNumber: DatasetVersionNumber,
     criteria: FileCriteria = new FileCriteria()
   ): Promise<number> {
     return getDatasetFilesTotalDownloadSize
       .execute(
         datasetPersistentId,
-        datasetVersion.toString(),
+        datasetVersionNumber.toString(),
         FileDownloadSizeMode.ARCHIVAL,
         DomainFileMapper.toJSFileSearchCriteria(criteria),
         includeDeaccessioned
@@ -155,6 +157,15 @@ export class FileJSDataverseRepository implements FileRepository {
       })
   }
 
+  // eslint-disable-next-line unused-imports/no-unused-vars
+  getById(id: number): Promise<File> {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(FileMother.createRealistic())
+      }, 1000)
+    })
+  }
+
   getMultipleFileDownloadUrl(ids: number[], downloadMode: FileDownloadMode): string {
     return `/api/access/datafiles/${ids.join(',')}?format=${downloadMode}`
   }
diff --git a/src/files/infrastructure/mappers/DomainFileMapper.ts b/src/files/infrastructure/mappers/DomainFileMapper.ts
index a85dc3112..e87c38b40 100644
--- a/src/files/infrastructure/mappers/DomainFileMapper.ts
+++ b/src/files/infrastructure/mappers/DomainFileMapper.ts
@@ -9,7 +9,7 @@ import {
   FileSearchCriteria as JSFileSearchCriteria,
   FileOrderCriteria as JSFileOrderCriteria
 } from '@iqss/dataverse-client-javascript'
-import { FileType } from '../../domain/models/File'
+import { FileType } from '../../domain/models/FilePreview'
 
 export class DomainFileMapper {
   static toJSFileSearchCriteria(criteria: FileCriteria): JSFileSearchCriteria {
diff --git a/src/files/infrastructure/mappers/JSFileMapper.ts b/src/files/infrastructure/mappers/JSFileMapper.ts
index d16f872b9..b6ea1128e 100644
--- a/src/files/infrastructure/mappers/JSFileMapper.ts
+++ b/src/files/infrastructure/mappers/JSFileMapper.ts
@@ -1,5 +1,5 @@
 import {
-  File,
+  FilePreview,
   FileAccess,
   FileChecksum,
   FileDate,
@@ -15,7 +15,7 @@ import {
   FileTabularData,
   FileType,
   FileVersion
-} from '../../domain/models/File'
+} from '../../domain/models/FilePreview'
 import {
   File as JSFile,
   FileEmbargo as JSFileEmbargo,
@@ -44,8 +44,8 @@ export class JSFileMapper {
     downloadsCount: number,
     thumbnail?: string,
     jsTabularData?: JSFileTabularData[]
-  ): File {
-    return new File(
+  ): FilePreview {
+    return new FilePreview(
       this.toFileId(jsFile.id),
       this.toFileVersion(jsFile.version, datasetVersion, jsFile.publicationDate),
       this.toFileName(jsFile.name),
diff --git a/src/sections/Route.enum.ts b/src/sections/Route.enum.ts
index a63752a54..f2d93694e 100644
--- a/src/sections/Route.enum.ts
+++ b/src/sections/Route.enum.ts
@@ -3,5 +3,6 @@ export enum Route {
   SIGN_UP = '/dataverseuser.xhtml?editMode=CREATE&redirectPage=%2Fdataverse.xhtml',
   LOG_IN = '/loginpage.xhtml?redirectPage=%2Fdataverse.xhtml',
   LOG_OUT = '/',
-  DATASETS = 'datasets'
+  DATASETS = '/datasets',
+  FILES = '/files'
 }
diff --git a/src/sections/dataset/Dataset.tsx b/src/sections/dataset/Dataset.tsx
index 86e6b69f1..e05b86f1e 100644
--- a/src/sections/dataset/Dataset.tsx
+++ b/src/sections/dataset/Dataset.tsx
@@ -51,18 +51,13 @@ export function Dataset({ fileRepository }: DatasetProps) {
           </div>
 
           <header className={styles.header}>
-            <h1>{dataset.title}</h1>
-            <DatasetLabels labels={dataset.labels} />
+            <h1>{dataset.version.title}</h1>
+            <DatasetLabels labels={dataset.version.labels} />
           </header>
           <div className={styles.container}>
             <Row>
               <Col sm={9}>
-                <DatasetCitation
-                  title={dataset.title}
-                  thumbnail={dataset.thumbnail}
-                  citation={dataset.citation}
-                  version={dataset.version}
-                />
+                <DatasetCitation thumbnail={dataset.thumbnail} version={dataset.version} />
               </Col>
               <Col sm={3}>
                 <DatasetActionButtons dataset={dataset} />
diff --git a/src/sections/dataset/dataset-action-buttons/access-dataset-menu/AccessDatasetMenu.tsx b/src/sections/dataset/dataset-action-buttons/access-dataset-menu/AccessDatasetMenu.tsx
index 701b4ef4f..a58ad9125 100644
--- a/src/sections/dataset/dataset-action-buttons/access-dataset-menu/AccessDatasetMenu.tsx
+++ b/src/sections/dataset/dataset-action-buttons/access-dataset-menu/AccessDatasetMenu.tsx
@@ -6,7 +6,7 @@ import {
 } from '../../../../dataset/domain/models/Dataset'
 import { DropdownButton, DropdownButtonItem, DropdownHeader } from '@iqss/dataverse-design-system'
 import { useTranslation } from 'react-i18next'
-import { FileDownloadSize, FileDownloadMode } from '../../../../files/domain/models/File'
+import { FileDownloadSize, FileDownloadMode } from '../../../../files/domain/models/FilePreview'
 import { Download } from 'react-bootstrap-icons'
 
 interface AccessDatasetMenuProps {
diff --git a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.tsx b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.tsx
index 98c25d869..18527ffb5 100644
--- a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.tsx
+++ b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.tsx
@@ -6,7 +6,10 @@ interface DeaccessionDatasetButtonProps {
   dataset: Dataset
 }
 export function DeaccessionDatasetButton({ dataset }: DeaccessionDatasetButtonProps) {
-  if (!dataset.isReleased || !dataset.permissions.canPublishDataset) {
+  if (
+    !dataset.version.someDatasetVersionHasBeenReleased ||
+    !dataset.permissions.canPublishDataset
+  ) {
     return <></>
   }
 
diff --git a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.tsx b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.tsx
index c7f4c25fe..9a1eaf9f7 100644
--- a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.tsx
+++ b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.tsx
@@ -8,7 +8,7 @@ interface DeleteDatasetButtonProps {
 export function DeleteDatasetButton({ dataset }: DeleteDatasetButtonProps) {
   if (
     !dataset.permissions.canDeleteDataset ||
-    dataset.version.latestVersionStatus !== DatasetPublishingStatus.DRAFT
+    dataset.version.latestVersionPublishingStatus !== DatasetPublishingStatus.DRAFT
   ) {
     return <></>
   }
@@ -18,7 +18,7 @@ export function DeleteDatasetButton({ dataset }: DeleteDatasetButtonProps) {
     <>
       <DropdownSeparator />
       <DropdownButtonItem>
-        {dataset.isReleased
+        {dataset.version.someDatasetVersionHasBeenReleased
           ? t('datasetActionButtons.editDataset.delete.draft')
           : t('datasetActionButtons.editDataset.delete.released')}
       </DropdownButtonItem>
diff --git a/src/sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.tsx b/src/sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.tsx
index ed613dfbb..3d0ef983a 100644
--- a/src/sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.tsx
+++ b/src/sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.tsx
@@ -19,7 +19,7 @@ export function LinkDatasetButton({ dataset }: LinkDatasetButtonProps) {
 
   if (
     !user ||
-    !dataset.isReleased ||
+    !dataset.version.someDatasetVersionHasBeenReleased ||
     dataset.version.publishingStatus === DatasetPublishingStatus.DEACCESSIONED
   ) {
     return <></>
diff --git a/src/sections/dataset/dataset-citation/DatasetCitation.tsx b/src/sections/dataset/dataset-citation/DatasetCitation.tsx
index 9f1450830..41534f2b0 100644
--- a/src/sections/dataset/dataset-citation/DatasetCitation.tsx
+++ b/src/sections/dataset/dataset-citation/DatasetCitation.tsx
@@ -8,12 +8,10 @@ import { DatasetCitationTooltip } from './DatasetCitationTooltip'
 
 interface DatasetCitationProps {
   thumbnail?: string
-  title: string
-  citation: string
   version: DatasetVersion
 }
 
-export function DatasetCitation({ thumbnail, title, citation, version }: DatasetCitationProps) {
+export function DatasetCitation({ thumbnail, version }: DatasetCitationProps) {
   const { t } = useTranslation('dataset')
   return (
     <>
@@ -27,14 +25,14 @@ export function DatasetCitation({ thumbnail, title, citation, version }: Dataset
           <Col sm={2} className={styles.thumbnail}>
             <DatasetThumbnail
               thumbnail={thumbnail}
-              title={title}
+              title={version.title}
               isDeaccessioned={version.publishingStatus === DatasetPublishingStatus.DEACCESSIONED}
             />
           </Col>
           <Col>
             <Row>
               <span className={styles.citation}>
-                <CitationDescription citation={citation} />
+                <CitationDescription citation={version.citation} />
                 <DatasetCitationTooltip status={version.publishingStatus} />
               </span>
             </Row>
diff --git a/src/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType.tsx b/src/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType.tsx
index ff1bd0d61..4367da6be 100644
--- a/src/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType.tsx
+++ b/src/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType.tsx
@@ -7,7 +7,7 @@ import {
 import { FilesCountInfo } from '../../../../files/domain/models/FilesCountInfo'
 import styles from './FileCriteriaForm.module.scss'
 import { useState } from 'react'
-import { FileType } from '../../../../files/domain/models/File'
+import { FileType } from '../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 
 interface FileCriteriaFilterByTypeProps {
diff --git a/src/sections/dataset/dataset-files/files-table/FilesTable.tsx b/src/sections/dataset/dataset-files/files-table/FilesTable.tsx
index b1988bba8..8bf0b8874 100644
--- a/src/sections/dataset/dataset-files/files-table/FilesTable.tsx
+++ b/src/sections/dataset/dataset-files/files-table/FilesTable.tsx
@@ -2,7 +2,7 @@ import { Table } from '@iqss/dataverse-design-system'
 import { FilesTableHeader } from './FilesTableHeader'
 import { FilesTableBody } from './FilesTableBody'
 import { useFilesTable } from './useFilesTable'
-import { File } from '../../../../files/domain/models/File'
+import { FilePreview } from '../../../../files/domain/models/FilePreview'
 import { RowSelectionMessage } from './row-selection/RowSelectionMessage'
 import { ZipDownloadLimitMessage } from './zip-download-limit-message/ZipDownloadLimitMessage'
 import { SpinnerSymbol } from './spinner-symbol/SpinnerSymbol'
@@ -12,7 +12,7 @@ import { FileCriteria } from '../../../../files/domain/models/FileCriteria'
 import { FilePaginationInfo } from '../../../../files/domain/models/FilePaginationInfo'
 
 interface FilesTableProps {
-  files: File[]
+  files: FilePreview[]
   isLoading: boolean
   paginationInfo: FilePaginationInfo
   filesTotalDownloadSize: number
diff --git a/src/sections/dataset/dataset-files/files-table/FilesTableBody.tsx b/src/sections/dataset/dataset-files/files-table/FilesTableBody.tsx
index b91591ef7..91e09d4ea 100644
--- a/src/sections/dataset/dataset-files/files-table/FilesTableBody.tsx
+++ b/src/sections/dataset/dataset-files/files-table/FilesTableBody.tsx
@@ -1,11 +1,11 @@
 import { flexRender, Row } from '@tanstack/react-table'
-import { File } from '../../../../files/domain/models/File'
+import { FilePreview } from '../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 import styles from './FilesTable.module.scss'
 import { getCellStyle } from './FilesTable'
 
 interface FilesTableBodyProps {
-  rows: Row<File>[]
+  rows: Row<FilePreview>[]
 }
 export function FilesTableBody({ rows }: FilesTableBodyProps) {
   if (rows.length === 0) {
diff --git a/src/sections/dataset/dataset-files/files-table/FilesTableColumnsDefinition.tsx b/src/sections/dataset/dataset-files/files-table/FilesTableColumnsDefinition.tsx
index 6c241eac0..98836ca72 100644
--- a/src/sections/dataset/dataset-files/files-table/FilesTableColumnsDefinition.tsx
+++ b/src/sections/dataset/dataset-files/files-table/FilesTableColumnsDefinition.tsx
@@ -1,5 +1,5 @@
 import { ColumnDef } from '@tanstack/react-table'
-import { File } from '../../../../files/domain/models/File'
+import { FilePreview } from '../../../../files/domain/models/FilePreview'
 import { RowSelectionCheckbox } from './row-selection/RowSelectionCheckbox'
 import { FileInfoCell } from './file-info/file-info-cell/FileInfoCell'
 import { FileInfoHeader } from './file-info/FileInfoHeader'
@@ -11,7 +11,7 @@ import { FilePaginationInfo } from '../../../../files/domain/models/FilePaginati
 export const createColumnsDefinition = (
   paginationInfo: FilePaginationInfo,
   fileSelection: FileSelection
-): ColumnDef<File>[] => [
+): ColumnDef<FilePreview>[] => [
   {
     id: 'select',
     header: ({ table }) => (
diff --git a/src/sections/dataset/dataset-files/files-table/FilesTableHeader.tsx b/src/sections/dataset/dataset-files/files-table/FilesTableHeader.tsx
index 033ed4b9b..a18e8134f 100644
--- a/src/sections/dataset/dataset-files/files-table/FilesTableHeader.tsx
+++ b/src/sections/dataset/dataset-files/files-table/FilesTableHeader.tsx
@@ -1,10 +1,10 @@
 import { flexRender, HeaderGroup } from '@tanstack/react-table'
-import { File } from '../../../../files/domain/models/File'
+import { FilePreview } from '../../../../files/domain/models/FilePreview'
 import styles from './FilesTable.module.scss'
 import { getCellStyle } from './FilesTable'
 
 interface FilesTableHeaderProps {
-  headers: HeaderGroup<File>[]
+  headers: HeaderGroup<FilePreview>[]
 }
 
 export function FilesTableHeader({ headers }: FilesTableHeaderProps) {
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.tsx
index 204ad474e..269ca6938 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.tsx
@@ -1,11 +1,11 @@
 import { EditFilesMenu } from './edit-files-menu/EditFilesMenu'
-import { File } from '../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../files/domain/models/FilePreview'
 import styles from './FileActionsHeader.module.scss'
 import { useTranslation } from 'react-i18next'
 import { DownloadFilesButton } from './download-files/DownloadFilesButton'
 import { FileSelection } from '../row-selection/useFileSelection'
 interface FileActionsHeaderProps {
-  files: File[]
+  files: FilePreview[]
   fileSelection: FileSelection
 }
 export function FileActionsHeader({ files, fileSelection }: FileActionsHeaderProps) {
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.tsx
index 67e1596ff..56f84dd02 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.tsx
@@ -1,4 +1,4 @@
-import { File, FileDownloadMode } from '../../../../../../files/domain/models/File'
+import { FilePreview, FileDownloadMode } from '../../../../../../files/domain/models/FilePreview'
 import { useDataset } from '../../../../DatasetContext'
 import { Button, DropdownButton, DropdownButtonItem } from '@iqss/dataverse-design-system'
 import { Download } from 'react-bootstrap-icons'
@@ -10,7 +10,7 @@ import { MouseEvent, useState } from 'react'
 import { useMultipleFileDownload } from '../../../../../file/multiple-file-download/MultipleFileDownloadContext'
 
 interface DownloadFilesButtonProps {
-  files: File[]
+  files: FilePreview[]
   fileSelection: FileSelection
 }
 
@@ -90,6 +90,6 @@ export function DownloadFilesButton({ files, fileSelection }: DownloadFilesButto
 
 const getFileIdsFromSelection = (fileSelection: FileSelection): number[] => {
   return Object.values(fileSelection)
-    .filter((file): file is File => file !== undefined)
+    .filter((file): file is FilePreview => file !== undefined)
     .map((file) => file.id)
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.tsx
index 23f34bd02..67869fcf0 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.tsx
@@ -3,13 +3,13 @@ import { PencilFill } from 'react-bootstrap-icons'
 import { useSession } from '../../../../../session/SessionContext'
 import styles from './EditFilesMenu.module.scss'
 import { EditFilesOptions } from './EditFilesOptions'
-import { File } from '../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 import { useDataset } from '../../../../DatasetContext'
 import { FileSelection } from '../../row-selection/useFileSelection'
 
 interface EditFilesMenuProps {
-  files: File[]
+  files: FilePreview[]
   fileSelection: FileSelection
 }
 const MINIMUM_FILES_COUNT_TO_SHOW_EDIT_FILES_BUTTON = 1
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx
index 4f21ec3a2..aa97a9ad2 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx
@@ -1,5 +1,5 @@
 import { DropdownButtonItem } from '@iqss/dataverse-design-system'
-import { File } from '../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 import { useState } from 'react'
 import { FileSelection } from '../../row-selection/useFileSelection'
@@ -7,7 +7,7 @@ import { NoSelectedFilesModal } from '../no-selected-files-modal/NoSelectedFiles
 import { useNotImplementedModal } from '../../../../../not-implemented/NotImplementedModalContext'
 
 interface EditFileOptionsProps {
-  files: File[]
+  files: FilePreview[]
   fileSelection: FileSelection
 }
 
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell.tsx
index 8a1053d6b..111ca468f 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell.tsx
@@ -1,10 +1,10 @@
-import { File } from '../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../files/domain/models/FilePreview'
 import { FileActionButtons } from './file-action-buttons/FileActionButtons'
 import { FileInfoMessages } from './file-info-messages/FileInfoMessages'
 import styles from './FileActionsCell.module.scss'
 
 interface FileActionsCellProps {
-  file: File
+  file: FilePreview
 }
 export function FileActionsCell({ file }: FileActionsCellProps) {
   return (
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.tsx
index 20231afee..9703b36d0 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.tsx
@@ -1,11 +1,11 @@
 import { AccessFileMenu } from './access-file-menu/AccessFileMenu'
-import { File } from '../../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../../files/domain/models/FilePreview'
 import { FileOptionsMenu } from './file-options-menu/FileOptionsMenu'
 import { ButtonGroup } from '@iqss/dataverse-design-system'
 import { useTranslation } from 'react-i18next'
 
 interface FileActionButtonsProps {
-  file: File
+  file: FilePreview
 }
 export function FileActionButtons({ file }: FileActionButtonsProps) {
   const { t } = useTranslation('files')
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.tsx
index 98f157ef9..bc346227c 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.tsx
@@ -1,4 +1,4 @@
-import { File } from '../../../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../../../files/domain/models/FilePreview'
 import { Download, FileEarmark } from 'react-bootstrap-icons'
 import { AccessStatus } from './AccessStatus'
 import { RequestAccessOption } from './RequestAccessOption'
@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'
 import { FileDownloadOptions } from './FileDownloadOptions'
 
 interface FileActionButtonAccessFileProps {
-  file: File
+  file: FilePreview
 }
 export function AccessFileMenu({ file }: FileActionButtonAccessFileProps) {
   const { t } = useTranslation('files')
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.tsx
index 2cff5b898..02509ec3c 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.tsx
@@ -1,4 +1,4 @@
-import { File } from '../../../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../../../files/domain/models/FilePreview'
 import { Globe, LockFill, UnlockFill } from 'react-bootstrap-icons'
 import { useTranslation } from 'react-i18next'
 import styles from './AccessFileMenu.module.scss'
@@ -6,7 +6,7 @@ import { DropdownButtonItem } from '@iqss/dataverse-design-system'
 import { useFileDownloadPermission } from '../../../../../../../file/file-permissions/useFileDownloadPermission'
 
 interface AccessStatusProps {
-  file: File
+  file: FilePreview
 }
 
 export function AccessStatus({ file }: AccessStatusProps) {
@@ -35,35 +35,26 @@ function AccessStatusIcon({
   sessionUserHasFileDownloadPermission: boolean
   restricted: boolean
 }) {
-  const { t } = useTranslation('files')
+  const { t } = useTranslation('file')
   if (restricted) {
     if (sessionUserHasFileDownloadPermission) {
       return (
-        <UnlockFill
-          title={t('table.fileAccess.restrictedWithAccess.icon')}
-          className={styles.success}
-        />
+        <UnlockFill title={t('fileAccess.restrictedWithAccess.icon')} className={styles.success} />
       )
     }
-    return (
-      <LockFill
-        role="img"
-        title={t('table.fileAccess.restricted.icon')}
-        className={styles.danger}
-      />
-    )
+    return <LockFill role="img" title={t('fileAccess.restricted.icon')} className={styles.danger} />
   }
-  return <Globe role="img" title={t('table.fileAccess.public.icon')} className={styles.success} />
+  return <Globe role="img" title={t('fileAccess.public.icon')} className={styles.success} />
 }
 
 function AccessStatusText({
   file,
   sessionUserHasFileDownloadPermission
 }: {
-  file: File
+  file: FilePreview
   sessionUserHasFileDownloadPermission: boolean
 }) {
-  const { t } = useTranslation('files')
+  const { t } = useTranslation('file')
   const getAccessStatus = () => {
     if (file.isActivelyEmbargoed) {
       return 'embargoed'
@@ -89,7 +80,7 @@ function AccessStatusText({
             : 'danger'
         ]
       }>
-      {t(`table.fileAccess.${getAccessStatus()}.name`)}
+      {t(`fileAccess.${getAccessStatus()}.name`)}
     </span>
   )
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.tsx
index a1b98acf9..a6a735e8e 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.tsx
@@ -1,13 +1,13 @@
 import { DropdownHeader } from '@iqss/dataverse-design-system'
 import { Download } from 'react-bootstrap-icons'
-import { File } from '../../../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../../../files/domain/models/FilePreview'
 import { FileTabularDownloadOptions } from './FileTabularDownloadOptions'
 import { FileNonTabularDownloadOptions } from './FileNonTabularDownloadOptions'
 import { useTranslation } from 'react-i18next'
 import { useFileDownloadPermission } from '../../../../../../../file/file-permissions/useFileDownloadPermission'
 
 interface FileDownloadOptionsProps {
-  file: File
+  file: FilePreview
 }
 
 export function FileDownloadOptions({ file }: FileDownloadOptionsProps) {
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions.tsx
index eb64a832d..6dfabd9a8 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions.tsx
@@ -1,11 +1,14 @@
-import { File, FileIngestStatus } from '../../../../../../../../files/domain/models/File'
+import {
+  FilePreview,
+  FileIngestStatus
+} from '../../../../../../../../files/domain/models/FilePreview'
 import FileTypeToFriendlyTypeMap from '../../../../../../../../files/domain/models/FileTypeToFriendlyTypeMap'
 import { DropdownButtonItem } from '@iqss/dataverse-design-system'
 import { useDataset } from '../../../../../../DatasetContext'
 import { useTranslation } from 'react-i18next'
 
 interface FileNonTabularDownloadOptionsProps {
-  file: File
+  file: FilePreview
 }
 
 export function FileNonTabularDownloadOptions({ file }: FileNonTabularDownloadOptionsProps) {
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions.tsx
index 0afd6d22b..3e7e8bcf6 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions.tsx
@@ -1,10 +1,13 @@
-import { File, FileIngestStatus } from '../../../../../../../../files/domain/models/File'
+import {
+  FilePreview,
+  FileIngestStatus
+} from '../../../../../../../../files/domain/models/FilePreview'
 import { DropdownButtonItem } from '@iqss/dataverse-design-system'
 import { useDataset } from '../../../../../../DatasetContext'
 import { useTranslation } from 'react-i18next'
 
 interface FileTabularDownloadOptionsProps {
-  file: File
+  file: FilePreview
 }
 
 export function FileTabularDownloadOptions({ file }: FileTabularDownloadOptionsProps) {
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.tsx
index 230df2df5..c2ce0687a 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.tsx
@@ -1,12 +1,15 @@
 import { DropdownButtonItem } from '@iqss/dataverse-design-system'
 import styles from './AccessFileMenu.module.scss'
 import { RequestAccessModal } from './RequestAccessModal'
-import { File, FilePublishingStatus } from '../../../../../../../../files/domain/models/File'
+import {
+  FilePreview,
+  FilePublishingStatus
+} from '../../../../../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 import { useFileDownloadPermission } from '../../../../../../../file/file-permissions/useFileDownloadPermission'
 
 interface RequestAccessButtonProps {
-  file: File
+  file: FilePreview
 }
 export function RequestAccessOption({ file }: RequestAccessButtonProps) {
   const { t } = useTranslation('files')
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.tsx
index f336fe594..4bf4f89a8 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.tsx
@@ -1,4 +1,4 @@
-import { File } from '../../../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../../../files/domain/models/FilePreview'
 import { Button, DropdownButton, DropdownHeader, Tooltip } from '@iqss/dataverse-design-system'
 import { PencilFill, ThreeDotsVertical } from 'react-bootstrap-icons'
 import { useSession } from '../../../../../../../session/SessionContext'
@@ -8,7 +8,7 @@ import { useState } from 'react'
 import { FileAlreadyDeletedModal } from './FileAlreadyDeletedModal'
 import { useDataset } from '../../../../../../DatasetContext'
 
-export function FileOptionsMenu({ file }: { file: File }) {
+export function FileOptionsMenu({ file }: { file: FilePreview }) {
   const { t } = useTranslation('files')
   const { user } = useSession()
   const { dataset } = useDataset()
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages.tsx
index c7eb6292c..c9362de9c 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages.tsx
@@ -1,12 +1,12 @@
 import styles from './FileInfoMessages.module.scss'
 import { ReactNode } from 'react'
 import { InfoCircleFill } from 'react-bootstrap-icons'
-import { File } from '../../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../../files/domain/models/FilePreview'
 import { IngestInfoMessage } from './IngestInfoMessage'
 import { AccessRequestedInfoMessage } from './AccessRequestedInfoMessage'
 
 interface FileInfoMessagesProps {
-  file: File
+  file: FilePreview
 }
 
 export function FileInfoMessages({ file }: FileInfoMessagesProps) {
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage.tsx
index dd3e3be5e..8dbf671af 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage.tsx
@@ -1,4 +1,4 @@
-import { FileIngest, FileIngestStatus } from '../../../../../../../files/domain/models/File'
+import { FileIngest, FileIngestStatus } from '../../../../../../../files/domain/models/FilePreview'
 import { QuestionMarkTooltip } from '@iqss/dataverse-design-system'
 import { InfoMessageBox } from './FileInfoMessages'
 import { useTranslation } from 'react-i18next'
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.tsx
index 1faa1a494..5265e2391 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.tsx
@@ -1,4 +1,4 @@
-import { File } from '../../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../../files/domain/models/FilePreview'
 import styles from './FileInfoCell.module.scss'
 import { FileThumbnail } from './file-info-data/file-thumbnail/FileThumbnail'
 import { FileTitle } from './file-info-data/FileTitle'
@@ -12,14 +12,14 @@ import { FileTabularData } from './file-info-data/FileTabularData'
 import { FileDescription } from './file-info-data/FileDescription'
 import { FileLabels } from './file-info-data/FileLabels'
 
-export function FileInfoCell({ file }: { file: File }) {
+export function FileInfoCell({ file }: { file: FilePreview }) {
   return (
     <div className={styles.container}>
       <div className={styles['thumbnail-container']}>
         <FileThumbnail file={file} />
       </div>
       <div className={styles['body-container']}>
-        <FileTitle link={file.getLink()} name={file.name} />
+        <FileTitle id={file.id} name={file.name} />
         <div className={styles['body-container__subtext']}>
           <FileDirectory directory={file.directory} />
           <FileType type={file.type} size={file.size} />
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileChecksum.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileChecksum.tsx
index dc7d6d8d4..a853c2ad2 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileChecksum.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileChecksum.tsx
@@ -1,6 +1,6 @@
 import styles from '../FileInfoCell.module.scss'
 import { CopyToClipboardButton } from './copy-to-clipboard-button/CopyToClipboardButton'
-import { FileChecksum as FileChecksumModel } from '../../../../../../../files/domain/models/File'
+import { FileChecksum as FileChecksumModel } from '../../../../../../../files/domain/models/FilePreview'
 
 export function FileChecksum({ checksum }: { checksum: FileChecksumModel | undefined }) {
   if (!checksum) {
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
index 054ab4b89..59076096b 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate.tsx
@@ -1,4 +1,4 @@
-import { FileDate as FileDateModel } from '../../../../../../../files/domain/models/File'
+import { FileDate as FileDateModel } from '../../../../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 import { DateHelper } from '../../../../../../../shared/domain/helpers/DateHelper'
 
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDownloads.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDownloads.tsx
index 976863a23..b829859fb 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDownloads.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDownloads.tsx
@@ -1,4 +1,4 @@
-import { FilePublishingStatus } from '../../../../../../../files/domain/models/File'
+import { FilePublishingStatus } from '../../../../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 
 interface FileDownloadsProps {
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileEmbargoDate.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileEmbargoDate.tsx
index 50db565fa..4f95ccc4b 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileEmbargoDate.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileEmbargoDate.tsx
@@ -1,4 +1,7 @@
-import { FileEmbargo, FilePublishingStatus } from '../../../../../../../files/domain/models/File'
+import {
+  FileEmbargo,
+  FilePublishingStatus
+} from '../../../../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 import { DateHelper } from '../../../../../../../shared/domain/helpers/DateHelper'
 
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileLabels.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileLabels.tsx
index 8b3ae274a..8c51df433 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileLabels.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileLabels.tsx
@@ -1,4 +1,4 @@
-import { FileLabel, FileLabelType } from '../../../../../../../files/domain/models/File'
+import { FileLabel, FileLabelType } from '../../../../../../../files/domain/models/FilePreview'
 import { Badge } from '@iqss/dataverse-design-system'
 import styles from '../FileInfoCell.module.scss'
 
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTabularData.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTabularData.tsx
index 21770da2e..c61a5b9d6 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTabularData.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTabularData.tsx
@@ -1,4 +1,4 @@
-import { FileTabularData as FileTabularDataModel } from '../../../../../../../files/domain/models/File'
+import { FileTabularData as FileTabularDataModel } from '../../../../../../../files/domain/models/FilePreview'
 import { CopyToClipboardButton } from './copy-to-clipboard-button/CopyToClipboardButton'
 import { useTranslation } from 'react-i18next'
 
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTitle.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTitle.tsx
index 40e9aa172..4b26ef7bf 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTitle.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTitle.tsx
@@ -1,8 +1,15 @@
+import { LinkToPage } from '../../../../../../shared/link-to-page/LinkToPage'
+import { Route } from '../../../../../../Route.enum'
+
 interface FileTitleProps {
-  link: string
+  id: number
   name: string
 }
 
-export function FileTitle({ link, name }: FileTitleProps) {
-  return <a href={link}>{name}</a>
+export function FileTitle({ id, name }: FileTitleProps) {
+  return (
+    <LinkToPage page={Route.FILES} searchParams={{ id: id.toString() }}>
+      {name}
+    </LinkToPage>
+  )
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileType.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileType.tsx
index e7fb9725b..c4ab50a0c 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileType.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileType.tsx
@@ -1,4 +1,7 @@
-import { FileSize, FileType as FileTypeModel } from '../../../../../../../files/domain/models/File'
+import {
+  FileSize,
+  FileType as FileTypeModel
+} from '../../../../../../../files/domain/models/FilePreview'
 import { useTranslation } from 'react-i18next'
 
 interface FileTypeProps {
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.module.scss b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.module.scss
index aaaafe437..b30949ecb 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.module.scss
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.module.scss
@@ -38,22 +38,8 @@
   max-width: 390px;
 }
 
-%restricted-icon {
+.restricted-icon {
   position: absolute;
   right: -14px;
   bottom: -5px;
-  font-size: 20px;
-}
-
-.restricted-icon-restricted {
-    @extend %restricted-icon;
-
-    color: $dv-danger-color;
-}
-
-.restricted-icon-restrictedWithAccess {
-    @extend %restricted-icon;
-
-  right: -16px;
-    color: $dv-success-color;
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.tsx
index c4176dabb..7642d03a0 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.tsx
@@ -1,12 +1,12 @@
 import { FileThumbnailIcon } from './FileThumbnailIcon'
 import { FileThumbnailPreviewImage } from './FileThumbnailPreviewImage'
-import { File } from '../../../../../../../../files/domain/models/File'
-import { FileThumbnailRestrictedIcon } from './FileThumbnailRestrictedIcon'
+import { FilePreview } from '../../../../../../../../files/domain/models/FilePreview'
+import { FileAccessRestrictedIcon } from '../../../../../../../file/file-access/FileAccessRestrictedIcon'
 import styles from './FileThumbnail.module.scss'
 import { useFileDownloadPermission } from '../../../../../../../file/file-permissions/useFileDownloadPermission'
 
 interface FileThumbnailProps {
-  file: File
+  file: FilePreview
 }
 
 export function FileThumbnail({ file }: FileThumbnailProps) {
@@ -24,7 +24,12 @@ export function FileThumbnail({ file }: FileThumbnailProps) {
       ) : (
         <FileThumbnailIcon type={file.type} />
       )}
-      <FileThumbnailRestrictedIcon file={file} />
+      <div className={styles['restricted-icon']}>
+        <FileAccessRestrictedIcon
+          restricted={file.access.restricted}
+          canDownloadFile={sessionUserHasFileDownloadPermission}
+        />
+      </div>
     </div>
   )
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnailIcon.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnailIcon.tsx
index 7d406f9c9..1f4749630 100644
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnailIcon.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnailIcon.tsx
@@ -1,5 +1,5 @@
 import styles from './FileThumbnail.module.scss'
-import { FileType } from '../../../../../../../../files/domain/models/File'
+import { FileType } from '../../../../../../../../files/domain/models/FilePreview'
 import { FileTypeToFileIconMap } from './FileTypeToFileIconMap'
 import { IconName } from '@iqss/dataverse-design-system'
 
diff --git a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnailRestrictedIcon.tsx b/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnailRestrictedIcon.tsx
deleted file mode 100644
index 167a14545..000000000
--- a/src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnailRestrictedIcon.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { LockFill, UnlockFill } from 'react-bootstrap-icons'
-import styles from './FileThumbnail.module.scss'
-import { useTranslation } from 'react-i18next'
-import { Tooltip } from '@iqss/dataverse-design-system'
-import { File } from '../../../../../../../../files/domain/models/File'
-import { useFileDownloadPermission } from '../../../../../../../file/file-permissions/useFileDownloadPermission'
-
-export function FileThumbnailRestrictedIcon({ file }: { file: File }) {
-  if (!file.access.restricted) {
-    return <></>
-  }
-
-  const { t } = useTranslation('files')
-  const { sessionUserHasFileDownloadPermission } = useFileDownloadPermission(file)
-  return (
-    <span
-      className={
-        styles[
-          `restricted-icon-${
-            sessionUserHasFileDownloadPermission ? 'restrictedWithAccess' : 'restricted'
-          }`
-        ]
-      }>
-      <Tooltip
-        overlay={`${t('table.fileAccess.title')}: ${t(
-          `table.fileAccess.${
-            sessionUserHasFileDownloadPermission ? 'restrictedWithAccess' : 'restricted'
-          }.name`
-        )}`}
-        placement="top">
-        {sessionUserHasFileDownloadPermission ? (
-          <UnlockFill role="img" title={t('table.fileAccess.restrictedWithAccess.icon')} />
-        ) : (
-          <LockFill role="img" title={t('table.fileAccess.restricted.icon')} />
-        )}
-      </Tooltip>
-    </span>
-  )
-}
diff --git a/src/sections/dataset/dataset-files/files-table/row-selection/useFileSelection.ts b/src/sections/dataset/dataset-files/files-table/row-selection/useFileSelection.ts
index 6fe2a12eb..fb921b418 100644
--- a/src/sections/dataset/dataset-files/files-table/row-selection/useFileSelection.ts
+++ b/src/sections/dataset/dataset-files/files-table/row-selection/useFileSelection.ts
@@ -1,15 +1,15 @@
 import { useEffect, useState } from 'react'
-import { File } from '../../../../../files/domain/models/File'
+import { FilePreview } from '../../../../../files/domain/models/FilePreview'
 import { Row } from '@tanstack/react-table'
 import { RowSelection } from '../useFilesTable'
 import { FilePaginationInfo } from '../../../../../files/domain/models/FilePaginationInfo'
 
 export type FileSelection = {
-  [key: string]: File | undefined
+  [key: string]: FilePreview | undefined
 }
 
 export function useFileSelection(
-  currentPageSelectedRowModel: Record<string, Row<File>>,
+  currentPageSelectedRowModel: Record<string, Row<FilePreview>>,
   setCurrentPageRowSelection: (rowSelection: RowSelection) => void,
   paginationInfo: FilePaginationInfo
 ) {
diff --git a/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx b/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
index 0d4f35fd1..1ffa88043 100644
--- a/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
+++ b/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { File } from '../../../../files/domain/models/File'
+import { FilePreview } from '../../../../files/domain/models/FilePreview'
 import { getCoreRowModel, Row, useReactTable } from '@tanstack/react-table'
 import { createColumnsDefinition } from './FilesTableColumnsDefinition'
 import { useFileSelection } from './row-selection/useFileSelection'
@@ -9,10 +9,10 @@ export type RowSelection = {
   [key: string]: boolean
 }
 
-export function useFilesTable(files: File[], paginationInfo: FilePaginationInfo) {
+export function useFilesTable(files: FilePreview[], paginationInfo: FilePaginationInfo) {
   const [currentPageRowSelection, setCurrentPageRowSelection] = useState<RowSelection>({})
   const [currentPageSelectedRowModel, setCurrentPageSelectedRowModel] = useState<
-    Record<string, Row<File>>
+    Record<string, Row<FilePreview>>
   >({})
   const { fileSelection, selectAllFiles, clearFileSelection } = useFileSelection(
     currentPageSelectedRowModel,
diff --git a/src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.tsx b/src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.tsx
index 8181e34b5..7512fcdcd 100644
--- a/src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.tsx
+++ b/src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next'
 import styles from './ZipLimitMessage.module.scss'
-import { FileSizeUnit } from '../../../../../files/domain/models/File'
+import { FileSizeUnit } from '../../../../../files/domain/models/FilePreview'
 import { useSettings } from '../../../../settings/SettingsContext'
 import { SettingName } from '../../../../../settings/domain/models/Setting'
 import { ZipDownloadLimit } from '../../../../../settings/domain/models/ZipDownloadLimit'
diff --git a/src/sections/dataset/dataset-files/useFiles.tsx b/src/sections/dataset/dataset-files/useFiles.tsx
index ce628deb3..6e0fcf7e2 100644
--- a/src/sections/dataset/dataset-files/useFiles.tsx
+++ b/src/sections/dataset/dataset-files/useFiles.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
 import { FileRepository } from '../../../files/domain/repositories/FileRepository'
-import { File } from '../../../files/domain/models/File'
+import { FilePreview } from '../../../files/domain/models/FilePreview'
 import { getFilesByDatasetPersistentId } from '../../../files/domain/useCases/getFilesByDatasetPersistentId'
 import { FileCriteria } from '../../../files/domain/models/FileCriteria'
 import { FilesCountInfo } from '../../../files/domain/models/FilesCountInfo'
@@ -20,7 +20,7 @@ export function useFiles(
   criteria?: FileCriteria
 ) {
   const { fetchFilesPermission } = useFilePermissions()
-  const [files, setFiles] = useState<File[]>([])
+  const [files, setFiles] = useState<FilePreview[]>([])
   const [isLoading, setIsLoading] = useState<boolean>(true)
   const [filesCountInfo, setFilesCountInfo] = useState<FilesCountInfo>()
   const [filesTotalDownloadSize, setFilesTotalDownloadSize] = useState<number>(0)
@@ -28,7 +28,7 @@ export function useFiles(
     return getFilesCountInfoByDatasetPersistentId(
       filesRepository,
       datasetPersistentId,
-      datasetVersion,
+      datasetVersion.number,
       criteria
     )
       .then((filesCountInfo: FilesCountInfo) => {
@@ -56,11 +56,11 @@ export function useFiles(
         paginationInfo.withTotal(filesCount.total),
         criteria
       )
-        .then((files: File[]) => {
+        .then((files: FilePreview[]) => {
           setFiles(files)
           return files
         })
-        .then((files: File[]) =>
+        .then((files: FilePreview[]) =>
           fetchFilesPermission(FilePermission.DOWNLOAD_FILE, files).then(() => setIsLoading(false))
         )
         .catch(() => {
@@ -88,7 +88,7 @@ export function useFiles(
   ])
 
   useEffect(() => {
-    getFilesTotalDownloadSize(filesRepository, datasetPersistentId, datasetVersion, criteria)
+    getFilesTotalDownloadSize(filesRepository, datasetPersistentId, datasetVersion.number, criteria)
       .then((filesTotalDownloadSize: number) => {
         setFilesTotalDownloadSize(filesTotalDownloadSize)
       })
diff --git a/src/sections/file/File.module.scss b/src/sections/file/File.module.scss
new file mode 100644
index 000000000..d05c34a83
--- /dev/null
+++ b/src/sections/file/File.module.scss
@@ -0,0 +1,28 @@
+@import "node_modules/@iqss/dataverse-design-system/src/lib/assets/styles/design-tokens/colors.module";
+
+.header {
+  margin: 0.5em 0;
+}
+
+.subtext {
+  margin-bottom: 10px;
+ color: $dv-subtext-color;
+}
+
+.container {
+  margin: 0.5rem 0;
+}
+
+.separation-line {
+  margin: 1em 0;
+  border-bottom: 1px solid #dee2e6;
+}
+
+.labels {
+  display: flex;
+  align-items: center;
+}
+
+.restricted-icon {
+  margin-right: 6px;
+}
\ No newline at end of file
diff --git a/src/sections/file/File.tsx b/src/sections/file/File.tsx
new file mode 100644
index 000000000..399431c14
--- /dev/null
+++ b/src/sections/file/File.tsx
@@ -0,0 +1,65 @@
+import { useTranslation } from 'react-i18next'
+import { PageNotFound } from '../page-not-found/PageNotFound'
+import styles from './File.module.scss'
+import { Tabs } from '@iqss/dataverse-design-system'
+import { FileRepository } from '../../files/domain/repositories/FileRepository'
+import { useFile } from './useFile'
+import { useEffect } from 'react'
+import { useLoading } from '../loading/LoadingContext'
+import { FileSkeleton } from './FileSkeleton'
+import { DatasetLabels } from '../dataset/dataset-labels/DatasetLabels'
+import { FileAccessRestrictedIcon } from './file-access/FileAccessRestrictedIcon'
+
+interface FileProps {
+  repository: FileRepository
+  id: number
+}
+export function File({ repository, id }: FileProps) {
+  const { setIsLoading } = useLoading()
+  const { t } = useTranslation('file')
+  const { file, isLoading } = useFile(repository, id)
+
+  useEffect(() => {
+    setIsLoading(isLoading)
+  }, [isLoading])
+
+  if (isLoading) {
+    return <FileSkeleton />
+  }
+
+  return (
+    <>
+      {!file ? (
+        <PageNotFound />
+      ) : (
+        <article>
+          <header className={styles.header}>
+            <h1>{file.name}</h1>
+            <p className={styles.subtext}>
+              {t('subtext', { datasetTitle: file.datasetVersion.title })}
+            </p>
+            <div className={styles.labels}>
+              {file.restricted && (
+                <div className={styles['restricted-icon']}>
+                  <FileAccessRestrictedIcon
+                    restricted={file.restricted}
+                    canDownloadFile={file.permissions.canDownloadFile}
+                  />
+                </div>
+              )}
+              <DatasetLabels labels={file.datasetVersion.labels} />
+            </div>
+          </header>
+          <div className={styles.container}>
+            <Tabs defaultActiveKey="metadata">
+              <Tabs.Tab eventKey="metadata" title={t('tabs.metadata')}>
+                <span></span>
+              </Tabs.Tab>
+            </Tabs>
+            <div className={styles['separation-line']}></div>
+          </div>
+        </article>
+      )}
+    </>
+  )
+}
diff --git a/src/sections/file/FileFactory.tsx b/src/sections/file/FileFactory.tsx
new file mode 100644
index 000000000..27bec3498
--- /dev/null
+++ b/src/sections/file/FileFactory.tsx
@@ -0,0 +1,24 @@
+import { ReactElement } from 'react'
+import { FileJSDataverseRepository } from '../../files/infrastructure/FileJSDataverseRepository'
+import { File } from './File'
+import { useSearchParams } from 'react-router-dom'
+import { PageNotFound } from '../page-not-found/PageNotFound'
+
+const repository = new FileJSDataverseRepository()
+export class FileFactory {
+  static create(): ReactElement {
+    return <FileWithSearchParams />
+  }
+}
+
+function FileWithSearchParams() {
+  const [searchParams] = useSearchParams()
+  const searchParamId = searchParams.get('id') ?? undefined
+  const id = searchParamId ? parseInt(searchParamId) : undefined
+
+  if (!id) {
+    return <PageNotFound />
+  }
+
+  return <File repository={repository} id={id} />
+}
diff --git a/src/sections/file/FileSkeleton.tsx b/src/sections/file/FileSkeleton.tsx
new file mode 100644
index 000000000..e2c8f30de
--- /dev/null
+++ b/src/sections/file/FileSkeleton.tsx
@@ -0,0 +1,28 @@
+import styles from './File.module.scss'
+import Skeleton, { SkeletonTheme } from 'react-loading-skeleton'
+import { Tabs } from '@iqss/dataverse-design-system'
+
+export function FileSkeleton() {
+  return (
+    <SkeletonTheme>
+      <article data-testid="file-skeleton">
+        <header className={styles.header}>
+          <h1>
+            <Skeleton width="15%" />
+          </h1>
+          <p className={styles.subtext}>
+            <Skeleton width="20%" />
+          </p>
+          <Skeleton width="10%" />
+        </header>
+        <div className={styles.container}>
+          <Tabs defaultActiveKey="metadata">
+            <Tabs.Tab eventKey="metadata" title="Metadata">
+              <Skeleton height="1000px" style={{ marginTop: 20 }} />
+            </Tabs.Tab>
+          </Tabs>
+        </div>
+      </article>
+    </SkeletonTheme>
+  )
+}
diff --git a/src/sections/file/file-access/FileAccessInfoIcon.module.scss b/src/sections/file/file-access/FileAccessInfoIcon.module.scss
new file mode 100644
index 000000000..7f750214c
--- /dev/null
+++ b/src/sections/file/file-access/FileAccessInfoIcon.module.scss
@@ -0,0 +1,18 @@
+@import "node_modules/@iqss/dataverse-design-system/src/lib/assets/styles/design-tokens/colors.module";
+
+%restricted-icon {
+  font-size: 20px;
+}
+
+.restricted-icon-restricted {
+  @extend %restricted-icon;
+
+  color: $dv-danger-color;
+}
+
+.restricted-icon-restrictedWithAccess {
+  @extend %restricted-icon;
+
+  right: -16px;
+  color: $dv-success-color;
+}
\ No newline at end of file
diff --git a/src/sections/file/file-access/FileAccessRestrictedIcon.tsx b/src/sections/file/file-access/FileAccessRestrictedIcon.tsx
new file mode 100644
index 000000000..426278ac7
--- /dev/null
+++ b/src/sections/file/file-access/FileAccessRestrictedIcon.tsx
@@ -0,0 +1,38 @@
+import { LockFill, UnlockFill } from 'react-bootstrap-icons'
+import styles from './FileAccessInfoIcon.module.scss'
+import { useTranslation } from 'react-i18next'
+import { Tooltip } from '@iqss/dataverse-design-system'
+
+interface FileAccessInfoIconProps {
+  restricted: boolean
+  canDownloadFile: boolean
+}
+export function FileAccessRestrictedIcon({ restricted, canDownloadFile }: FileAccessInfoIconProps) {
+  const { t } = useTranslation('file')
+
+  if (!restricted) {
+    return <></>
+  }
+
+  if (canDownloadFile) {
+    return (
+      <span className={styles['restricted-icon-restrictedWithAccess']}>
+        <Tooltip
+          overlay={`${t('fileAccess.title')}: ${t('fileAccess.restrictedWithAccess.name')}`}
+          placement="top">
+          <UnlockFill role="img" title={t('fileAccess.restrictedWithAccess.icon')} />
+        </Tooltip>
+      </span>
+    )
+  }
+
+  return (
+    <span className={styles['restricted-icon-restricted']}>
+      <Tooltip
+        overlay={`${t('fileAccess.title')}: ${t('fileAccess.restricted.name')}`}
+        placement="top">
+        <LockFill role="img" title={t('fileAccess.restricted.icon')} />
+      </Tooltip>
+    </span>
+  )
+}
diff --git a/src/sections/file/file-permissions/FilePermissionsContext.ts b/src/sections/file/file-permissions/FilePermissionsContext.ts
index 244d5ea52..f93adea17 100644
--- a/src/sections/file/file-permissions/FilePermissionsContext.ts
+++ b/src/sections/file/file-permissions/FilePermissionsContext.ts
@@ -1,10 +1,13 @@
 import { createContext, useContext } from 'react'
 import { FilePermission } from '../../../files/domain/models/FileUserPermissions'
-import { File } from '../../../files/domain/models/File'
+import { FilePreview } from '../../../files/domain/models/FilePreview'
 
 interface FilePermissionsContextProps {
-  checkSessionUserHasFilePermission: (permission: FilePermission, file: File) => Promise<boolean>
-  fetchFilesPermission: (permission: FilePermission, files: File[]) => Promise<boolean[]>
+  checkSessionUserHasFilePermission: (
+    permission: FilePermission,
+    file: FilePreview
+  ) => Promise<boolean>
+  fetchFilesPermission: (permission: FilePermission, files: FilePreview[]) => Promise<boolean[]>
 }
 
 export const FilePermissionsContext = createContext<FilePermissionsContextProps>({
diff --git a/src/sections/file/file-permissions/FilePermissionsProvider.tsx b/src/sections/file/file-permissions/FilePermissionsProvider.tsx
index 00945be58..bbb95649b 100644
--- a/src/sections/file/file-permissions/FilePermissionsProvider.tsx
+++ b/src/sections/file/file-permissions/FilePermissionsProvider.tsx
@@ -2,7 +2,7 @@ import { PropsWithChildren } from 'react'
 import { FileRepository } from '../../../files/domain/repositories/FileRepository'
 import { FilePermission } from '../../../files/domain/models/FileUserPermissions'
 import { FilePermissionsContext } from './FilePermissionsContext'
-import { File } from '../../../files/domain/models/File'
+import { FilePreview } from '../../../files/domain/models/FilePreview'
 import { checkFileDownloadPermission } from '../../../files/domain/useCases/checkFileDownloadPermission'
 import { checkFileEditDatasetPermission } from '../../../files/domain/useCases/checkFileEditDatasetPermission'
 import { useAnonymized } from '../../dataset/anonymized/AnonymizedContext'
@@ -35,7 +35,7 @@ export function FilePermissionsProvider({
       filePermissionsMap.set(fileIdToUpdate, newValue)
     }
   }
-  const checkSessionUserHasFileDownloadPermission = (file: File): Promise<boolean> => {
+  const checkSessionUserHasFileDownloadPermission = (file: FilePreview): Promise<boolean> => {
     if (anonymizedView) {
       return Promise.resolve(true) // If the user is in anonymized view, they can always download the file
     }
@@ -49,7 +49,7 @@ export function FilePermissionsProvider({
         return false
       })
   }
-  const checkSessionUserHasEditDatasetPermission = (file: File): Promise<boolean> => {
+  const checkSessionUserHasEditDatasetPermission = (file: FilePreview): Promise<boolean> => {
     return checkFileEditDatasetPermission(repository, file)
       .then((canEditDataset) => {
         updateFilePermissionsMap(file.id, FilePermission.EDIT_DATASET, canEditDataset)
@@ -63,7 +63,7 @@ export function FilePermissionsProvider({
 
   function checkSessionUserHasFilePermission(
     permission: FilePermission,
-    file: File
+    file: FilePreview
   ): Promise<boolean> {
     if (filePermissionsMap.has(file.id)) {
       const savedPermission = filePermissionsMap.get(file.id)?.[permission]
@@ -80,7 +80,10 @@ export function FilePermissionsProvider({
     }
   }
 
-  function fetchFilesPermission(permission: FilePermission, files: File[]): Promise<boolean[]> {
+  function fetchFilesPermission(
+    permission: FilePermission,
+    files: FilePreview[]
+  ): Promise<boolean[]> {
     return Promise.all(
       files.map((file) =>
         checkSessionUserHasFilePermission(permission, file)
diff --git a/src/sections/file/file-permissions/useFileDownloadPermission.tsx b/src/sections/file/file-permissions/useFileDownloadPermission.tsx
index 61e02bff7..66a9a9d7e 100644
--- a/src/sections/file/file-permissions/useFileDownloadPermission.tsx
+++ b/src/sections/file/file-permissions/useFileDownloadPermission.tsx
@@ -1,9 +1,9 @@
 import { useEffect, useState } from 'react'
 import { FilePermission } from '../../../files/domain/models/FileUserPermissions'
 import { useFilePermissions } from './FilePermissionsContext'
-import { File } from '../../../files/domain/models/File'
+import { FilePreview } from '../../../files/domain/models/FilePreview'
 
-export function useFileDownloadPermission(file: File) {
+export function useFileDownloadPermission(file: FilePreview) {
   const { checkSessionUserHasFilePermission } = useFilePermissions()
   const [sessionUserHasFileDownloadPermission, setSessionUserHasFileDownloadPermission] =
     useState<boolean>(false)
diff --git a/src/sections/file/multiple-file-download/MultipleFileDownloadContext.ts b/src/sections/file/multiple-file-download/MultipleFileDownloadContext.ts
index 95c611513..0f02a78fd 100644
--- a/src/sections/file/multiple-file-download/MultipleFileDownloadContext.ts
+++ b/src/sections/file/multiple-file-download/MultipleFileDownloadContext.ts
@@ -1,5 +1,5 @@
 import { createContext, useContext } from 'react'
-import { FileDownloadMode } from '../../../files/domain/models/File'
+import { FileDownloadMode } from '../../../files/domain/models/FilePreview'
 
 interface MultipleFileDownloadContextProps {
   getMultipleFileDownloadUrl: (ids: number[], downloadMode: FileDownloadMode) => string
diff --git a/src/sections/file/multiple-file-download/MultipleFileDownloadProvider.tsx b/src/sections/file/multiple-file-download/MultipleFileDownloadProvider.tsx
index 39c485b94..5ca81e327 100644
--- a/src/sections/file/multiple-file-download/MultipleFileDownloadProvider.tsx
+++ b/src/sections/file/multiple-file-download/MultipleFileDownloadProvider.tsx
@@ -1,7 +1,7 @@
 import { PropsWithChildren } from 'react'
 import { FileRepository } from '../../../files/domain/repositories/FileRepository'
 import { MultipleFileDownloadContext } from './MultipleFileDownloadContext'
-import { FileDownloadMode } from '../../../files/domain/models/File'
+import { FileDownloadMode } from '../../../files/domain/models/FilePreview'
 import { getMultipleFileDownloadUrl } from '../../../files/domain/useCases/getMultipleFileDownloadUrl'
 
 interface MultipleFileDownloadProviderProps {
diff --git a/src/sections/file/useFile.tsx b/src/sections/file/useFile.tsx
new file mode 100644
index 000000000..91ac72510
--- /dev/null
+++ b/src/sections/file/useFile.tsx
@@ -0,0 +1,28 @@
+import { useEffect, useState } from 'react'
+import { FileRepository } from '../../files/domain/repositories/FileRepository'
+import { getFileById } from '../../files/domain/useCases/getFileById'
+import { File } from '../../files/domain/models/File'
+
+export function useFile(repository: FileRepository, id: number) {
+  const [file, setFile] = useState<File>()
+  const [isLoading, setIsLoading] = useState<boolean>(true)
+
+  useEffect(() => {
+    setIsLoading(true)
+
+    getFileById(repository, id)
+      .then((file: File | undefined) => {
+        setFile(file)
+        setIsLoading(false)
+      })
+      .catch(() => {
+        throw new Error('There was an error getting the file')
+        setIsLoading(false)
+      })
+  }, [repository, id])
+
+  return {
+    file,
+    isLoading
+  }
+}
diff --git a/src/sections/home/datasets-list/dataset-card/DatasetCard.tsx b/src/sections/home/datasets-list/dataset-card/DatasetCard.tsx
index 6fe1f807e..5e8712da2 100644
--- a/src/sections/home/datasets-list/dataset-card/DatasetCard.tsx
+++ b/src/sections/home/datasets-list/dataset-card/DatasetCard.tsx
@@ -11,10 +11,18 @@ interface DatasetCardProps {
 export function DatasetCard({ dataset }: DatasetCardProps) {
   return (
     <article className={styles.container}>
-      <DatasetCardHeader dataset={dataset} />
+      <DatasetCardHeader persistentId={dataset.persistentId} version={dataset.version} />
       <div className={styles.info}>
-        <DatasetCardThumbnail dataset={dataset} />
-        <DatasetCardInfo dataset={dataset} />
+        <DatasetCardThumbnail
+          persistentId={dataset.persistentId}
+          version={dataset.version}
+          thumbnail={dataset.thumbnail}
+        />
+        <DatasetCardInfo
+          version={dataset.version}
+          releaseOrCreateDate={dataset.releaseOrCreateDate}
+          abbreviatedDescription={dataset.abbreviatedDescription}
+        />
       </div>
     </article>
   )
diff --git a/src/sections/home/datasets-list/dataset-card/DatasetCardHeader.tsx b/src/sections/home/datasets-list/dataset-card/DatasetCardHeader.tsx
index 9e927b2fc..30acd8f62 100644
--- a/src/sections/home/datasets-list/dataset-card/DatasetCardHeader.tsx
+++ b/src/sections/home/datasets-list/dataset-card/DatasetCardHeader.tsx
@@ -2,20 +2,21 @@ import styles from './DatasetCard.module.scss'
 import { LinkToPage } from '../../../shared/link-to-page/LinkToPage'
 import { Route } from '../../../Route.enum'
 import { DatasetLabels } from '../../../dataset/dataset-labels/DatasetLabels'
-import { DatasetPreview } from '../../../../dataset/domain/models/DatasetPreview'
 import { DatasetIcon } from '../../../dataset/dataset-icon/DatasetIcon'
+import { DatasetVersion } from '../../../../dataset/domain/models/Dataset'
 
 interface DatasetCardHeaderProps {
-  dataset: DatasetPreview
+  persistentId: string
+  version: DatasetVersion
 }
-export function DatasetCardHeader({ dataset }: DatasetCardHeaderProps) {
+export function DatasetCardHeader({ persistentId, version }: DatasetCardHeaderProps) {
   return (
     <div className={styles.header}>
       <div className={styles.title}>
-        <LinkToPage page={Route.DATASETS} searchParams={{ persistentId: dataset.persistentId }}>
-          {dataset.title}
+        <LinkToPage page={Route.DATASETS} searchParams={{ persistentId: persistentId }}>
+          {version.title}
         </LinkToPage>
-        <DatasetLabels labels={dataset.labels} />
+        <DatasetLabels labels={version.labels} />
       </div>
       <div className={styles.icon}>
         <DatasetIcon />
diff --git a/src/sections/home/datasets-list/dataset-card/DatasetCardInfo.tsx b/src/sections/home/datasets-list/dataset-card/DatasetCardInfo.tsx
index 76a03a645..b8b80a1c5 100644
--- a/src/sections/home/datasets-list/dataset-card/DatasetCardInfo.tsx
+++ b/src/sections/home/datasets-list/dataset-card/DatasetCardInfo.tsx
@@ -1,23 +1,31 @@
 import styles from './DatasetCard.module.scss'
 import { DateHelper } from '../../../../shared/domain/helpers/DateHelper'
-import { DatasetPreview } from '../../../../dataset/domain/models/DatasetPreview'
 import { CitationDescription } from '../../../shared/citation/CitationDescription'
+import { DatasetPublishingStatus, DatasetVersion } from '../../../../dataset/domain/models/Dataset'
 
 interface DatasetCardInfoProps {
-  dataset: DatasetPreview
+  version: DatasetVersion
+  releaseOrCreateDate: Date
+  abbreviatedDescription: string
 }
 
-export function DatasetCardInfo({ dataset }: DatasetCardInfoProps) {
+export function DatasetCardInfo({
+  version,
+  releaseOrCreateDate,
+  abbreviatedDescription
+}: DatasetCardInfoProps) {
   return (
     <div className={styles.description}>
-      <span className={styles.date}>{DateHelper.toDisplayFormat(dataset.releaseOrCreateDate)}</span>
+      <span className={styles.date}>{DateHelper.toDisplayFormat(releaseOrCreateDate)}</span>
       <span
         className={
-          dataset.isDeaccessioned ? styles['citation-box-deaccessioned'] : styles['citation-box']
+          version.publishingStatus === DatasetPublishingStatus.DEACCESSIONED
+            ? styles['citation-box-deaccessioned']
+            : styles['citation-box']
         }>
-        <CitationDescription citation={dataset.citation} />
+        <CitationDescription citation={version.citation} />
       </span>
-      <span>{dataset.abbreviatedDescription}</span>
+      <span>{abbreviatedDescription}</span>
     </div>
   )
 }
diff --git a/src/sections/home/datasets-list/dataset-card/DatasetCardThumbnail.tsx b/src/sections/home/datasets-list/dataset-card/DatasetCardThumbnail.tsx
index cba65b215..d8065b0fa 100644
--- a/src/sections/home/datasets-list/dataset-card/DatasetCardThumbnail.tsx
+++ b/src/sections/home/datasets-list/dataset-card/DatasetCardThumbnail.tsx
@@ -1,21 +1,29 @@
 import styles from './DatasetCard.module.scss'
-import { DatasetPreview } from '../../../../dataset/domain/models/DatasetPreview'
 import { LinkToPage } from '../../../shared/link-to-page/LinkToPage'
 import { Route } from '../../../Route.enum'
 import { DatasetThumbnail } from '../../../dataset/dataset-thumbnail/DatasetThumbnail'
+import { DatasetPublishingStatus, DatasetVersion } from '../../../../dataset/domain/models/Dataset'
 
 interface DatasetCardThumbnailProps {
-  dataset: DatasetPreview
+  persistentId: string
+  version: DatasetVersion
+  thumbnail?: string
 }
 
-export function DatasetCardThumbnail({ dataset }: DatasetCardThumbnailProps) {
+export function DatasetCardThumbnail({
+  persistentId,
+  version,
+  thumbnail
+}: DatasetCardThumbnailProps) {
   return (
     <div className={styles.thumbnail}>
-      <LinkToPage page={Route.DATASETS} searchParams={{ persistentId: dataset.persistentId }}>
+      <LinkToPage page={Route.DATASETS} searchParams={{ persistentId: persistentId }}>
         <DatasetThumbnail
-          title={dataset.title}
-          thumbnail={dataset.thumbnail}
-          isDeaccessioned={dataset.isDeaccessioned}
+          title={version.title}
+          thumbnail={thumbnail}
+          isDeaccessioned={
+            version.latestVersionPublishingStatus === DatasetPublishingStatus.DEACCESSIONED
+          }
         />
       </LinkToPage>
     </div>
diff --git a/src/settings/domain/models/ZipDownloadLimit.ts b/src/settings/domain/models/ZipDownloadLimit.ts
index d6a6b415e..335847212 100644
--- a/src/settings/domain/models/ZipDownloadLimit.ts
+++ b/src/settings/domain/models/ZipDownloadLimit.ts
@@ -1,3 +1,3 @@
-import { FileSize } from '../../../files/domain/models/File'
+import { FileSize } from '../../../files/domain/models/FilePreview'
 
 export class ZipDownloadLimit extends FileSize {}
diff --git a/src/settings/infrastructure/SettingJSDataverseRepository.ts b/src/settings/infrastructure/SettingJSDataverseRepository.ts
index daeb13e14..009b4fbe2 100644
--- a/src/settings/infrastructure/SettingJSDataverseRepository.ts
+++ b/src/settings/infrastructure/SettingJSDataverseRepository.ts
@@ -1,7 +1,7 @@
 import { SettingRepository } from '../domain/repositories/SettingRepository'
 import { Setting, SettingName } from '../domain/models/Setting'
 import { ZipDownloadLimit } from '../domain/models/ZipDownloadLimit'
-import { FileSizeUnit } from '../../files/domain/models/File'
+import { FileSizeUnit } from '../../files/domain/models/FilePreview'
 
 export class SettingJSDataverseRepository implements SettingRepository {
   // eslint-disable-next-line unused-imports/no-unused-vars
diff --git a/src/stories/WithSettings.tsx b/src/stories/WithSettings.tsx
index 24764ef45..efe9a44fb 100644
--- a/src/stories/WithSettings.tsx
+++ b/src/stories/WithSettings.tsx
@@ -3,7 +3,7 @@ import { SettingsContext } from '../sections/settings/SettingsContext'
 import { Setting, SettingName } from '../settings/domain/models/Setting'
 import { SettingMother } from '../../tests/component/settings/domain/models/SettingMother'
 import { ZipDownloadLimit } from '../settings/domain/models/ZipDownloadLimit'
-import { FileSizeUnit } from '../files/domain/models/File'
+import { FileSizeUnit } from '../files/domain/models/FilePreview'
 
 const zipDownloadLimitMock = new ZipDownloadLimit(1, FileSizeUnit.BYTES)
 export const WithSettings = (Story: StoryFn) => {
diff --git a/src/stories/dataset/WithDeaccessionedDataset.tsx b/src/stories/dataset/WithDeaccessionedDataset.tsx
index d486c3fcf..0f8235cd2 100644
--- a/src/stories/dataset/WithDeaccessionedDataset.tsx
+++ b/src/stories/dataset/WithDeaccessionedDataset.tsx
@@ -1,12 +1,11 @@
 import { StoryFn } from '@storybook/react'
 import { DatasetProvider } from '../../sections/dataset/DatasetProvider'
 import { DatasetRepository } from '../../dataset/domain/repositories/DatasetRepository'
+import { Dataset } from '../../dataset/domain/models/Dataset'
 import {
-  Dataset,
-  DatasetPublishingStatus,
-  DatasetVersion
-} from '../../dataset/domain/models/Dataset'
-import { DatasetMother } from '../../../tests/component/dataset/domain/models/DatasetMother'
+  DatasetMother,
+  DatasetVersionMother
+} from '../../../tests/component/dataset/domain/models/DatasetMother'
 
 export const WithDeaccessionedDataset = (Story: StoryFn) => {
   const datasetRepository = {} as DatasetRepository
@@ -20,15 +19,7 @@ export const WithDeaccessionedDataset = (Story: StoryFn) => {
       setTimeout(() => {
         resolve(
           DatasetMother.createRealistic({
-            version: new DatasetVersion(
-              1,
-              DatasetPublishingStatus.DEACCESSIONED,
-              true,
-              false,
-              DatasetPublishingStatus.DEACCESSIONED,
-              1,
-              0
-            )
+            version: DatasetVersionMother.createDeaccessioned()
           })
         )
       }, 1000)
diff --git a/src/stories/dataset/dataset-action-buttons/DatasetActionButtons.stories.tsx b/src/stories/dataset/dataset-action-buttons/DatasetActionButtons.stories.tsx
index 1e7359fc4..1daec9754 100644
--- a/src/stories/dataset/dataset-action-buttons/DatasetActionButtons.stories.tsx
+++ b/src/stories/dataset/dataset-action-buttons/DatasetActionButtons.stories.tsx
@@ -28,15 +28,14 @@ export const WithPublishPermissions: Story = {
     <DatasetActionButtons
       dataset={DatasetMother.create({
         permissions: DatasetPermissionsMother.createWithAllAllowed(),
-        version: DatasetVersionMother.createDraftAsLatestVersion(),
+        version: DatasetVersionMother.createDraftAsLatestVersionWithSomeVersionHasBeenReleased(),
         hasValidTermsOfAccess: true,
         hasOneTabularFileAtLeast: true,
         fileDownloadSizes: [
           DatasetFileDownloadSizeMother.createOriginal(),
           DatasetFileDownloadSizeMother.createArchival()
         ],
-        isValid: true,
-        isReleased: true
+        isValid: true
       })}
     />
   )
@@ -47,14 +46,13 @@ export const WithNoDatasetPermissions: Story = {
     <DatasetActionButtons
       dataset={DatasetMother.create({
         permissions: DatasetPermissionsMother.createWithNoDatasetPermissions(),
-        version: DatasetVersionMother.createDraftAsLatestVersion(),
+        version: DatasetVersionMother.createDraftAsLatestVersionWithSomeVersionHasBeenReleased(),
         hasValidTermsOfAccess: true,
         fileDownloadSizes: [
           DatasetFileDownloadSizeMother.createOriginal(),
           DatasetFileDownloadSizeMother.createArchival()
         ],
-        isValid: true,
-        isReleased: true
+        isValid: true
       })}
     />
   )
@@ -69,14 +67,13 @@ export const WithUpdateAndNoPublishDatasetPermissions: Story = {
           canPublishDataset: false,
           canUpdateDataset: true
         }),
-        version: DatasetVersionMother.createDraftAsLatestVersion(),
+        version: DatasetVersionMother.createDraftAsLatestVersionWithSomeVersionHasBeenReleased(),
         hasValidTermsOfAccess: true,
         fileDownloadSizes: [
           DatasetFileDownloadSizeMother.createOriginal(),
           DatasetFileDownloadSizeMother.createArchival()
         ],
-        isValid: true,
-        isReleased: true
+        isValid: true
       })}
     />
   )
diff --git a/src/stories/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.stories.tsx b/src/stories/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.stories.tsx
index 18c2140e3..fff6753f9 100644
--- a/src/stories/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.stories.tsx
+++ b/src/stories/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.stories.tsx
@@ -1,7 +1,10 @@
 import { Meta, StoryObj } from '@storybook/react'
 import { WithI18next } from '../../../WithI18next'
 import { WithSettings } from '../../../WithSettings'
-import { DatasetMother } from '../../../../../tests/component/dataset/domain/models/DatasetMother'
+import {
+  DatasetMother,
+  DatasetVersionMother
+} from '../../../../../tests/component/dataset/domain/models/DatasetMother'
 import { LinkDatasetButton } from '../../../../sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton'
 
 const meta: Meta<typeof LinkDatasetButton> = {
@@ -18,5 +21,9 @@ export default meta
 type Story = StoryObj<typeof LinkDatasetButton>
 
 export const ReleasedDataset: Story = {
-  render: () => <LinkDatasetButton dataset={DatasetMother.create({ isReleased: true })} />
+  render: () => (
+    <LinkDatasetButton
+      dataset={DatasetMother.create({ version: DatasetVersionMother.createReleased() })}
+    />
+  )
 }
diff --git a/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx b/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx
index 31de08bf7..9f43ae771 100644
--- a/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx
+++ b/src/stories/dataset/dataset-alerts/DatasetAlert.stories.tsx
@@ -1,12 +1,12 @@
 import type { Meta, StoryObj } from '@storybook/react'
 
-import { DatasetPublishingStatus, DatasetVersion } from '../../../dataset/domain/models/Dataset'
 import { DatasetAlerts } from '../../../sections/dataset/dataset-alerts/DatasetAlerts'
 import { WithI18next } from '../../WithI18next'
 
 import {
   DatasetMother,
-  DatasetPermissionsMother
+  DatasetPermissionsMother,
+  DatasetVersionMother
 } from '../../../../tests/component/dataset/domain/models/DatasetMother'
 import { useAlertContext } from '../../../sections/alerts/AlertContext'
 import { WithAlerts } from '../../WithAlerts'
@@ -57,13 +57,7 @@ export const PublishInProgress: Story = {
 export const DraftVersion: Story = {
   render: () => {
     const dataset = DatasetMother.createRealistic({
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.DRAFT,
-        true,
-        false,
-        DatasetPublishingStatus.DRAFT
-      ),
+      version: DatasetVersionMother.createDraft(),
       permissions: DatasetPermissionsMother.createWithPublishingDatasetAllowed()
     })
     return (
@@ -77,16 +71,8 @@ export const DraftVersion: Story = {
 export const VersionNotFound: Story = {
   render: () => {
     const dataset = DatasetMother.createRealistic({
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.RELEASED,
-        true,
-        false,
-        DatasetPublishingStatus.RELEASED,
-        1,
-        0,
-        '3.0'
-      )
+      version: DatasetVersionMother.createReleased(),
+      requestedVersion: '3.0'
     })
 
     return (
@@ -99,16 +85,8 @@ export const VersionNotFound: Story = {
 export const VersionNotFoundShowDraft: Story = {
   render: () => {
     const dataset = DatasetMother.createRealistic({
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.DRAFT,
-        true,
-        false,
-        DatasetPublishingStatus.DRAFT,
-        1,
-        0,
-        '3.0'
-      )
+      version: DatasetVersionMother.createDraft(),
+      requestedVersion: '3.0'
     })
 
     return (
@@ -121,15 +99,7 @@ export const VersionNotFoundShowDraft: Story = {
 export const SharePrivateUrl: Story = {
   render: () => {
     const dataset = DatasetMother.createRealistic({
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.RELEASED,
-        true,
-        false,
-        DatasetPublishingStatus.DRAFT,
-        1,
-        0
-      ),
+      version: DatasetVersionMother.createDraft(),
       permissions: DatasetPermissionsMother.createWithAllAllowed(),
       privateUrl: {
         urlSnippet: 'http://localhost:8080/privateurl.xhtml?token=',
@@ -147,15 +117,7 @@ export const SharePrivateUrl: Story = {
 export const UsePrivateUrl: Story = {
   render: () => {
     const dataset = DatasetMother.createRealistic({
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.RELEASED,
-        true,
-        false,
-        DatasetPublishingStatus.DRAFT,
-        1,
-        0
-      ),
+      version: DatasetVersionMother.createDraft(),
       permissions: DatasetPermissionsMother.createWithNoneAllowed(),
       privateUrl: {
         urlSnippet: 'http://localhost:8080/privateurl.xhtml?token=',
diff --git a/src/stories/dataset/dataset-citation/DatasetCitation.stories.tsx b/src/stories/dataset/dataset-citation/DatasetCitation.stories.tsx
index 0a52d5264..4d8d201d2 100644
--- a/src/stories/dataset/dataset-citation/DatasetCitation.stories.tsx
+++ b/src/stories/dataset/dataset-citation/DatasetCitation.stories.tsx
@@ -1,9 +1,11 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { WithI18next } from '../../WithI18next'
 import { DatasetCitation } from '../../../sections/dataset/dataset-citation/DatasetCitation'
-import { DatasetPublishingStatus, DatasetVersion } from '../../../dataset/domain/models/Dataset'
 import { faker } from '@faker-js/faker'
-import { DatasetMother } from '../../../../tests/component/dataset/domain/models/DatasetMother'
+import {
+  DatasetMother,
+  DatasetVersionMother
+} from '../../../../tests/component/dataset/domain/models/DatasetMother'
 
 const meta: Meta<typeof DatasetCitation> = {
   title: 'Sections/Dataset Page/DatasetCitation',
@@ -16,16 +18,12 @@ type Story = StoryObj<typeof DatasetCitation>
 
 export const Default: Story = {
   render: () => {
-    const dataset = DatasetMother.createRealistic()
+    const version = DatasetVersionMother.createRealistic()
     return (
       <div>
         <br></br>
         <br></br>
-        <DatasetCitation
-          title={dataset.title}
-          citation={dataset.citation}
-          version={dataset.version}
-        />
+        <DatasetCitation version={version} />
       </div>
     )
   }
@@ -38,12 +36,7 @@ export const WithThumbnail: Story = {
       <div>
         <br></br>
         <br></br>
-        <DatasetCitation
-          title={dataset.title}
-          thumbnail={dataset.thumbnail}
-          citation={dataset.citation}
-          version={dataset.version}
-        />
+        <DatasetCitation thumbnail={dataset.thumbnail} version={dataset.version} />
       </div>
     )
   }
@@ -51,18 +44,7 @@ export const WithThumbnail: Story = {
 
 export const DraftVersion: Story = {
   render: () => {
-    const dataset = DatasetMother.createRealistic({
-      citation:
-        'Admin, Dataverse, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, DRAFT VERSION',
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.DRAFT,
-        true,
-        false,
-        DatasetPublishingStatus.DRAFT
-      )
-    })
-
+    const version = DatasetVersionMother.createDraft()
     /*
       Includes extra breaks, so you can see the DRAFT tooltip message
        */
@@ -70,11 +52,7 @@ export const DraftVersion: Story = {
       <div>
         <br></br>
         <br></br>
-        <DatasetCitation
-          title={dataset.title}
-          citation={dataset.citation}
-          version={dataset.version}
-        />
+        <DatasetCitation version={version} />
       </div>
     )
   }
@@ -82,19 +60,7 @@ export const DraftVersion: Story = {
 
 export const Deaccessioned: Story = {
   render: () => {
-    const dataset = DatasetMother.createRealistic({
-      citation:
-        'Admin, Dataverse, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1 DEACCESSIONED VERSION',
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.DEACCESSIONED,
-        true,
-        false,
-        DatasetPublishingStatus.DEACCESSIONED,
-        1,
-        0
-      )
-    })
+    const version = DatasetVersionMother.createDeaccessioned()
 
     /*
         Includes extra breaks, so you can see the DRAFT tooltip message
@@ -103,11 +69,7 @@ export const Deaccessioned: Story = {
       <div>
         <br></br>
         <br></br>
-        <DatasetCitation
-          title={dataset.title}
-          citation={dataset.citation}
-          version={dataset.version}
-        />
+        <DatasetCitation version={version} />
       </div>
     )
   }
@@ -115,10 +77,7 @@ export const Deaccessioned: Story = {
 
 export const Anonymized: Story = {
   render: () => {
-    const dataset = DatasetMother.createRealistic({
-      citation:
-        'Author name(s) withheld, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1'
-    })
+    const dataset = DatasetMother.createRealisticAnonymized()
 
     /*
         Includes extra breaks, so you can see the DRAFT tooltip message
@@ -127,11 +86,7 @@ export const Anonymized: Story = {
       <div>
         <br></br>
         <br></br>
-        <DatasetCitation
-          title={dataset.title}
-          citation={dataset.citation}
-          version={dataset.version}
-        />
+        <DatasetCitation version={dataset.version} />
       </div>
     )
   }
diff --git a/src/stories/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.stories.tsx
index 87836ad96..8083e507f 100644
--- a/src/stories/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.stories.tsx
@@ -4,7 +4,7 @@ import { WithI18next } from '../../../../../WithI18next'
 import { WithSettings } from '../../../../../WithSettings'
 import { WithLoggedInUser } from '../../../../../WithLoggedInUser'
 import { WithDatasetAllPermissionsGranted } from '../../../../WithDatasetAllPermissionsGranted'
-import { FileMother } from '../../../../../../../tests/component/files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../tests/component/files/domain/models/FilePreviewMother'
 import { DownloadFilesButton } from '../../../../../../sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton'
 
 const meta: Meta<typeof EditFilesMenu> = {
@@ -19,7 +19,7 @@ type Story = StoryObj<typeof EditFilesMenu>
 export const NonTabularFiles: Story = {
   render: () => (
     <DownloadFilesButton
-      files={FileMother.createMany(2, { tabularData: undefined })}
+      files={FilePreviewMother.createMany(2, { tabularData: undefined })}
       fileSelection={{}}
     />
   )
@@ -28,7 +28,7 @@ export const NonTabularFiles: Story = {
 export const TabularFiles: Story = {
   render: () => (
     <DownloadFilesButton
-      files={FileMother.createMany(2, {
+      files={FilePreviewMother.createMany(2, {
         tabularData: {
           variablesCount: 2,
           observationsCount: 3,
diff --git a/src/stories/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.stories.tsx
index 692bc1980..cec8c2889 100644
--- a/src/stories/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.stories.tsx
@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react'
 import { WithI18next } from '../../../../../WithI18next'
 import { WithSettings } from '../../../../../WithSettings'
-import { FileMother } from '../../../../../../../tests/component/files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../tests/component/files/domain/models/FilePreviewMother'
 import { EditFilesMenu } from '../../../../../../sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu'
 import { WithLoggedInUser } from '../../../../../WithLoggedInUser'
 import { WithDatasetAllPermissionsGranted } from '../../../../WithDatasetAllPermissionsGranted'
@@ -16,5 +16,5 @@ export default meta
 type Story = StoryObj<typeof EditFilesMenu>
 
 export const Default: Story = {
-  render: () => <EditFilesMenu files={FileMother.createMany(2)} fileSelection={{}} />
+  render: () => <EditFilesMenu files={FilePreviewMother.createMany(2)} fileSelection={{}} />
 }
diff --git a/src/stories/dataset/dataset-files/files-table/file-actions/file-action-buttons/access-file-menu/AccessFileMenu.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-actions/file-action-buttons/access-file-menu/AccessFileMenu.stories.tsx
index b016c7722..73bc899db 100644
--- a/src/stories/dataset/dataset-files/files-table/file-actions/file-action-buttons/access-file-menu/AccessFileMenu.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-actions/file-action-buttons/access-file-menu/AccessFileMenu.stories.tsx
@@ -3,7 +3,7 @@ import { AccessFileMenu } from '../../../../../../../sections/dataset/dataset-fi
 import { WithI18next } from '../../../../../../WithI18next'
 import { WithSettings } from '../../../../../../WithSettings'
 import { WithFilePermissionsGranted } from '../../../../../../files/file-permission/WithFilePermissionsGranted'
-import { FileMother } from '../../../../../../../../tests/component/files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../tests/component/files/domain/models/FilePreviewMother'
 
 const meta: Meta<typeof AccessFileMenu> = {
   title:
@@ -17,39 +17,41 @@ type Story = StoryObj<typeof AccessFileMenu>
 
 export const Default: Story = {
   decorators: [WithFilePermissionsGranted],
-  render: () => <AccessFileMenu file={FileMother.createDefault()} />
+  render: () => <AccessFileMenu file={FilePreviewMother.createDefault()} />
 }
 
 export const NonTabularFiles: Story = {
-  render: () => <AccessFileMenu file={FileMother.createDefault()} />
+  render: () => <AccessFileMenu file={FilePreviewMother.createDefault()} />
 }
 
 export const TabularFiles: Story = {
-  render: () => <AccessFileMenu file={FileMother.createTabular()} />
+  render: () => <AccessFileMenu file={FilePreviewMother.createTabular()} />
 }
 
 export const Restricted: Story = {
-  render: () => <AccessFileMenu file={FileMother.createWithRestrictedAccess()} />
+  render: () => <AccessFileMenu file={FilePreviewMother.createWithRestrictedAccess()} />
 }
 
 export const RestrictedWithAccessRequestAllowed: Story = {
-  render: () => <AccessFileMenu file={FileMother.createWithAccessRequestAllowed()} />
+  render: () => <AccessFileMenu file={FilePreviewMother.createWithAccessRequestAllowed()} />
 }
 
 export const RestrictedWithAccessRequestPending: Story = {
-  render: () => <AccessFileMenu file={FileMother.createWithAccessRequestPending()} />
+  render: () => <AccessFileMenu file={FilePreviewMother.createWithAccessRequestPending()} />
 }
 
 export const RestrictedWithAccessGranted: Story = {
   decorators: [WithFilePermissionsGranted],
-  render: () => <AccessFileMenu file={FileMother.createWithRestrictedAccessWithAccessGranted()} />
+  render: () => (
+    <AccessFileMenu file={FilePreviewMother.createWithRestrictedAccessWithAccessGranted()} />
+  )
 }
 
 export const WithEmbargo: Story = {
   decorators: [WithFilePermissionsGranted],
-  render: () => <AccessFileMenu file={FileMother.createWithEmbargo()} />
+  render: () => <AccessFileMenu file={FilePreviewMother.createWithEmbargo()} />
 }
 
 export const WithEmbargoAndRestricted: Story = {
-  render: () => <AccessFileMenu file={FileMother.createWithEmbargoRestricted()} />
+  render: () => <AccessFileMenu file={FilePreviewMother.createWithEmbargoRestricted()} />
 }
diff --git a/src/stories/dataset/dataset-files/files-table/file-actions/file-action-buttons/file-options-menu/FileOptionsMenu.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-actions/file-action-buttons/file-options-menu/FileOptionsMenu.stories.tsx
index 8c99a7846..9ab9cbe0d 100644
--- a/src/stories/dataset/dataset-files/files-table/file-actions/file-action-buttons/file-options-menu/FileOptionsMenu.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-actions/file-action-buttons/file-options-menu/FileOptionsMenu.stories.tsx
@@ -3,7 +3,7 @@ import { FileOptionsMenu } from '../../../../../../../sections/dataset/dataset-f
 import { WithI18next } from '../../../../../../WithI18next'
 import { WithSettings } from '../../../../../../WithSettings'
 import { WithLoggedInUser } from '../../../../../../WithLoggedInUser'
-import { FileMother } from '../../../../../../../../tests/component/files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../tests/component/files/domain/models/FilePreviewMother'
 import { WithDatasetAllPermissionsGranted } from '../../../../../WithDatasetAllPermissionsGranted'
 import { WithDatasetLockedFromEdits } from '../../../../../WithDatasetLockedFromEdits'
 
@@ -19,22 +19,22 @@ type Story = StoryObj<typeof FileOptionsMenu>
 
 export const DefaultWithLoggedInUser: Story = {
   decorators: [WithDatasetAllPermissionsGranted],
-  render: () => <FileOptionsMenu file={FileMother.createDefault()} />
+  render: () => <FileOptionsMenu file={FilePreviewMother.createDefault()} />
 }
 
 export const Restricted: Story = {
   decorators: [WithDatasetAllPermissionsGranted],
-  render: () => <FileOptionsMenu file={FileMother.createWithRestrictedAccess()} />
+  render: () => <FileOptionsMenu file={FilePreviewMother.createWithRestrictedAccess()} />
 }
 
 export const WithDatasetLocked: Story = {
   decorators: [WithDatasetLockedFromEdits],
-  render: () => <FileOptionsMenu file={FileMother.createDefault()} />
+  render: () => <FileOptionsMenu file={FilePreviewMother.createDefault()} />
 }
 
 export const WithFileAlreadyDeleted: Story = {
   decorators: [WithDatasetAllPermissionsGranted],
-  render: () => <FileOptionsMenu file={FileMother.createDeleted()} />
+  render: () => <FileOptionsMenu file={FilePreviewMother.createDeleted()} />
 }
 
 //
diff --git a/src/stories/dataset/dataset-files/files-table/file-actions/file-info-messages/FileInfoMessages.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-actions/file-info-messages/FileInfoMessages.stories.tsx
index 7d4e4418a..9bb9f376d 100644
--- a/src/stories/dataset/dataset-files/files-table/file-actions/file-info-messages/FileInfoMessages.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-actions/file-info-messages/FileInfoMessages.stories.tsx
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from '@storybook/react'
 import { WithI18next } from '../../../../../WithI18next'
 import { WithSettings } from '../../../../../WithSettings'
 import { FileInfoMessages } from '../../../../../../sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages'
-import { FileMother } from '../../../../../../../tests/component/files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../tests/component/files/domain/models/FilePreviewMother'
 import { WithDatasetAllPermissionsGranted } from '../../../../WithDatasetAllPermissionsGranted'
 
 const meta: Meta<typeof FileInfoMessages> = {
@@ -16,13 +16,13 @@ export default meta
 type Story = StoryObj<typeof FileInfoMessages>
 
 export const IngestInProgress: Story = {
-  render: () => <FileInfoMessages file={FileMother.createIngestInProgress()} />
+  render: () => <FileInfoMessages file={FilePreviewMother.createIngestInProgress()} />
 }
 
 export const IngestProblemDefaultReportMessage: Story = {
   render: () => (
     <div style={{ height: 300, alignItems: 'center', display: 'flex' }}>
-      <FileInfoMessages file={FileMother.createIngestProblem()} />
+      <FileInfoMessages file={FilePreviewMother.createIngestProblem()} />
     </div>
   )
 }
@@ -31,12 +31,12 @@ export const IngestProblemCustomReportMessage: Story = {
   render: () => (
     <div style={{ height: 300, alignItems: 'center', display: 'flex' }}>
       <FileInfoMessages
-        file={FileMother.createIngestProblem('The header contains a duplicate name.')}
+        file={FilePreviewMother.createIngestProblem('The header contains a duplicate name.')}
       />
     </div>
   )
 }
 
 export const AccessRequested: Story = {
-  render: () => <FileInfoMessages file={FileMother.createWithAccessRequestPending()} />
+  render: () => <FileInfoMessages file={FilePreviewMother.createWithAccessRequestPending()} />
 }
diff --git a/src/stories/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.stories.tsx
index 7cd2f550d..b992e8c0f 100644
--- a/src/stories/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.stories.tsx
@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react'
 import { WithI18next } from '../../../../../WithI18next'
 import { FileInfoCell } from '../../../../../../sections/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell'
-import { FileMother } from '../../../../../../../tests/component/files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../tests/component/files/domain/models/FilePreviewMother'
 
 const meta: Meta<typeof FileInfoCell> = {
   title: 'Sections/Dataset Page/DatasetFiles/FilesTable/FileInfoCell',
@@ -13,29 +13,29 @@ export default meta
 type Story = StoryObj<typeof FileInfoCell>
 
 export const Default: Story = {
-  render: () => <FileInfoCell file={FileMother.createDefault()} />
+  render: () => <FileInfoCell file={FilePreviewMother.createDefault()} />
 }
 
 export const WithLabels: Story = {
-  render: () => <FileInfoCell file={FileMother.createWithLabels()} />
+  render: () => <FileInfoCell file={FilePreviewMother.createWithLabels()} />
 }
 
 export const WithDirectory: Story = {
-  render: () => <FileInfoCell file={FileMother.createWithDirectory()} />
+  render: () => <FileInfoCell file={FilePreviewMother.createWithDirectory()} />
 }
 
 export const WithEmbargo: Story = {
-  render: () => <FileInfoCell file={FileMother.createWithEmbargo()} />
+  render: () => <FileInfoCell file={FilePreviewMother.createWithEmbargo()} />
 }
 
 export const WithTabularData: Story = {
-  render: () => <FileInfoCell file={FileMother.createTabular()} />
+  render: () => <FileInfoCell file={FilePreviewMother.createTabular()} />
 }
 
 export const WithDescription: Story = {
-  render: () => <FileInfoCell file={FileMother.createWithDescription()} />
+  render: () => <FileInfoCell file={FilePreviewMother.createWithDescription()} />
 }
 
 export const WithChecksum: Story = {
-  render: () => <FileInfoCell file={FileMother.createWithChecksum()} />
+  render: () => <FileInfoCell file={FilePreviewMother.createWithChecksum()} />
 }
diff --git a/src/stories/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.stories.tsx
index fdecf889a..a77f0de4a 100644
--- a/src/stories/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.stories.tsx
@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react'
 import { FileThumbnail } from '../../../../../../../../sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail'
 import { WithI18next } from '../../../../../../../WithI18next'
-import { FileMother } from '../../../../../../../../../tests/component/files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../../tests/component/files/domain/models/FilePreviewMother'
 import { WithFilePermissionsGranted } from '../../../../../../../files/file-permission/WithFilePermissionsGranted'
 
 const meta: Meta<typeof FileThumbnail> = {
@@ -16,7 +16,7 @@ type Story = StoryObj<typeof FileThumbnail>
 export const WithIcon: Story = {
   decorators: [WithFilePermissionsGranted],
   render: () => {
-    const file = FileMother.createDefault()
+    const file = FilePreviewMother.createDefault()
     return <FileThumbnail file={file} />
   }
 }
@@ -24,14 +24,14 @@ export const WithIcon: Story = {
 export const WithThumbnailPreview: Story = {
   decorators: [WithFilePermissionsGranted],
   render: () => {
-    const file = FileMother.createWithThumbnail()
+    const file = FilePreviewMother.createWithThumbnail()
     return <FileThumbnail file={file} />
   }
 }
 
 export const WithThumbnailRestrictedLockedIcon: Story = {
   render: () => {
-    const file = FileMother.createWithRestrictedAccess()
+    const file = FilePreviewMother.createWithRestrictedAccess()
     return <FileThumbnail file={file} />
   }
 }
@@ -39,7 +39,7 @@ export const WithThumbnailRestrictedLockedIcon: Story = {
 export const WithThumbnailRestrictedUnlockedIcon: Story = {
   decorators: [WithFilePermissionsGranted],
   render: () => {
-    const file = FileMother.createWithRestrictedAccessWithAccessGranted()
+    const file = FilePreviewMother.createWithRestrictedAccessWithAccessGranted()
     return <FileThumbnail file={file} />
   }
 }
@@ -47,7 +47,7 @@ export const WithThumbnailRestrictedUnlockedIcon: Story = {
 export const WithThumbnailPreviewRestrictedUnlockedIcon: Story = {
   decorators: [WithFilePermissionsGranted],
   render: () => {
-    const file = FileMother.createWithThumbnailRestrictedWithAccessGranted()
+    const file = FilePreviewMother.createWithThumbnailRestrictedWithAccessGranted()
     return <FileThumbnail file={file} />
   }
 }
diff --git a/src/stories/files/File.stories.tsx b/src/stories/files/File.stories.tsx
new file mode 100644
index 000000000..1f72a8c7d
--- /dev/null
+++ b/src/stories/files/File.stories.tsx
@@ -0,0 +1,42 @@
+import { Meta, StoryObj } from '@storybook/react'
+import { WithI18next } from '../WithI18next'
+import { FileMockRepository } from './FileMockRepository'
+import { File } from '../../sections/file/File'
+import { WithLayout } from '../WithLayout'
+import { FileMockLoadingRepository } from './FileMockLoadingRepository'
+import { FileMockNoDataRepository } from './FileMockNoDataRepository'
+import { FileMother } from '../../../tests/component/files/domain/models/FileMother'
+
+const meta: Meta<typeof File> = {
+  title: 'Pages/File',
+  component: File,
+  decorators: [WithI18next, WithLayout]
+}
+
+export default meta
+type Story = StoryObj<typeof File>
+
+export const Default: Story = {
+  render: () => <File repository={new FileMockRepository()} id={56} />
+}
+
+export const Restricted: Story = {
+  render: () => <File repository={new FileMockRepository(FileMother.createRestricted())} id={56} />
+}
+
+export const RestrictedWithAccessGranted: Story = {
+  render: () => (
+    <File
+      repository={new FileMockRepository(FileMother.createRestrictedWithAccessGranted())}
+      id={56}
+    />
+  )
+}
+
+export const Loading: Story = {
+  render: () => <File repository={new FileMockLoadingRepository()} id={56} />
+}
+
+export const FileNotFound: Story = {
+  render: () => <File repository={new FileMockNoDataRepository()} id={56} />
+}
diff --git a/src/stories/files/FileMockData.ts b/src/stories/files/FileMockData.ts
index 183b5b2e9..366ab78cb 100644
--- a/src/stories/files/FileMockData.ts
+++ b/src/stories/files/FileMockData.ts
@@ -1,5 +1,5 @@
-import { File, FileSize, FileSizeUnit } from '../../files/domain/models/File'
-import { FileMother } from '../../../tests/component/files/domain/models/FileMother'
+import { FilePreview, FileSize, FileSizeUnit } from '../../files/domain/models/FilePreview'
+import { FilePreviewMother } from '../../../tests/component/files/domain/models/FilePreviewMother'
 import { FilePaginationInfo } from '../../files/domain/models/FilePaginationInfo'
 
 const range = (len: number) => {
@@ -10,9 +10,9 @@ const range = (len: number) => {
   return arr
 }
 
-export function makeFiles(paginationInfo: FilePaginationInfo): File[] {
+export function makeFiles(paginationInfo: FilePaginationInfo): FilePreview[] {
   return range(paginationInfo.pageSize).map((value, index) => {
-    return FileMother.create({
+    return FilePreviewMother.create({
       id: (paginationInfo.page - 1) * paginationInfo.pageSize + index,
       size: new FileSize(
         (paginationInfo.page - 1) * paginationInfo.pageSize + index,
@@ -24,4 +24,4 @@ export function makeFiles(paginationInfo: FilePaginationInfo): File[] {
 
 export const FilesMockData = (
   paginationInfo: FilePaginationInfo = new FilePaginationInfo()
-): File[] => makeFiles(paginationInfo)
+): FilePreview[] => makeFiles(paginationInfo)
diff --git a/src/stories/files/FileMockLoadingRepository.ts b/src/stories/files/FileMockLoadingRepository.ts
index 949ad992c..b57bd0305 100644
--- a/src/stories/files/FileMockLoadingRepository.ts
+++ b/src/stories/files/FileMockLoadingRepository.ts
@@ -1,9 +1,10 @@
 import { FileRepository } from '../../files/domain/repositories/FileRepository'
-import { File } from '../../files/domain/models/File'
+import { FilePreview } from '../../files/domain/models/FilePreview'
 import { FilesCountInfo } from '../../files/domain/models/FilesCountInfo'
-import { DatasetVersion } from '../../dataset/domain/models/Dataset'
+import { DatasetVersion, DatasetVersionNumber } from '../../dataset/domain/models/Dataset'
 import { FileCriteria } from '../../files/domain/models/FileCriteria'
 import { FileMockRepository } from './FileMockRepository'
+import { File } from '../../files/domain/models/File'
 
 export class FileMockLoadingRepository extends FileMockRepository implements FileRepository {
   getAllByDatasetPersistentId(
@@ -11,7 +12,7 @@ export class FileMockLoadingRepository extends FileMockRepository implements Fil
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetVersion: DatasetVersion
-  ): Promise<File[]> {
+  ): Promise<FilePreview[]> {
     return new Promise(() => {
       setTimeout(() => {
         // Do nothing
@@ -23,7 +24,7 @@ export class FileMockLoadingRepository extends FileMockRepository implements Fil
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
-    datasetVersion: DatasetVersion,
+    datasetVersionNumber: DatasetVersionNumber,
     // eslint-disable-next-line unused-imports/no-unused-vars
     criteria?: FileCriteria
   ): Promise<FilesCountInfo> {
@@ -33,4 +34,13 @@ export class FileMockLoadingRepository extends FileMockRepository implements Fil
       }, 1000)
     })
   }
+
+  // eslint-disable-next-line unused-imports/no-unused-vars
+  getById(id: number): Promise<File> {
+    return new Promise(() => {
+      setTimeout(() => {
+        // Do nothing
+      }, 1000)
+    })
+  }
 }
diff --git a/src/stories/files/FileMockNoDataRepository.ts b/src/stories/files/FileMockNoDataRepository.ts
index 51813c757..bfd993666 100644
--- a/src/stories/files/FileMockNoDataRepository.ts
+++ b/src/stories/files/FileMockNoDataRepository.ts
@@ -1,10 +1,11 @@
 import { FileRepository } from '../../files/domain/repositories/FileRepository'
-import { File } from '../../files/domain/models/File'
+import { FilePreview } from '../../files/domain/models/FilePreview'
 import { FilesCountInfo } from '../../files/domain/models/FilesCountInfo'
 import { FilesCountInfoMother } from '../../../tests/component/files/domain/models/FilesCountInfoMother'
-import { DatasetVersion } from '../../dataset/domain/models/Dataset'
+import { DatasetVersion, DatasetVersionNumber } from '../../dataset/domain/models/Dataset'
 import { FileCriteria } from '../../files/domain/models/FileCriteria'
 import { FileMockRepository } from './FileMockRepository'
+import { File } from '../../files/domain/models/File'
 
 export class FileMockNoDataRepository extends FileMockRepository implements FileRepository {
   getAllByDatasetPersistentId(
@@ -12,7 +13,7 @@ export class FileMockNoDataRepository extends FileMockRepository implements File
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetVersion: DatasetVersion
-  ): Promise<File[]> {
+  ): Promise<FilePreview[]> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve([])
@@ -24,7 +25,7 @@ export class FileMockNoDataRepository extends FileMockRepository implements File
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
-    datasetVersion: DatasetVersion
+    datasetVersionNumber: DatasetVersionNumber
   ): Promise<FilesCountInfo> {
     return new Promise((resolve) => {
       setTimeout(() => {
@@ -37,7 +38,7 @@ export class FileMockNoDataRepository extends FileMockRepository implements File
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
-    datasetVersion: DatasetVersion,
+    datasetVersionNumber: DatasetVersionNumber,
     // eslint-disable-next-line unused-imports/no-unused-vars
     criteria?: FileCriteria
   ): Promise<number> {
@@ -47,4 +48,13 @@ export class FileMockNoDataRepository extends FileMockRepository implements File
       }, 1000)
     })
   }
+
+  // eslint-disable-next-line unused-imports/no-unused-vars
+  getById(id: number): Promise<File | undefined> {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(undefined)
+      }, 1000)
+    })
+  }
 }
diff --git a/src/stories/files/FileMockNoFiltersRepository.ts b/src/stories/files/FileMockNoFiltersRepository.ts
index 2ce08e666..845aa45d8 100644
--- a/src/stories/files/FileMockNoFiltersRepository.ts
+++ b/src/stories/files/FileMockNoFiltersRepository.ts
@@ -1,9 +1,9 @@
 import { FileRepository } from '../../files/domain/repositories/FileRepository'
-import { File } from '../../files/domain/models/File'
+import { FilePreview } from '../../files/domain/models/FilePreview'
 import { FilesCountInfo } from '../../files/domain/models/FilesCountInfo'
 import { FilesCountInfoMother } from '../../../tests/component/files/domain/models/FilesCountInfoMother'
 import { FilesMockData } from './FileMockData'
-import { DatasetVersion } from '../../dataset/domain/models/Dataset'
+import { DatasetVersion, DatasetVersionNumber } from '../../dataset/domain/models/Dataset'
 import { FileCriteria } from '../../files/domain/models/FileCriteria'
 import { FileMockRepository } from './FileMockRepository'
 
@@ -13,7 +13,7 @@ export class FileMockNoFiltersRepository extends FileMockRepository implements F
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetVersion: DatasetVersion
-  ): Promise<File[]> {
+  ): Promise<FilePreview[]> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(FilesMockData())
@@ -25,7 +25,7 @@ export class FileMockNoFiltersRepository extends FileMockRepository implements F
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
-    datasetVersion: DatasetVersion,
+    datasetVersionNumber: DatasetVersionNumber,
     // eslint-disable-next-line unused-imports/no-unused-vars
     criteria?: FileCriteria
   ): Promise<FilesCountInfo> {
diff --git a/src/stories/files/FileMockRepository.ts b/src/stories/files/FileMockRepository.ts
index 020d15199..73a089ccd 100644
--- a/src/stories/files/FileMockRepository.ts
+++ b/src/stories/files/FileMockRepository.ts
@@ -1,22 +1,26 @@
 import { FileRepository } from '../../files/domain/repositories/FileRepository'
 import { FilesMockData } from './FileMockData'
-import { File, FileDownloadMode } from '../../files/domain/models/File'
+import { FilePreview, FileDownloadMode } from '../../files/domain/models/FilePreview'
 import { FilesCountInfo } from '../../files/domain/models/FilesCountInfo'
 import { FilesCountInfoMother } from '../../../tests/component/files/domain/models/FilesCountInfoMother'
 import { FileUserPermissionsMother } from '../../../tests/component/files/domain/models/FileUserPermissionsMother'
 import { FileUserPermissions } from '../../files/domain/models/FileUserPermissions'
-import { DatasetVersion } from '../../dataset/domain/models/Dataset'
+import { DatasetVersion, DatasetVersionNumber } from '../../dataset/domain/models/Dataset'
 import { FileCriteria } from '../../files/domain/models/FileCriteria'
+import { FilePreviewMother } from '../../../tests/component/files/domain/models/FilePreviewMother'
 import { FilePaginationInfo } from '../../files/domain/models/FilePaginationInfo'
 import { FileMother } from '../../../tests/component/files/domain/models/FileMother'
+import { File } from '../../files/domain/models/File'
 
 export class FileMockRepository implements FileRepository {
+  constructor(public readonly fileMock?: File) {}
+
   // eslint-disable-next-line unused-imports/no-unused-vars
   getAllByDatasetPersistentId(
     datasetPersistentId: string,
     datasetVersion: DatasetVersion,
     paginationInfo?: FilePaginationInfo
-  ): Promise<File[]> {
+  ): Promise<FilePreview[]> {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(FilesMockData(paginationInfo))
@@ -28,7 +32,7 @@ export class FileMockRepository implements FileRepository {
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
-    datasetVersion: DatasetVersion
+    datasetVersionNumber: DatasetVersionNumber
   ): Promise<FilesCountInfo> {
     return new Promise((resolve) => {
       setTimeout(() => {
@@ -41,7 +45,7 @@ export class FileMockRepository implements FileRepository {
     // eslint-disable-next-line unused-imports/no-unused-vars
     datasetPersistentId: string,
     // eslint-disable-next-line unused-imports/no-unused-vars
-    datasetVersion: DatasetVersion,
+    datasetVersionNumber: DatasetVersionNumber,
     // eslint-disable-next-line unused-imports/no-unused-vars
     criteria?: FileCriteria
   ): Promise<number> {
@@ -61,13 +65,22 @@ export class FileMockRepository implements FileRepository {
     })
   }
 
+  // eslint-disable-next-line unused-imports/no-unused-vars
+  getById(id: number): Promise<File | undefined> {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(this.fileMock ?? FileMother.createRealistic())
+      }, 1000)
+    })
+  }
+
   // eslint-disable-next-line unused-imports/no-unused-vars
   getMultipleFileDownloadUrl(ids: number[], downloadMode: FileDownloadMode): string {
-    return FileMother.createDownloadUrl()
+    return FilePreviewMother.createDownloadUrl()
   }
 
   // eslint-disable-next-line unused-imports/no-unused-vars
   getFileDownloadUrl(id: number, downloadMode: FileDownloadMode): string {
-    return FileMother.createDownloadUrl()
+    return FilePreviewMother.createDownloadUrl()
   }
 }
diff --git a/tests/component/dataset/domain/models/DatasetMother.ts b/tests/component/dataset/domain/models/DatasetMother.ts
index e20b2c496..64bd805d7 100644
--- a/tests/component/dataset/domain/models/DatasetMother.ts
+++ b/tests/component/dataset/domain/models/DatasetMother.ts
@@ -12,72 +12,121 @@ import {
   DatasetPermissions,
   DatasetPublishingStatus,
   DatasetVersion,
+  DatasetVersionNumber,
   MetadataBlockName
 } from '../../../../../src/dataset/domain/models/Dataset'
 import {
   FileDownloadMode,
   FileDownloadSize,
   FileSizeUnit
-} from '../../../../../src/files/domain/models/File'
+} from '../../../../../src/files/domain/models/FilePreview'
 
 export class DatasetVersionMother {
   static create(props?: Partial<DatasetVersion>): DatasetVersion {
-    return new DatasetVersion(
+    return new DatasetVersion.Builder(
       props?.id ?? faker.datatype.number(),
+      props?.title ?? faker.lorem.sentence(),
+      props?.number ?? new DatasetVersionNumber(1, 0),
       props?.publishingStatus ?? DatasetPublishingStatus.RELEASED,
+      props?.citation ??
+        'Admin, Dataverse, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1',
       props?.isLatest ?? false,
       props?.isInReview ?? false,
-      props?.latestVersionStatus ?? DatasetPublishingStatus.RELEASED,
-      props?.majorNumber ?? 1,
-      props?.minorNumber ?? 0
+      props?.latestVersionPublishingStatus ?? DatasetPublishingStatus.RELEASED,
+      props?.someDatasetVersionHasBeenReleased ?? faker.datatype.boolean()
     )
   }
 
-  static createReleased(): DatasetVersion {
-    return this.create({ publishingStatus: DatasetPublishingStatus.RELEASED })
+  static createDeaccessioned(props?: Partial<DatasetVersion>): DatasetVersion {
+    return this.create({
+      publishingStatus: DatasetPublishingStatus.DEACCESSIONED,
+      isLatest: false,
+      citation:
+        'Admin, Dataverse, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1 DEACCESSIONED VERSION',
+      someDatasetVersionHasBeenReleased: true,
+      ...props
+    })
   }
 
-  static createDeaccessioned(): DatasetVersion {
-    return this.create({ publishingStatus: DatasetPublishingStatus.DEACCESSIONED })
+  static createDraft(props?: Partial<DatasetVersion>): DatasetVersion {
+    return this.create({
+      publishingStatus: DatasetPublishingStatus.DRAFT,
+      isLatest: false,
+      number: new DatasetVersionNumber(undefined, undefined),
+      citation:
+        'Admin, Dataverse, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, DRAFT VERSION',
+      ...props
+    })
   }
 
-  static createDraftAsLatestVersion(): DatasetVersion {
-    return this.create({ publishingStatus: DatasetPublishingStatus.DRAFT, isLatest: true })
+  static createDraftAsLatestVersion(props?: Partial<DatasetVersion>): DatasetVersion {
+    return this.createDraft({
+      latestVersionPublishingStatus: DatasetPublishingStatus.DRAFT,
+      isLatest: true,
+      ...props
+    })
   }
 
-  static createDraft(): DatasetVersion {
-    return this.create({ publishingStatus: DatasetPublishingStatus.DRAFT })
+  static createDraftAsLatestVersionWithSomeVersionHasBeenReleased(): DatasetVersion {
+    return this.createDraftAsLatestVersion({
+      someDatasetVersionHasBeenReleased: true
+    })
   }
 
   static createDraftAsLatestVersionInReview(): DatasetVersion {
-    return this.create({
-      publishingStatus: DatasetPublishingStatus.DRAFT,
-      isLatest: true,
+    return this.createDraftAsLatestVersion({
       isInReview: true
     })
   }
 
-  static createReleasedWithLatestVersionIsADraft(): DatasetVersion {
+  static createDraftWithLatestVersionIsReleased(): DatasetVersion {
+    return this.createDraft({
+      latestVersionPublishingStatus: DatasetPublishingStatus.RELEASED,
+      someDatasetVersionHasBeenReleased: true
+    })
+  }
+
+  static createNotReleased(): DatasetVersion {
+    return this.createDraft({
+      someDatasetVersionHasBeenReleased: false,
+      latestVersionPublishingStatus: DatasetPublishingStatus.DRAFT
+    })
+  }
+
+  static createReleased(props?: Partial<DatasetVersion>): DatasetVersion {
     return this.create({
       publishingStatus: DatasetPublishingStatus.RELEASED,
-      isLatest: true,
-      latestVersionStatus: DatasetPublishingStatus.DRAFT
+      someDatasetVersionHasBeenReleased: true,
+      isLatest: false,
+      ...props
     })
   }
 
-  static createDraftWithLatestVersionIsADraft(): DatasetVersion {
-    return this.create({
-      publishingStatus: DatasetPublishingStatus.DRAFT,
-      isLatest: true,
-      latestVersionStatus: DatasetPublishingStatus.DRAFT
+  static createReleasedWithLatestVersionIsADraft(): DatasetVersion {
+    return this.createReleased({
+      latestVersionPublishingStatus: DatasetPublishingStatus.DRAFT
     })
   }
 
-  static createWithLatestVersionIsNotADraft(): DatasetVersion {
+  static createRealistic(props?: Partial<DatasetVersion>): DatasetVersion {
     return this.create({
-      publishingStatus: DatasetPublishingStatus.DRAFT,
+      id: 1,
+      title: 'Dataset Title',
+      publishingStatus: DatasetPublishingStatus.RELEASED,
       isLatest: true,
-      latestVersionStatus: DatasetPublishingStatus.RELEASED
+      isInReview: false,
+      latestVersionPublishingStatus: DatasetPublishingStatus.RELEASED,
+      citation:
+        'Bennet, Elizabeth; Darcy, Fitzwilliam, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1',
+      number: new DatasetVersionNumber(1, 0),
+      someDatasetVersionHasBeenReleased: true,
+      ...props
+    })
+  }
+
+  static createAnonymized(): DatasetVersion {
+    return this.createRealistic({
+      citation: `Author name(s) withheld, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1`
     })
   }
 }
@@ -282,10 +331,7 @@ export class DatasetMother {
   static create(props?: Partial<Dataset>): Dataset {
     const dataset = {
       persistentId: faker.datatype.uuid(),
-      title: faker.lorem.sentence(),
       version: DatasetVersionMother.create(),
-      citation:
-        'Bennet, Elizabeth; Darcy, Fitzwilliam, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1',
       license: {
         name: 'CC0 1.0',
         uri: 'https://creativecommons.org/publicdomain/zero/1.0/',
@@ -359,18 +405,17 @@ export class DatasetMother {
       hasValidTermsOfAccess: faker.datatype.boolean(),
       hasOneTabularFileAtLeast: faker.datatype.boolean(),
       isValid: faker.datatype.boolean(),
-      isReleased: faker.datatype.boolean(),
       downloadUrls: DatasetDownloadUrlsMother.create(),
       thumbnail: undefined,
       privateUrl: undefined,
       fileDownloadSizes: [],
+      requestedVersion: undefined,
       ...props
     }
 
     return new Dataset.Builder(
       dataset.persistentId,
       dataset.version,
-      dataset.citation,
       dataset.summaryFields,
       dataset.license,
       dataset.metadataBlocks,
@@ -379,18 +424,17 @@ export class DatasetMother {
       dataset.hasValidTermsOfAccess,
       dataset.hasOneTabularFileAtLeast,
       dataset.isValid,
-      dataset.isReleased,
       dataset.downloadUrls,
       dataset.fileDownloadSizes,
       dataset.thumbnail,
-      dataset.privateUrl
+      dataset.privateUrl,
+      dataset.requestedVersion
     ).build()
   }
 
   static createAnonymized(): Dataset {
     return this.create({
-      citation:
-        'Author name(s) withheld, 2023, "citation", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1',
+      version: DatasetVersionMother.createAnonymized(),
       metadataBlocks: [
         {
           name: MetadataBlockName.CITATION,
@@ -420,20 +464,7 @@ export class DatasetMother {
   static createRealistic(props?: Partial<Dataset>): Dataset {
     return this.create({
       persistentId: 'doi:10.5072/FK2/ABC123',
-      citation: `Bennet, Elizabeth; Darcy, Fitzwilliam, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1`,
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.RELEASED,
-        false,
-        false,
-        DatasetPublishingStatus.RELEASED,
-        1,
-        0
-      ),
-      labels: [
-        { value: 'Version 1.0', semanticMeaning: DatasetLabelSemanticMeaning.FILE },
-        { value: DatasetLabelValue.DRAFT, semanticMeaning: DatasetLabelSemanticMeaning.DATASET }
-      ],
+      version: DatasetVersionMother.createRealistic(),
       license: {
         name: 'CC0 1.0',
         uri: 'https://creativecommons.org/publicdomain/zero/1.0/',
@@ -513,7 +544,6 @@ export class DatasetMother {
         canDeleteDataset: false
       },
       locks: [],
-      isReleased: true,
       hasValidTermsOfAccess: true,
       hasOneTabularFileAtLeast: true,
       fileDownloadSizes: [
@@ -527,7 +557,7 @@ export class DatasetMother {
 
   static createRealisticAnonymized(): Dataset {
     return this.createRealistic({
-      citation: `Author name(s) withheld, 2023, "Dataset Title", <a href="https://doi.org/10.5072/FK2/BUDNRV" target="_blank">https://doi.org/10.5072/FK2/BUDNRV</a>, Root, V1`,
+      version: DatasetVersionMother.createAnonymized(),
       metadataBlocks: [
         {
           name: MetadataBlockName.CITATION,
diff --git a/tests/component/dataset/domain/models/DatasetPreviewMother.ts b/tests/component/dataset/domain/models/DatasetPreviewMother.ts
index fe73c75d6..f46387170 100644
--- a/tests/component/dataset/domain/models/DatasetPreviewMother.ts
+++ b/tests/component/dataset/domain/models/DatasetPreviewMother.ts
@@ -1,6 +1,6 @@
 import { faker } from '@faker-js/faker'
 import { DatasetPreview } from '../../../../../src/dataset/domain/models/DatasetPreview'
-import { DatasetCitationMother, DatasetLabelsMother, DatasetVersionMother } from './DatasetMother'
+import { DatasetVersionMother } from './DatasetMother'
 
 export class DatasetPreviewMother {
   static createMany(count: number): DatasetPreview[] {
@@ -14,25 +14,16 @@ export class DatasetPreviewMother {
   static create(props?: Partial<DatasetPreview>): DatasetPreview {
     const datasetPreview = {
       persistentId: faker.datatype.uuid(),
-      title: faker.lorem.sentence(),
-      labels: DatasetLabelsMother.create(),
-      isReleased: faker.datatype.boolean(),
-      isDeaccessioned: faker.datatype.boolean(),
-      thumbnail: faker.datatype.boolean() ? faker.image.imageUrl() : undefined,
-      releaseOrCreateDate: faker.date.past(),
       version: DatasetVersionMother.create(),
-      citation: DatasetCitationMother.create(),
+      releaseOrCreateDate: faker.date.past(),
       description: faker.lorem.paragraph(),
+      thumbnail: faker.datatype.boolean() ? faker.image.imageUrl() : undefined,
       ...props
     }
 
     return new DatasetPreview(
       datasetPreview.persistentId,
-      datasetPreview.title,
       datasetPreview.version,
-      datasetPreview.isReleased,
-      datasetPreview.citation,
-      datasetPreview.isDeaccessioned,
       datasetPreview.releaseOrCreateDate,
       datasetPreview.description,
       datasetPreview.thumbnail
@@ -45,25 +36,21 @@ export class DatasetPreviewMother {
 
   static createDraft(): DatasetPreview {
     return this.create({
-      isDeaccessioned: false,
-      labels: DatasetLabelsMother.createDraft(),
-      citation: DatasetCitationMother.createDraft()
+      version: DatasetVersionMother.createDraft()
     })
   }
 
   static createWithThumbnail(): DatasetPreview {
-    return this.create({ thumbnail: faker.image.imageUrl(), isDeaccessioned: false })
+    return this.create({ thumbnail: faker.image.imageUrl() })
   }
 
   static createWithNoThumbnail(): DatasetPreview {
-    return this.create({ thumbnail: undefined, isDeaccessioned: false })
+    return this.create({ thumbnail: undefined })
   }
 
   static createDeaccessioned(): DatasetPreview {
     return this.create({
-      isDeaccessioned: true,
-      labels: DatasetLabelsMother.createDeaccessioned(),
-      citation: DatasetCitationMother.createDeaccessioned()
+      version: DatasetVersionMother.createDeaccessioned()
     })
   }
 }
diff --git a/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts b/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts
index cfee61e23..6a0da652e 100644
--- a/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts
+++ b/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts
@@ -15,7 +15,7 @@ import {
   FileDownloadMode,
   FileDownloadSize,
   FileSizeUnit
-} from '../../../../../src/files/domain/models/File'
+} from '../../../../../src/files/domain/models/FilePreview'
 
 chai.use(chaiAsPromised)
 const expect = chai.expect
@@ -81,20 +81,24 @@ const expectedDataset = {
   persistentId: 'doi:10.5072/FK2/B4B2MJ',
   version: {
     id: 101,
+    title: "Darwin's Finches",
+    labels: [
+      { semanticMeaning: 'dataset', value: 'Draft' },
+      { semanticMeaning: 'warning', value: 'Unpublished' }
+    ],
     publishingStatus: 'draft',
     isLatest: true,
     isInReview: false,
-    latestVersionStatus: 'draft',
-    majorNumber: 0,
-    minorNumber: 0,
-    requestedVersion: undefined
+    latestVersionPublishingStatus: 'draft',
+    number: {
+      minorNumber: 0,
+      majorNumber: 0
+    },
+    someDatasetVersionHasBeenReleased: false,
+    citation:
+      'Finch, Fiona, 2023, "Darwin\'s Finches", <a href="https://doi.org/10.5072/FK2/B4B2MJ" target="_blank">https://doi.org/10.5072/FK2/B4B2MJ</a>, Root, DRAFT VERSION'
   },
-  citation:
-    'Finch, Fiona, 2023, "Darwin\'s Finches", <a href="https://doi.org/10.5072/FK2/B4B2MJ" target="_blank">https://doi.org/10.5072/FK2/B4B2MJ</a>, Root, DRAFT VERSION',
-  labels: [
-    { semanticMeaning: 'dataset', value: 'Draft' },
-    { semanticMeaning: 'warning', value: 'Unpublished' }
-  ],
+  requestedVersion: undefined,
   alerts: [{ variant: 'warning', messageKey: 'draftVersion', dynamicFields: undefined }],
   summaryFields: [
     {
@@ -151,7 +155,6 @@ const expectedDataset = {
   hasValidTermsOfAccess: true,
   hasOneTabularFileAtLeast: true,
   isValid: true,
-  isReleased: false,
   thumbnail: undefined,
   privateUrl: undefined,
   fileDownloadSizes: [
@@ -167,29 +170,32 @@ const expectedDatasetAlternateVersion = {
   persistentId: 'doi:10.5072/FK2/B4B2MJ',
   version: {
     id: 101,
+    title: "Darwin's Finches",
+    labels: [
+      { semanticMeaning: 'dataset', value: 'Draft' },
+      { semanticMeaning: 'warning', value: 'Unpublished' }
+    ],
     publishingStatus: 'draft',
     isLatest: true,
     isInReview: false,
-    latestVersionStatus: 'draft',
-    minorNumber: 0,
-    majorNumber: 0,
-    requestedVersion: '4.0'
+    latestVersionPublishingStatus: 'draft',
+    number: {
+      minorNumber: 0,
+      majorNumber: 0
+    },
+    someDatasetVersionHasBeenReleased: false,
+    citation:
+      'Finch, Fiona, 2023, "Darwin\'s Finches", <a href="https://doi.org/10.5072/FK2/B4B2MJ" target="_blank">https://doi.org/10.5072/FK2/B4B2MJ</a>, Root, DRAFT VERSION'
   },
-  citation:
-    'Finch, Fiona, 2023, "Darwin\'s Finches", <a href="https://doi.org/10.5072/FK2/B4B2MJ" target="_blank">https://doi.org/10.5072/FK2/B4B2MJ</a>, Root, DRAFT VERSION',
+  requestedVersion: '4.0',
   hasValidTermsOfAccess: true,
   hasOneTabularFileAtLeast: true,
-  isReleased: false,
   isValid: true,
   privateUrl: undefined,
   fileDownloadSizes: [
     new FileDownloadSize(5, FileSizeUnit.BYTES, FileDownloadMode.ORIGINAL),
     new FileDownloadSize(7, FileSizeUnit.BYTES, FileDownloadMode.ARCHIVAL)
   ],
-  labels: [
-    { semanticMeaning: 'dataset', value: 'Draft' },
-    { semanticMeaning: 'warning', value: 'Unpublished' }
-  ],
   alerts: [
     {
       variant: 'warning',
diff --git a/tests/component/files/domain/models/FileMother.ts b/tests/component/files/domain/models/FileMother.ts
index 130ff8a62..8b63476fa 100644
--- a/tests/component/files/domain/models/FileMother.ts
+++ b/tests/component/files/domain/models/FileMother.ts
@@ -1,384 +1,48 @@
+import { File } from '../../../../../src/files/domain/models/File'
 import { faker } from '@faker-js/faker'
-import {
-  File,
-  FileDateType,
-  FileEmbargo,
-  FileIngest,
-  FileIngestStatus,
-  FileLabel,
-  FileLabelType,
-  FileSize,
-  FileSizeUnit,
-  FilePublishingStatus,
-  FileType,
-  FileChecksum
-} from '../../../../../src/files/domain/models/File'
-import FileTypeToFriendlyTypeMap from '../../../../../src/files/domain/models/FileTypeToFriendlyTypeMap'
-
-const valueOrUndefined: <T>(value: T) => T | undefined = (value) => {
-  const shouldShowValue = faker.datatype.boolean()
-  return shouldShowValue ? value : undefined
-}
-
-const createFakeFileLabel = (): FileLabel => ({
-  type: faker.helpers.arrayElement(Object.values(FileLabelType)),
-  value: faker.lorem.word()
-})
-
-export class FileEmbargoMother {
-  static create(dateAvailable?: Date): FileEmbargo {
-    return new FileEmbargo(dateAvailable ?? faker.date.future())
-  }
-}
-export class FileIngestMother {
-  static create(props?: Partial<FileIngest>): FileIngest {
-    return {
-      status: faker.helpers.arrayElement(Object.values(FileIngestStatus)),
-      reportMessage: valueOrUndefined<string>(faker.lorem.sentence()),
-      ...props
-    }
-  }
-
-  static createInProgress(): FileIngest {
-    return this.create({ status: FileIngestStatus.IN_PROGRESS })
-  }
-
-  static createIngestProblem(reportMessage?: string): FileIngest {
-    return this.create({
-      status: FileIngestStatus.ERROR,
-      reportMessage: reportMessage
-    })
-  }
-
-  static createIngestNone(): FileIngest {
-    return this.create({ status: FileIngestStatus.NONE })
-  }
-}
-
-export class FileChecksumMother {
-  static create(props?: Partial<FileChecksum>): FileChecksum {
-    return {
-      algorithm: faker.lorem.word(),
-      value: faker.datatype.uuid(),
-      ...props
-    }
-  }
-}
+import { DatasetVersionMother } from '../../../dataset/domain/models/DatasetMother'
 
 export class FileMother {
   static create(props?: Partial<File>): File {
-    const thumbnail = valueOrUndefined<string>(faker.image.imageUrl())
-    const fileType = faker.helpers.arrayElement(Object.keys(FileTypeToFriendlyTypeMap))
-    const checksum = valueOrUndefined<string>(faker.datatype.uuid())
-    const fileMockedData = {
-      id: faker.datatype.number(),
+    return {
       name: faker.system.fileName(),
-      access: {
-        restricted: faker.datatype.boolean(),
-        latestVersionRestricted: faker.datatype.boolean(),
-        canBeRequested: faker.datatype.boolean(),
-        requested: faker.datatype.boolean()
-      },
-      version: {
-        number: faker.datatype.number(),
-        publishingStatus: faker.helpers.arrayElement(Object.values(FilePublishingStatus))
-      },
-      type:
-        fileType === 'text/tab-separated-values'
-          ? new FileType('text/tab-separated-values', 'Comma Separated Values')
-          : new FileType(thumbnail ? 'image' : fileType),
-      size: {
-        value: faker.datatype.number({ max: 1024, precision: 2 }),
-        unit: faker.helpers.arrayElement(Object.values(FileSizeUnit))
-      },
-      date: {
-        type: faker.helpers.arrayElement(Object.values(FileDateType)),
-        date: faker.date.recent()
-      },
-      downloadCount: faker.datatype.number(40),
-      labels: faker.datatype.boolean()
-        ? faker.helpers.arrayElements<FileLabel>([
-            createFakeFileLabel(),
-            createFakeFileLabel(),
-            createFakeFileLabel(),
-            createFakeFileLabel()
-          ])
-        : [],
-      checksum: FileChecksumMother.create(),
-      thumbnail: thumbnail,
-      directory: valueOrUndefined<string>(faker.system.directoryPath()),
-      embargo: valueOrUndefined<FileEmbargo>(FileEmbargoMother.create()),
-      tabularData:
-        fileType === 'text/tab-separated-values' && !checksum
-          ? {
-              variablesCount: faker.datatype.number(100),
-              observationsCount: faker.datatype.number(100),
-              unf: `UNF:6:${faker.datatype.uuid()}==`
-            }
-          : undefined,
-      description: valueOrUndefined<string>(faker.lorem.paragraph()),
-      isDeleted: faker.datatype.boolean(),
-      ingest: { status: FileIngestStatus.NONE },
-      downloadUrls: {
-        original: this.createDownloadUrl(),
-        tabular: this.createDownloadUrl(),
-        rData: this.createDownloadUrl()
+      datasetVersion: DatasetVersionMother.create(),
+      restricted: faker.datatype.boolean(),
+      permissions: {
+        canDownloadFile: faker.datatype.boolean()
       },
       ...props
     }
-
-    return new File(
-      fileMockedData.id,
-      fileMockedData.version,
-      fileMockedData.name,
-      fileMockedData.access,
-      fileMockedData.type,
-      new FileSize(fileMockedData.size.value, fileMockedData.size.unit),
-      fileMockedData.date,
-      fileMockedData.downloadCount,
-      fileMockedData.labels,
-      fileMockedData.isDeleted,
-      fileMockedData.ingest,
-      fileMockedData.downloadUrls,
-      fileMockedData.thumbnail,
-      fileMockedData.directory,
-      fileMockedData.embargo,
-      fileMockedData.tabularData,
-      fileMockedData.description,
-      fileMockedData.checksum
-    )
   }
 
-  static createDownloadUrl(): string {
-    const blob = new Blob(['Name,Age,Location\nJohn,25,New York\nJane,30,San Francisco'], {
-      type: 'text/csv'
-    })
-    return URL.createObjectURL(blob)
-  }
-
-  static createMany(quantity: number, props?: Partial<File>): File[] {
-    return Array.from({ length: quantity }).map(() => this.create(props))
-  }
-
-  static createDefault(props?: Partial<File>): File {
-    const defaultFile = {
-      type: new FileType('text/plain'),
-      version: {
-        number: 1,
-        publishingStatus: FilePublishingStatus.RELEASED
-      },
-      access: {
-        restricted: false,
-        latestVersionRestricted: false,
-        canBeRequested: false,
-        requested: false
+  static createRealistic(props?: Partial<File>): File {
+    return this.create({
+      name: 'file.csv',
+      datasetVersion: DatasetVersionMother.createRealistic(),
+      restricted: false,
+      permissions: {
+        canDownloadFile: true
       },
-      permissions: { canDownload: true },
-      labels: [],
-      checksum: undefined,
-      thumbnail: undefined,
-      directory: undefined,
-      embargo: undefined,
-      tabularData: undefined,
-      description: undefined,
-      isDeleted: false,
       ...props
-    }
-    return this.create(defaultFile)
-  }
-
-  static createWithLabels(): File {
-    return this.createDefault({
-      labels: faker.helpers.arrayElements<FileLabel>([
-        createFakeFileLabel(),
-        createFakeFileLabel(),
-        createFakeFileLabel(),
-        createFakeFileLabel()
-      ])
-    })
-  }
-
-  static createWithDirectory(): File {
-    return this.createDefault({ directory: faker.system.directoryPath() })
-  }
-
-  static createWithEmbargo(): File {
-    return this.createDefault({
-      embargo: FileEmbargoMother.create()
     })
   }
 
-  static createWithEmbargoRestricted(): File {
-    return this.createDefault({
-      access: {
-        restricted: true,
-        latestVersionRestricted: true,
-        canBeRequested: false,
-        requested: false
-      },
-      embargo: FileEmbargoMother.create()
-    })
-  }
-
-  static createTabular(props?: Partial<File>): File {
-    return this.createDefault({
-      type: new FileType('text/tab-separated-values', 'Comma Separated Values'),
-      tabularData: {
-        variablesCount: faker.datatype.number(100),
-        observationsCount: faker.datatype.number(100),
-        unf: `UNF:${faker.datatype.uuid()}==`
+  static createRestricted(props?: Partial<File>): File {
+    return this.createRealistic({
+      restricted: true,
+      permissions: {
+        canDownloadFile: false
       },
       ...props
     })
   }
 
-  static createNonTabular(props?: Partial<File>): File {
-    return this.createDefault({
-      type: new FileType('text/plain'),
-      tabularData: undefined,
-      ...props
-    })
-  }
-
-  static createWithDescription(): File {
-    return this.createDefault({
-      description: faker.lorem.paragraph()
-    })
-  }
-
-  static createWithChecksum(): File {
-    return this.createDefault({
-      checksum: FileChecksumMother.create()
-    })
-  }
-
-  static createWithPublicAccess(): File {
-    return this.createDefault({
-      access: {
-        restricted: false,
-        latestVersionRestricted: false,
-        canBeRequested: false,
-        requested: false
-      },
-      embargo: undefined
-    })
-  }
-
-  static createWithPublicAccessButLatestVersionRestricted(): File {
-    return this.createDefault({
-      access: {
-        restricted: false,
-        latestVersionRestricted: true,
-        canBeRequested: false,
-        requested: false
-      },
-      embargo: undefined
-    })
-  }
-
-  static createWithRestrictedAccess(): File {
-    return this.createDefault({
-      access: {
-        restricted: true,
-        latestVersionRestricted: true,
-        canBeRequested: false,
-        requested: false
-      },
-      embargo: undefined
-    })
-  }
-
-  static createWithRestrictedAccessWithAccessGranted(): File {
-    return this.createDefault({
-      access: {
-        restricted: true,
-        latestVersionRestricted: true,
-        canBeRequested: true,
-        requested: false
+  static createRestrictedWithAccessGranted(props?: Partial<File>): File {
+    return this.createRestricted({
+      permissions: {
+        canDownloadFile: true
       },
-      embargo: undefined
-    })
-  }
-
-  static createWithAccessRequestAllowed(): File {
-    return this.createDefault({
-      access: {
-        restricted: true,
-        latestVersionRestricted: true,
-        canBeRequested: true,
-        requested: false
-      },
-      embargo: undefined
-    })
-  }
-
-  static createWithAccessRequestPending(): File {
-    return this.createDefault({
-      access: {
-        restricted: true,
-        latestVersionRestricted: true,
-        canBeRequested: true,
-        requested: true
-      },
-      embargo: undefined
-    })
-  }
-
-  static createWithThumbnail(): File {
-    return this.createDefault({
-      thumbnail: faker.image.imageUrl()
-    })
-  }
-
-  static createWithThumbnailRestrictedWithAccessGranted(): File {
-    return this.createDefault({
-      access: {
-        restricted: true,
-        latestVersionRestricted: true,
-        canBeRequested: true,
-        requested: false
-      },
-      thumbnail: faker.image.imageUrl(),
-      type: new FileType('image')
-    })
-  }
-
-  static createWithThumbnailRestricted(): File {
-    return this.createDefault({
-      access: {
-        restricted: true,
-        latestVersionRestricted: true,
-        canBeRequested: false,
-        requested: false
-      },
-      thumbnail: faker.image.imageUrl(),
-      type: new FileType('image')
-    })
-  }
-
-  static createDeaccessioned(): File {
-    return this.createDefault({
-      version: {
-        number: 1,
-        publishingStatus: FilePublishingStatus.DEACCESSIONED
-      }
-    })
-  }
-  static createDeleted(): File {
-    return this.createDefault({
-      isDeleted: true
-    })
-  }
-
-  static createIngestInProgress(): File {
-    return this.createDefault({
-      ingest: FileIngestMother.createInProgress()
-    })
-  }
-
-  static createIngestProblem(reportMessage?: string): File {
-    return this.createDefault({
-      ingest: FileIngestMother.createIngestProblem(reportMessage)
+      ...props
     })
   }
 }
diff --git a/tests/component/files/domain/models/FilePreviewMother.ts b/tests/component/files/domain/models/FilePreviewMother.ts
new file mode 100644
index 000000000..a73218ffa
--- /dev/null
+++ b/tests/component/files/domain/models/FilePreviewMother.ts
@@ -0,0 +1,384 @@
+import { faker } from '@faker-js/faker'
+import {
+  FilePreview,
+  FileDateType,
+  FileEmbargo,
+  FileIngest,
+  FileIngestStatus,
+  FileLabel,
+  FileLabelType,
+  FileSize,
+  FileSizeUnit,
+  FilePublishingStatus,
+  FileType,
+  FileChecksum
+} from '../../../../../src/files/domain/models/FilePreview'
+import FileTypeToFriendlyTypeMap from '../../../../../src/files/domain/models/FileTypeToFriendlyTypeMap'
+
+const valueOrUndefined: <T>(value: T) => T | undefined = (value) => {
+  const shouldShowValue = faker.datatype.boolean()
+  return shouldShowValue ? value : undefined
+}
+
+const createFakeFileLabel = (): FileLabel => ({
+  type: faker.helpers.arrayElement(Object.values(FileLabelType)),
+  value: faker.lorem.word()
+})
+
+export class FileEmbargoMother {
+  static create(dateAvailable?: Date): FileEmbargo {
+    return new FileEmbargo(dateAvailable ?? faker.date.future())
+  }
+}
+export class FileIngestMother {
+  static create(props?: Partial<FileIngest>): FileIngest {
+    return {
+      status: faker.helpers.arrayElement(Object.values(FileIngestStatus)),
+      reportMessage: valueOrUndefined<string>(faker.lorem.sentence()),
+      ...props
+    }
+  }
+
+  static createInProgress(): FileIngest {
+    return this.create({ status: FileIngestStatus.IN_PROGRESS })
+  }
+
+  static createIngestProblem(reportMessage?: string): FileIngest {
+    return this.create({
+      status: FileIngestStatus.ERROR,
+      reportMessage: reportMessage
+    })
+  }
+
+  static createIngestNone(): FileIngest {
+    return this.create({ status: FileIngestStatus.NONE })
+  }
+}
+
+export class FileChecksumMother {
+  static create(props?: Partial<FileChecksum>): FileChecksum {
+    return {
+      algorithm: faker.lorem.word(),
+      value: faker.datatype.uuid(),
+      ...props
+    }
+  }
+}
+
+export class FilePreviewMother {
+  static create(props?: Partial<FilePreview>): FilePreview {
+    const thumbnail = valueOrUndefined<string>(faker.image.imageUrl())
+    const fileType = faker.helpers.arrayElement(Object.keys(FileTypeToFriendlyTypeMap))
+    const checksum = valueOrUndefined<string>(faker.datatype.uuid())
+    const fileMockedData = {
+      id: faker.datatype.number(),
+      name: faker.system.fileName(),
+      access: {
+        restricted: faker.datatype.boolean(),
+        latestVersionRestricted: faker.datatype.boolean(),
+        canBeRequested: faker.datatype.boolean(),
+        requested: faker.datatype.boolean()
+      },
+      version: {
+        number: faker.datatype.number(),
+        publishingStatus: faker.helpers.arrayElement(Object.values(FilePublishingStatus))
+      },
+      type:
+        fileType === 'text/tab-separated-values'
+          ? new FileType('text/tab-separated-values', 'Comma Separated Values')
+          : new FileType(thumbnail ? 'image' : fileType),
+      size: {
+        value: faker.datatype.number({ max: 1024, precision: 2 }),
+        unit: faker.helpers.arrayElement(Object.values(FileSizeUnit))
+      },
+      date: {
+        type: faker.helpers.arrayElement(Object.values(FileDateType)),
+        date: faker.date.recent()
+      },
+      downloadCount: faker.datatype.number(40),
+      labels: faker.datatype.boolean()
+        ? faker.helpers.arrayElements<FileLabel>([
+            createFakeFileLabel(),
+            createFakeFileLabel(),
+            createFakeFileLabel(),
+            createFakeFileLabel()
+          ])
+        : [],
+      checksum: FileChecksumMother.create(),
+      thumbnail: thumbnail,
+      directory: valueOrUndefined<string>(faker.system.directoryPath()),
+      embargo: valueOrUndefined<FileEmbargo>(FileEmbargoMother.create()),
+      tabularData:
+        fileType === 'text/tab-separated-values' && !checksum
+          ? {
+              variablesCount: faker.datatype.number(100),
+              observationsCount: faker.datatype.number(100),
+              unf: `UNF:6:${faker.datatype.uuid()}==`
+            }
+          : undefined,
+      description: valueOrUndefined<string>(faker.lorem.paragraph()),
+      isDeleted: faker.datatype.boolean(),
+      ingest: { status: FileIngestStatus.NONE },
+      downloadUrls: {
+        original: this.createDownloadUrl(),
+        tabular: this.createDownloadUrl(),
+        rData: this.createDownloadUrl()
+      },
+      ...props
+    }
+
+    return new FilePreview(
+      fileMockedData.id,
+      fileMockedData.version,
+      fileMockedData.name,
+      fileMockedData.access,
+      fileMockedData.type,
+      new FileSize(fileMockedData.size.value, fileMockedData.size.unit),
+      fileMockedData.date,
+      fileMockedData.downloadCount,
+      fileMockedData.labels,
+      fileMockedData.isDeleted,
+      fileMockedData.ingest,
+      fileMockedData.downloadUrls,
+      fileMockedData.thumbnail,
+      fileMockedData.directory,
+      fileMockedData.embargo,
+      fileMockedData.tabularData,
+      fileMockedData.description,
+      fileMockedData.checksum
+    )
+  }
+
+  static createDownloadUrl(): string {
+    const blob = new Blob(['Name,Age,Location\nJohn,25,New York\nJane,30,San Francisco'], {
+      type: 'text/csv'
+    })
+    return URL.createObjectURL(blob)
+  }
+
+  static createMany(quantity: number, props?: Partial<FilePreview>): FilePreview[] {
+    return Array.from({ length: quantity }).map(() => this.create(props))
+  }
+
+  static createDefault(props?: Partial<FilePreview>): FilePreview {
+    const defaultFile = {
+      type: new FileType('text/plain'),
+      version: {
+        number: 1,
+        publishingStatus: FilePublishingStatus.RELEASED
+      },
+      access: {
+        restricted: false,
+        latestVersionRestricted: false,
+        canBeRequested: false,
+        requested: false
+      },
+      permissions: { canDownload: true },
+      labels: [],
+      checksum: undefined,
+      thumbnail: undefined,
+      directory: undefined,
+      embargo: undefined,
+      tabularData: undefined,
+      description: undefined,
+      isDeleted: false,
+      ...props
+    }
+    return this.create(defaultFile)
+  }
+
+  static createWithLabels(): FilePreview {
+    return this.createDefault({
+      labels: faker.helpers.arrayElements<FileLabel>([
+        createFakeFileLabel(),
+        createFakeFileLabel(),
+        createFakeFileLabel(),
+        createFakeFileLabel()
+      ])
+    })
+  }
+
+  static createWithDirectory(): FilePreview {
+    return this.createDefault({ directory: faker.system.directoryPath() })
+  }
+
+  static createWithEmbargo(): FilePreview {
+    return this.createDefault({
+      embargo: FileEmbargoMother.create()
+    })
+  }
+
+  static createWithEmbargoRestricted(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: true,
+        latestVersionRestricted: true,
+        canBeRequested: false,
+        requested: false
+      },
+      embargo: FileEmbargoMother.create()
+    })
+  }
+
+  static createTabular(props?: Partial<FilePreview>): FilePreview {
+    return this.createDefault({
+      type: new FileType('text/tab-separated-values', 'Comma Separated Values'),
+      tabularData: {
+        variablesCount: faker.datatype.number(100),
+        observationsCount: faker.datatype.number(100),
+        unf: `UNF:${faker.datatype.uuid()}==`
+      },
+      ...props
+    })
+  }
+
+  static createNonTabular(props?: Partial<FilePreview>): FilePreview {
+    return this.createDefault({
+      type: new FileType('text/plain'),
+      tabularData: undefined,
+      ...props
+    })
+  }
+
+  static createWithDescription(): FilePreview {
+    return this.createDefault({
+      description: faker.lorem.paragraph()
+    })
+  }
+
+  static createWithChecksum(): FilePreview {
+    return this.createDefault({
+      checksum: FileChecksumMother.create()
+    })
+  }
+
+  static createWithPublicAccess(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: false,
+        latestVersionRestricted: false,
+        canBeRequested: false,
+        requested: false
+      },
+      embargo: undefined
+    })
+  }
+
+  static createWithPublicAccessButLatestVersionRestricted(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: false,
+        latestVersionRestricted: true,
+        canBeRequested: false,
+        requested: false
+      },
+      embargo: undefined
+    })
+  }
+
+  static createWithRestrictedAccess(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: true,
+        latestVersionRestricted: true,
+        canBeRequested: false,
+        requested: false
+      },
+      embargo: undefined
+    })
+  }
+
+  static createWithRestrictedAccessWithAccessGranted(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: true,
+        latestVersionRestricted: true,
+        canBeRequested: true,
+        requested: false
+      },
+      embargo: undefined
+    })
+  }
+
+  static createWithAccessRequestAllowed(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: true,
+        latestVersionRestricted: true,
+        canBeRequested: true,
+        requested: false
+      },
+      embargo: undefined
+    })
+  }
+
+  static createWithAccessRequestPending(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: true,
+        latestVersionRestricted: true,
+        canBeRequested: true,
+        requested: true
+      },
+      embargo: undefined
+    })
+  }
+
+  static createWithThumbnail(): FilePreview {
+    return this.createDefault({
+      thumbnail: faker.image.imageUrl()
+    })
+  }
+
+  static createWithThumbnailRestrictedWithAccessGranted(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: true,
+        latestVersionRestricted: true,
+        canBeRequested: true,
+        requested: false
+      },
+      thumbnail: faker.image.imageUrl(),
+      type: new FileType('image')
+    })
+  }
+
+  static createWithThumbnailRestricted(): FilePreview {
+    return this.createDefault({
+      access: {
+        restricted: true,
+        latestVersionRestricted: true,
+        canBeRequested: false,
+        requested: false
+      },
+      thumbnail: faker.image.imageUrl(),
+      type: new FileType('image')
+    })
+  }
+
+  static createDeaccessioned(): FilePreview {
+    return this.createDefault({
+      version: {
+        number: 1,
+        publishingStatus: FilePublishingStatus.DEACCESSIONED
+      }
+    })
+  }
+  static createDeleted(): FilePreview {
+    return this.createDefault({
+      isDeleted: true
+    })
+  }
+
+  static createIngestInProgress(): FilePreview {
+    return this.createDefault({
+      ingest: FileIngestMother.createInProgress()
+    })
+  }
+
+  static createIngestProblem(reportMessage?: string): FilePreview {
+    return this.createDefault({
+      ingest: FileIngestMother.createIngestProblem(reportMessage)
+    })
+  }
+}
diff --git a/tests/component/files/domain/models/FilesCountInfoMother.tsx b/tests/component/files/domain/models/FilesCountInfoMother.tsx
index 43122d743..0ad542504 100644
--- a/tests/component/files/domain/models/FilesCountInfoMother.tsx
+++ b/tests/component/files/domain/models/FilesCountInfoMother.tsx
@@ -1,4 +1,4 @@
-import { FileType } from '../../../../../src/files/domain/models/File'
+import { FileType } from '../../../../../src/files/domain/models/FilePreview'
 import { faker } from '@faker-js/faker'
 import { FilesCountInfo } from '../../../../../src/files/domain/models/FilesCountInfo'
 import { FileAccessOption, FileTag } from '../../../../../src/files/domain/models/FileCriteria'
diff --git a/tests/component/sections/dataset/Dataset.spec.tsx b/tests/component/sections/dataset/Dataset.spec.tsx
index 783479fed..e3af5257d 100644
--- a/tests/component/sections/dataset/Dataset.spec.tsx
+++ b/tests/component/sections/dataset/Dataset.spec.tsx
@@ -41,7 +41,7 @@ describe('Dataset', () => {
     mountWithDataset(<Dataset fileRepository={fileRepository} />, testDataset)
 
     cy.findByTestId('dataset-skeleton').should('exist')
-    cy.findByText(testDataset.title).should('not.exist')
+    cy.findByText(testDataset.version.title).should('not.exist')
   })
 
   it('renders page not found when dataset is null', () => {
@@ -57,9 +57,9 @@ describe('Dataset', () => {
 
     mountWithDataset(<Dataset fileRepository={fileRepository} />, testDataset)
 
-    cy.findAllByText(testDataset.title).should('exist')
+    cy.findAllByText(testDataset.version.title).should('exist')
 
-    testDataset.labels.forEach((label) => {
+    testDataset.version.labels.forEach((label) => {
       cy.findAllByText(label.value).should('exist')
     })
   })
@@ -69,7 +69,7 @@ describe('Dataset', () => {
 
     mountWithDataset(<Dataset fileRepository={fileRepository} />, testDataset)
 
-    cy.findAllByText(testDataset.title).should('exist')
+    cy.findAllByText(testDataset.version.title).should('exist')
 
     const metadataTab = cy.findByRole('tab', { name: 'Metadata' })
     metadataTab.should('exist')
diff --git a/tests/component/sections/dataset/DatasetProvider.spec.tsx b/tests/component/sections/dataset/DatasetProvider.spec.tsx
index e396bba45..2e2cf2420 100644
--- a/tests/component/sections/dataset/DatasetProvider.spec.tsx
+++ b/tests/component/sections/dataset/DatasetProvider.spec.tsx
@@ -9,7 +9,7 @@ function TestComponent() {
 
   return (
     <div>
-      {dataset ? <span>{dataset.title}</span> : <span>Dataset Not Found</span>}
+      {dataset ? <span>{dataset.version.title}</span> : <span>Dataset Not Found</span>}
       {isLoading && <div>Loading...</div>}
     </div>
   )
@@ -39,7 +39,7 @@ describe('DatasetProvider', () => {
 
     cy.findByText('Loading...').should('exist')
     cy.wrap(datasetRepository.getByPersistentId).should('be.calledOnceWith', dataset.persistentId)
-    cy.findByText(dataset.title).should('exist')
+    cy.findByText(dataset.version.title).should('exist')
     cy.findByText('Loading...').should('not.exist')
   })
 
@@ -60,7 +60,7 @@ describe('DatasetProvider', () => {
       dataset.persistentId,
       'draft'
     )
-    cy.findByText(dataset.title).should('exist')
+    cy.findByText(dataset.version.title).should('exist')
     cy.findByText('Loading...').should('not.exist')
   })
 
@@ -80,7 +80,7 @@ describe('DatasetProvider', () => {
       'be.calledOnce',
       'some-private-url-token'
     )
-    cy.findByText(dataset.title).should('exist')
+    cy.findByText(dataset.version.title).should('exist')
     cy.findByText('Loading...').should('not.exist')
   })
 
diff --git a/tests/component/sections/dataset/dataset-action-buttons/DatasetActionButtons.spec.tsx b/tests/component/sections/dataset/dataset-action-buttons/DatasetActionButtons.spec.tsx
index 493613a7c..64c20869b 100644
--- a/tests/component/sections/dataset/dataset-action-buttons/DatasetActionButtons.spec.tsx
+++ b/tests/component/sections/dataset/dataset-action-buttons/DatasetActionButtons.spec.tsx
@@ -8,9 +8,8 @@ import {
 describe('DatasetActionButtons', () => {
   it('renders the DatasetActionButtons with the Publish button', () => {
     const dataset = DatasetMother.create({
-      version: DatasetVersionMother.createDraftAsLatestVersion(),
-      permissions: DatasetPermissionsMother.createWithAllAllowed(),
-      isReleased: true
+      version: DatasetVersionMother.createDraftAsLatestVersionWithSomeVersionHasBeenReleased(),
+      permissions: DatasetPermissionsMother.createWithAllAllowed()
     })
 
     cy.mountAuthenticated(<DatasetActionButtons dataset={dataset} />)
@@ -24,13 +23,12 @@ describe('DatasetActionButtons', () => {
 
   it('renders the DatasetActionButtons with the Submit for Review button', () => {
     const dataset = DatasetMother.create({
-      version: DatasetVersionMother.createDraftAsLatestVersion(),
+      version: DatasetVersionMother.createDraftAsLatestVersionWithSomeVersionHasBeenReleased(),
       permissions: DatasetPermissionsMother.create({
         canDownloadFiles: true,
         canUpdateDataset: true,
         canPublishDataset: false
-      }),
-      isReleased: true
+      })
     })
 
     cy.mountAuthenticated(<DatasetActionButtons dataset={dataset} />)
diff --git a/tests/component/sections/dataset/dataset-action-buttons/access-dataset-menu/AccessDatasetMenu.spec.tsx b/tests/component/sections/dataset/dataset-action-buttons/access-dataset-menu/AccessDatasetMenu.spec.tsx
index 352a6174d..53926122f 100644
--- a/tests/component/sections/dataset/dataset-action-buttons/access-dataset-menu/AccessDatasetMenu.spec.tsx
+++ b/tests/component/sections/dataset/dataset-action-buttons/access-dataset-menu/AccessDatasetMenu.spec.tsx
@@ -5,7 +5,7 @@ import {
   DatasetPermissionsMother,
   DatasetVersionMother
 } from '../../../../dataset/domain/models/DatasetMother'
-import { FileSizeUnit } from '../../../../../../src/files/domain/models/File'
+import { FileSizeUnit } from '../../../../../../src/files/domain/models/FilePreview'
 
 const downloadUrls = DatasetDownloadUrlsMother.create()
 describe('AccessDatasetMenu', () => {
diff --git a/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.spec.tsx b/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.spec.tsx
index 2730a2432..387ddecca 100644
--- a/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.spec.tsx
+++ b/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton.spec.tsx
@@ -1,6 +1,7 @@
 import {
   DatasetMother,
-  DatasetPermissionsMother
+  DatasetPermissionsMother,
+  DatasetVersionMother
 } from '../../../../dataset/domain/models/DatasetMother'
 import { DeaccessionDatasetButton } from '../../../../../../src/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeaccessionDatasetButton'
 
@@ -8,7 +9,7 @@ describe('DeaccessionDatasetButton', () => {
   it('renders the DeaccessionDatasetButton if the user has publish dataset permissions and the dataset is released', () => {
     const dataset = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithPublishingDatasetAllowed(),
-      isReleased: true
+      version: DatasetVersionMother.createReleased()
     })
 
     cy.customMount(<DeaccessionDatasetButton dataset={dataset} />)
@@ -20,7 +21,7 @@ describe('DeaccessionDatasetButton', () => {
   it('does not render the DeaccessionDatasetButton if the user does not have publish dataset permissions', () => {
     const dataset = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithPublishingDatasetNotAllowed(),
-      isReleased: true
+      version: DatasetVersionMother.createReleased()
     })
 
     cy.customMount(<DeaccessionDatasetButton dataset={dataset} />)
@@ -31,7 +32,7 @@ describe('DeaccessionDatasetButton', () => {
   it('does not render the DeaccessionDatasetButton if the dataset is not released', () => {
     const dataset = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithPublishingDatasetAllowed(),
-      isReleased: false
+      version: DatasetVersionMother.createNotReleased()
     })
 
     cy.customMount(<DeaccessionDatasetButton dataset={dataset} />)
diff --git a/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.spec.tsx b/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.spec.tsx
index 7f353c19b..eb71524ec 100644
--- a/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.spec.tsx
+++ b/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDatasetButton.spec.tsx
@@ -23,8 +23,7 @@ describe('DeleteDatasetButton', () => {
     const dataset = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithDeleteDatasetAllowed(),
       locks: [],
-      version: DatasetVersionMother.createDraftWithLatestVersionIsADraft(),
-      isReleased: false
+      version: DatasetVersionMother.createNotReleased()
     })
 
     cy.customMount(<DeleteDatasetButton dataset={dataset} />)
@@ -32,12 +31,11 @@ describe('DeleteDatasetButton', () => {
     cy.findByRole('button', { name: 'Delete Dataset' }).should('exist')
   })
 
-  it('renders the Delete Draft Version if the dataset is released', () => {
+  it('renders the Delete Draft Version if the dataset is released and the latest version is a draft', () => {
     const dataset = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithDeleteDatasetAllowed(),
       locks: [],
-      version: DatasetVersionMother.createReleasedWithLatestVersionIsADraft(),
-      isReleased: true
+      version: DatasetVersionMother.createReleasedWithLatestVersionIsADraft()
     })
 
     cy.customMount(<DeleteDatasetButton dataset={dataset} />)
@@ -61,7 +59,7 @@ describe('DeleteDatasetButton', () => {
     const dataset = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithDeleteDatasetAllowed(),
       locks: [],
-      version: DatasetVersionMother.createWithLatestVersionIsNotADraft()
+      version: DatasetVersionMother.createDraftWithLatestVersionIsReleased()
     })
 
     cy.customMount(<DeleteDatasetButton dataset={dataset} />)
diff --git a/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.spec.tsx b/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.spec.tsx
index aae0fa697..59b75f0d6 100644
--- a/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.spec.tsx
+++ b/tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.spec.tsx
@@ -12,8 +12,7 @@ describe('EditDatasetMenu', () => {
       permissions: DatasetPermissionsMother.createWithAllAllowed(),
       locks: [],
       hasValidTermsOfAccess: true,
-      version: DatasetVersionMother.createReleasedWithLatestVersionIsADraft(),
-      isReleased: true
+      version: DatasetVersionMother.createReleasedWithLatestVersionIsADraft()
     })
 
     cy.mountAuthenticated(<EditDatasetMenu dataset={dataset} />)
@@ -35,8 +34,7 @@ describe('EditDatasetMenu', () => {
       permissions: DatasetPermissionsMother.createWithAllAllowed(),
       locks: [],
       hasValidTermsOfAccess: true,
-      version: DatasetVersionMother.createReleasedWithLatestVersionIsADraft(),
-      isReleased: true
+      version: DatasetVersionMother.createReleasedWithLatestVersionIsADraft()
     })
 
     cy.customMount(<EditDatasetMenu dataset={dataset} />)
diff --git a/tests/component/sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.spec.tsx b/tests/component/sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.spec.tsx
index f6318c4d1..bb3f6c609 100644
--- a/tests/component/sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.spec.tsx
+++ b/tests/component/sections/dataset/dataset-action-buttons/link-dataset-button/LinkDatasetButton.spec.tsx
@@ -7,8 +7,7 @@ import { LinkDatasetButton } from '../../../../../../src/sections/dataset/datase
 describe('LinkDatasetButton', () => {
   it('renders the LinkDatasetButton if the user is authenticated and the dataset version is not deaccessioned and the dataset is released', () => {
     const dataset = DatasetMother.create({
-      version: DatasetVersionMother.createDraft(),
-      isReleased: true
+      version: DatasetVersionMother.createReleased()
     })
 
     cy.mountAuthenticated(<LinkDatasetButton dataset={dataset} />)
@@ -18,8 +17,7 @@ describe('LinkDatasetButton', () => {
 
   it('does not render the LinkDatasetButton if the user is not authenticated', () => {
     const dataset = DatasetMother.create({
-      version: DatasetVersionMother.createDraft(),
-      isReleased: true
+      version: DatasetVersionMother.createReleased()
     })
 
     cy.customMount(<LinkDatasetButton dataset={dataset} />)
@@ -29,8 +27,7 @@ describe('LinkDatasetButton', () => {
 
   it('does not render the LinkDatasetButton if the dataset version is deaccessioned', () => {
     const dataset = DatasetMother.create({
-      version: DatasetVersionMother.createDeaccessioned(),
-      isReleased: true
+      version: DatasetVersionMother.createDeaccessioned()
     })
 
     cy.mountAuthenticated(<LinkDatasetButton dataset={dataset} />)
@@ -40,8 +37,7 @@ describe('LinkDatasetButton', () => {
 
   it('does not render the LinkDatasetButton if the dataset is not released', () => {
     const dataset = DatasetMother.create({
-      version: DatasetVersionMother.createDraft(),
-      isReleased: false
+      version: DatasetVersionMother.createNotReleased()
     })
 
     cy.mountAuthenticated(<LinkDatasetButton dataset={dataset} />)
diff --git a/tests/component/sections/dataset/dataset-citation/DatasetCitation.spec.tsx b/tests/component/sections/dataset/dataset-citation/DatasetCitation.spec.tsx
index 65d4c3fb3..d695e40cd 100644
--- a/tests/component/sections/dataset/dataset-citation/DatasetCitation.spec.tsx
+++ b/tests/component/sections/dataset/dataset-citation/DatasetCitation.spec.tsx
@@ -1,20 +1,10 @@
 import { DatasetCitation } from '../../../../../src/sections/dataset/dataset-citation/DatasetCitation'
-import { DatasetMother } from '../../../dataset/domain/models/DatasetMother'
-import {
-  DatasetPublishingStatus,
-  DatasetVersion
-} from '../../../../../src/dataset/domain/models/Dataset'
+import { DatasetVersionMother } from '../../../dataset/domain/models/DatasetMother'
 
 describe('DatasetCitation', () => {
   it('renders the DatasetCitation fields of released Dataset', () => {
-    const dataset = DatasetMother.create()
-    cy.customMount(
-      <DatasetCitation
-        title="Dataset title"
-        citation={dataset.citation}
-        version={dataset.version}
-      />
-    )
+    const version = DatasetVersionMother.createRealistic()
+    cy.customMount(<DatasetCitation version={version} />)
 
     cy.findByText('Data Citation Standards.').should('exist')
     cy.findByText(/Bennet, Elizabeth; Darcy, Fitzwilliam, 2023, "Dataset Title"/).should('exist')
@@ -30,22 +20,8 @@ describe('DatasetCitation', () => {
   })
 
   it('shows the draft tooltip when version is draft', () => {
-    const dataset = DatasetMother.create({
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.DRAFT,
-        true,
-        false,
-        DatasetPublishingStatus.DRAFT
-      )
-    })
-    cy.customMount(
-      <DatasetCitation
-        title="Dataset title"
-        citation={dataset.citation}
-        version={dataset.version}
-      />
-    )
+    const version = DatasetVersionMother.createDraft()
+    cy.customMount(<DatasetCitation version={version} />)
 
     cy.findByRole('img', { name: 'tooltip icon' }).should('exist').trigger('mouseover')
     cy.findByText(
@@ -54,24 +30,8 @@ describe('DatasetCitation', () => {
   })
 
   it('shows the deaccessioned tooltip when version is deaccessioned', () => {
-    const dataset = DatasetMother.create({
-      version: new DatasetVersion(
-        1,
-        DatasetPublishingStatus.DEACCESSIONED,
-        true,
-        false,
-        DatasetPublishingStatus.DEACCESSIONED,
-        1,
-        0
-      )
-    })
-    cy.customMount(
-      <DatasetCitation
-        title="Dataset title"
-        citation={dataset.citation}
-        version={dataset.version}
-      />
-    )
+    const version = DatasetVersionMother.createDeaccessioned()
+    cy.customMount(<DatasetCitation version={version} />)
 
     cy.findByRole('img', { name: 'tooltip icon' }).should('exist').trigger('mouseover')
     cy.findByText(
diff --git a/tests/component/sections/dataset/dataset-files/DatasetFiles.spec.tsx b/tests/component/sections/dataset/dataset-files/DatasetFiles.spec.tsx
index 58a6ec23d..39b32b584 100644
--- a/tests/component/sections/dataset/dataset-files/DatasetFiles.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/DatasetFiles.spec.tsx
@@ -1,4 +1,4 @@
-import { FileMother } from '../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../files/domain/models/FilePreviewMother'
 import { DatasetFiles } from '../../../../../src/sections/dataset/dataset-files/DatasetFiles'
 import { FileRepository } from '../../../../../src/files/domain/repositories/FileRepository'
 import {
@@ -8,7 +8,11 @@ import {
   FileTag
 } from '../../../../../src/files/domain/models/FileCriteria'
 import { FilesCountInfoMother } from '../../../files/domain/models/FilesCountInfoMother'
-import { FileSize, FileSizeUnit, FileType } from '../../../../../src/files/domain/models/File'
+import {
+  FileSize,
+  FileSizeUnit,
+  FileType
+} from '../../../../../src/files/domain/models/FilePreview'
 import styles from '../../../../../src/sections/dataset/dataset-files/files-table/FilesTable.module.scss'
 import { DatasetMother } from '../../../dataset/domain/models/DatasetMother'
 import { SettingMother } from '../../../settings/domain/models/SettingMother'
@@ -17,7 +21,7 @@ import { SettingsProvider } from '../../../../../src/sections/settings/SettingsP
 import { SettingRepository } from '../../../../../src/settings/domain/repositories/SettingRepository'
 import { FilePaginationInfo } from '../../../../../src/files/domain/models/FilePaginationInfo'
 
-const testFiles = FileMother.createMany(10)
+const testFiles = FilePreviewMother.createMany(10)
 const datasetPersistentId = 'test-dataset-persistent-id'
 const datasetVersion = DatasetMother.create().version
 const fileRepository: FileRepository = {} as FileRepository
@@ -308,11 +312,11 @@ describe('DatasetFiles', () => {
     })
 
     it('renders the zip download limit message when selecting rows from different pages', () => {
-      testFiles[1] = FileMother.create({
+      testFiles[1] = FilePreviewMother.create({
         size: new FileSize(1, FileSizeUnit.BYTES)
       })
 
-      testFiles[2] = FileMother.create({
+      testFiles[2] = FilePreviewMother.create({
         size: new FileSize(2, FileSizeUnit.BYTES)
       })
 
@@ -398,7 +402,7 @@ describe('DatasetFiles', () => {
       cy.wrap(fileRepository.getFilesCountInfoByDatasetPersistentId).should(
         'be.calledWith',
         datasetPersistentId,
-        datasetVersion
+        datasetVersion.number
       )
     })
 
@@ -541,7 +545,7 @@ describe('DatasetFiles', () => {
       cy.wrap(fileRepository.getFilesTotalDownloadSizeByDatasetPersistentId).should(
         'be.calledWith',
         datasetPersistentId,
-        datasetVersion,
+        datasetVersion.number,
         new FileCriteria().withFilterByType('image/png')
       )
     })
diff --git a/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType.spec.tsx b/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType.spec.tsx
index 20a5a4435..bda967772 100644
--- a/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType.spec.tsx
@@ -1,6 +1,6 @@
 import { FileCriteria } from '../../../../../../src/files/domain/models/FileCriteria'
 import { FilesCountInfoMother } from '../../../../files/domain/models/FilesCountInfoMother'
-import { FileType } from '../../../../../../src/files/domain/models/File'
+import { FileType } from '../../../../../../src/files/domain/models/FilePreview'
 import styles from '../../../../../../src/sections/dataset/dataset-files/file-criteria-form/FileCriteriaForm.module.scss'
 import { FileCriteriaFilterByType } from '../../../../../../src/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilterByType'
 
diff --git a/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilters.spec.tsx b/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilters.spec.tsx
index 88ec100ed..1bb22ba44 100644
--- a/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilters.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilters.spec.tsx
@@ -1,7 +1,7 @@
 import { FileCriteria } from '../../../../../../src/files/domain/models/FileCriteria'
 import { FileCriteriaFilters } from '../../../../../../src/sections/dataset/dataset-files/file-criteria-form/FileCriteriaFilters'
 import { FilesCountInfoMother } from '../../../../files/domain/models/FilesCountInfoMother'
-import { FileType } from '../../../../../../src/files/domain/models/File'
+import { FileType } from '../../../../../../src/files/domain/models/FilePreview'
 
 const defaultCriteria = new FileCriteria()
 const filesCountInfo = FilesCountInfoMother.create({
diff --git a/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaForm.spec.tsx b/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaForm.spec.tsx
index e40d20a84..9809caff6 100644
--- a/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaForm.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/file-criteria-form/FileCriteriaForm.spec.tsx
@@ -6,7 +6,7 @@ import {
   FileTag
 } from '../../../../../../src/files/domain/models/FileCriteria'
 import { FilesCountInfoMother } from '../../../../files/domain/models/FilesCountInfoMother'
-import { FileType } from '../../../../../../src/files/domain/models/File'
+import { FileType } from '../../../../../../src/files/domain/models/FilePreview'
 import { DatasetRepository } from '../../../../../../src/dataset/domain/repositories/DatasetRepository'
 import {
   DatasetMother,
diff --git a/tests/component/sections/dataset/dataset-files/files-table/FilesTable.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/FilesTable.spec.tsx
index cc0d50c3a..e9d10fc6e 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/FilesTable.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/FilesTable.spec.tsx
@@ -1,9 +1,9 @@
-import { FileMother } from '../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../files/domain/models/FilePreviewMother'
 import {
   FilesTable,
   getCellStyle
 } from '../../../../../../src/sections/dataset/dataset-files/files-table/FilesTable'
-import { FileSize, FileSizeUnit } from '../../../../../../src/files/domain/models/File'
+import { FileSize, FileSizeUnit } from '../../../../../../src/files/domain/models/FilePreview'
 import { SettingMother } from '../../../../settings/domain/models/SettingMother'
 import { ZipDownloadLimit } from '../../../../../../src/settings/domain/models/ZipDownloadLimit'
 import { SettingsContext } from '../../../../../../src/sections/settings/SettingsContext'
@@ -11,7 +11,7 @@ import styles from '../../../../../../src/sections/dataset/dataset-files/files-t
 import { FileCriteria } from '../../../../../../src/files/domain/models/FileCriteria'
 import { FilePaginationInfo } from '../../../../../../src/files/domain/models/FilePaginationInfo'
 
-const testFiles = FileMother.createMany(10)
+const testFiles = FilePreviewMother.createMany(10)
 const paginationInfo = new FilePaginationInfo(1, 10, 200)
 const testFilesTotalDownloadSize = 19900
 const defaultCriteria = new FileCriteria()
@@ -169,8 +169,8 @@ describe('FilesTable', () => {
 
   it('renders the zip download limit message when the zip download limit is reached', () => {
     const testFiles = [
-      FileMother.create({ size: new FileSize(1024, FileSizeUnit.BYTES) }),
-      FileMother.create({ size: new FileSize(2048, FileSizeUnit.BYTES) })
+      FilePreviewMother.create({ size: new FileSize(1024, FileSizeUnit.BYTES) }),
+      FilePreviewMother.create({ size: new FileSize(2048, FileSizeUnit.BYTES) })
     ]
     const getSettingByName = cy
       .stub()
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx
index 1baf2e865..df3315c07 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx
@@ -1,5 +1,5 @@
 import { FileActionsHeader } from '../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader'
-import { FileMother } from '../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../files/domain/models/FilePreviewMother'
 import { DatasetProvider } from '../../../../../../../src/sections/dataset/DatasetProvider'
 import { DatasetRepository } from '../../../../../../../src/dataset/domain/repositories/DatasetRepository'
 import {
@@ -15,7 +15,7 @@ describe('FileActionsHeader', () => {
       hasValidTermsOfAccess: true
     })
     datasetRepository.getByPersistentId = cy.stub().resolves(datasetWithUpdatePermissions)
-    const files = FileMother.createMany(2)
+    const files = FilePreviewMother.createMany(2)
     cy.mountAuthenticated(
       <DatasetProvider
         repository={datasetRepository}
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.spec.tsx
index b1b197d1b..29db77e6f 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.spec.tsx
@@ -7,7 +7,7 @@ import {
   DatasetPermissionsMother
 } from '../../../../../../dataset/domain/models/DatasetMother'
 import { DownloadFilesButton } from '../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton'
-import { FileMother } from '../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../files/domain/models/FilePreviewMother'
 import { MultipleFileDownloadProvider } from '../../../../../../../../src/sections/file/multiple-file-download/MultipleFileDownloadProvider'
 import { FileRepository } from '../../../../../../../../src/files/domain/repositories/FileRepository'
 
@@ -37,7 +37,7 @@ describe('DownloadFilesButton', () => {
     const datasetWithDownloadFilesPermission = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed()
     })
-    const files = FileMother.createMany(2)
+    const files = FilePreviewMother.createMany(2)
     cy.mountAuthenticated(
       withDataset(
         <DownloadFilesButton files={files} fileSelection={{}} />,
@@ -52,7 +52,7 @@ describe('DownloadFilesButton', () => {
     const datasetWithDownloadFilesPermission = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed()
     })
-    const files = FileMother.createMany(1)
+    const files = FilePreviewMother.createMany(1)
     cy.mountAuthenticated(
       withDataset(
         <DownloadFilesButton files={files} fileSelection={{}} />,
@@ -67,7 +67,7 @@ describe('DownloadFilesButton', () => {
     const datasetWithoutDownloadFilesPermission = DatasetMother.create({
       permissions: DatasetPermissionsMother.createWithFilesDownloadNotAllowed()
     })
-    const files = FileMother.createMany(2)
+    const files = FilePreviewMother.createMany(2)
     cy.mountAuthenticated(
       withDataset(
         <DownloadFilesButton files={files} fileSelection={{}} />,
@@ -83,7 +83,7 @@ describe('DownloadFilesButton', () => {
       permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed(),
       hasOneTabularFileAtLeast: true
     })
-    const files = FileMother.createMany(2, {
+    const files = FilePreviewMother.createMany(2, {
       tabularData: {
         variablesCount: 2,
         observationsCount: 3,
@@ -107,7 +107,7 @@ describe('DownloadFilesButton', () => {
       permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed(),
       hasOneTabularFileAtLeast: false
     })
-    const files = FileMother.createMany(2, { tabularData: undefined })
+    const files = FilePreviewMother.createMany(2, { tabularData: undefined })
     cy.mountAuthenticated(
       withDataset(
         <DownloadFilesButton files={files} fileSelection={{}} />,
@@ -125,7 +125,7 @@ describe('DownloadFilesButton', () => {
       permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed(),
       hasOneTabularFileAtLeast: false
     })
-    const files = FileMother.createMany(2, { tabularData: undefined })
+    const files = FilePreviewMother.createMany(2, { tabularData: undefined })
     cy.mountAuthenticated(
       withDataset(
         <DownloadFilesButton files={files} fileSelection={{}} />,
@@ -142,7 +142,7 @@ describe('DownloadFilesButton', () => {
       permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed(),
       hasOneTabularFileAtLeast: false
     })
-    const files = FileMother.createMany(2, { tabularData: undefined })
+    const files = FilePreviewMother.createMany(2, { tabularData: undefined })
     const fileSelection = {
       'some-file-id': files[0],
       'some-other-file-id': files[1]
@@ -166,7 +166,7 @@ describe('DownloadFilesButton', () => {
       permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed(),
       hasOneTabularFileAtLeast: true
     })
-    const files = FileMother.createMany(2, {
+    const files = FilePreviewMother.createMany(2, {
       tabularData: {
         variablesCount: 2,
         observationsCount: 3,
@@ -208,7 +208,7 @@ describe('DownloadFilesButton', () => {
         archival: 'https://dataset-download-url-archival'
       }
     })
-    const files = FileMother.createMany(2, {
+    const files = FilePreviewMother.createMany(2, {
       tabularData: {
         variablesCount: 2,
         observationsCount: 3,
@@ -244,7 +244,7 @@ describe('DownloadFilesButton', () => {
       permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed(),
       hasOneTabularFileAtLeast: true
     })
-    const files = FileMother.createMany(2, {
+    const files = FilePreviewMother.createMany(2, {
       tabularData: {
         variablesCount: 2,
         observationsCount: 3,
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx
index 0cc9ac5b9..b60acf569 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx
@@ -1,5 +1,5 @@
 import { EditFilesMenu } from '../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu'
-import { FileMother } from '../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../files/domain/models/FilePreviewMother'
 import { ReactNode } from 'react'
 import { Dataset as DatasetModel } from '../../../../../../../../src/dataset/domain/models/Dataset'
 import { DatasetProvider } from '../../../../../../../../src/sections/dataset/DatasetProvider'
@@ -15,7 +15,7 @@ const datasetWithUpdatePermissions = DatasetMother.create({
   permissions: DatasetPermissionsMother.createWithUpdateDatasetAllowed(),
   hasValidTermsOfAccess: true
 })
-const files = FileMother.createMany(2)
+const files = FilePreviewMother.createMany(2)
 describe('EditFilesMenu', () => {
   const withDataset = (component: ReactNode, dataset: DatasetModel | undefined) => {
     datasetRepository.getByPersistentId = cy.stub().resolves(dataset)
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.spec.tsx
index 2571bfcf9..1ea198c90 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.spec.tsx
@@ -1,7 +1,7 @@
 import { EditFilesOptions } from '../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions'
-import { FileMother } from '../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../files/domain/models/FilePreviewMother'
 
-const files = FileMother.createMany(2)
+const files = FilePreviewMother.createMany(2)
 describe('EditFilesOptions', () => {
   it('renders the EditFilesOptions', () => {
     cy.customMount(<EditFilesOptions files={files} fileSelection={{}} />)
@@ -14,7 +14,7 @@ describe('EditFilesOptions', () => {
   })
 
   it('renders the restrict option if some file is unrestricted', () => {
-    const fileUnrestricted = FileMother.createDefault()
+    const fileUnrestricted = FilePreviewMother.createDefault()
     cy.customMount(<EditFilesOptions files={[fileUnrestricted]} fileSelection={{}} />)
 
     cy.findByRole('button', { name: 'Restrict' }).should('exist').click()
@@ -23,7 +23,7 @@ describe('EditFilesOptions', () => {
   })
 
   it('renders the unrestrict option if some file is restricted', () => {
-    const fileRestricted = FileMother.createWithRestrictedAccess()
+    const fileRestricted = FilePreviewMother.createWithRestrictedAccess()
     cy.customMount(<EditFilesOptions files={[fileRestricted]} fileSelection={{}} />)
 
     cy.findByRole('button', { name: 'Unrestrict' }).should('exist').click()
@@ -65,7 +65,10 @@ describe('EditFilesOptions', () => {
 
   it('does not show the No Selected Files message when files are selected and one option is clicked', () => {
     cy.customMount(
-      <EditFilesOptions files={files} fileSelection={{ 'some-file-id': FileMother.create() }} />
+      <EditFilesOptions
+        files={files}
+        fileSelection={{ 'some-file-id': FilePreviewMother.create() }}
+      />
     )
 
     cy.findByRole('button', { name: 'Metadata' }).click()
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell.spec.tsx
index db2307af0..b7a44fc66 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell.spec.tsx
@@ -1,7 +1,7 @@
 import { FileActionsCell } from '../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/FileActionsCell'
-import { FileMother } from '../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../files/domain/models/FilePreviewMother'
 
-const file = FileMother.create()
+const file = FilePreviewMother.create()
 describe('FileActionsCell', () => {
   it('renders the file action buttons', () => {
     cy.customMount(<FileActionsCell file={file} />)
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.spec.tsx
index bef0f5345..466c2751f 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons.spec.tsx
@@ -1,5 +1,5 @@
 import { FileActionButtons } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/FileActionButtons'
-import { FileMother } from '../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../files/domain/models/FilePreviewMother'
 import { DatasetRepository } from '../../../../../../../../../src/dataset/domain/repositories/DatasetRepository'
 import {
   DatasetMother,
@@ -7,7 +7,7 @@ import {
 } from '../../../../../../../dataset/domain/models/DatasetMother'
 import { DatasetProvider } from '../../../../../../../../../src/sections/dataset/DatasetProvider'
 
-const file = FileMother.createDefault()
+const file = FilePreviewMother.createDefault()
 describe('FileActionButtons', () => {
   it('renders the file action buttons', () => {
     cy.customMount(<FileActionButtons file={file} />)
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.spec.tsx
index 460cfab8d..d49d6b0d5 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.spec.tsx
@@ -1,11 +1,11 @@
 import { AccessFileMenu } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu'
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import { Suspense } from 'react'
 import { FilePermissionsProvider } from '../../../../../../../../../../src/sections/file/file-permissions/FilePermissionsProvider'
 import { FileRepository } from '../../../../../../../../../../src/files/domain/repositories/FileRepository'
 import { FileUserPermissionsMother } from '../../../../../../../../files/domain/models/FileUserPermissionsMother'
 
-const file = FileMother.create()
+const file = FilePreviewMother.create()
 
 const fileRepository = {} as FileRepository
 describe('AccessFileMenu', () => {
@@ -41,7 +41,7 @@ describe('AccessFileMenu', () => {
   })
 
   it('renders the access status of the file', () => {
-    const filePublic = FileMother.createWithPublicAccess()
+    const filePublic = FilePreviewMother.createWithPublicAccess()
     cy.customMount(
       <Suspense fallback="loading">
         <AccessFileMenu file={filePublic} />
@@ -53,7 +53,8 @@ describe('AccessFileMenu', () => {
   })
 
   it('renders the request access button', () => {
-    const fileRestrictedWithAccessRequestAllowed = FileMother.createWithAccessRequestAllowed()
+    const fileRestrictedWithAccessRequestAllowed =
+      FilePreviewMother.createWithAccessRequestAllowed()
     cy.customMount(
       <Suspense fallback="loading">
         <AccessFileMenu file={fileRestrictedWithAccessRequestAllowed} />
@@ -65,7 +66,7 @@ describe('AccessFileMenu', () => {
   })
 
   it('renders the download options header', () => {
-    const filePublic = FileMother.createWithPublicAccess()
+    const filePublic = FilePreviewMother.createWithPublicAccess()
     cy.customMount(
       <FilePermissionsProvider repository={fileRepository}>
         <AccessFileMenu file={filePublic} />
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.spec.tsx
index c1ba17998..3003b6c29 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus.spec.tsx
@@ -1,4 +1,4 @@
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import { AccessStatus } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessStatus'
 import styles from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/AccessFileMenu.module.scss'
 import { FileRepository } from '../../../../../../../../../../src/files/domain/repositories/FileRepository'
@@ -7,7 +7,7 @@ import { FilePermissionsProvider } from '../../../../../../../../../../src/secti
 
 describe('AccessStatus', () => {
   it('renders the access status  public', () => {
-    const filePublic = FileMother.createWithPublicAccess()
+    const filePublic = FilePreviewMother.createWithPublicAccess()
     cy.customMount(<AccessStatus file={filePublic} />)
 
     cy.findByText('Public').should('exist').should('have.class', styles.success)
@@ -15,7 +15,7 @@ describe('AccessStatus', () => {
   })
 
   it('renders the access status restricted', () => {
-    const fileRestricted = FileMother.createWithRestrictedAccess()
+    const fileRestricted = FilePreviewMother.createWithRestrictedAccess()
     cy.customMount(<AccessStatus file={fileRestricted} />)
 
     cy.findByText('Restricted').should('exist').should('have.class', styles.danger)
@@ -23,7 +23,7 @@ describe('AccessStatus', () => {
   })
 
   it('renders the access status restricted with access', () => {
-    const fileRestrictedWithAccess = FileMother.createWithRestrictedAccessWithAccessGranted()
+    const fileRestrictedWithAccess = FilePreviewMother.createWithRestrictedAccessWithAccessGranted()
     const fileRepository: FileRepository = {} as FileRepository
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
@@ -45,7 +45,7 @@ describe('AccessStatus', () => {
   })
 
   it('renders the access status embargoed', () => {
-    const fileRestrictedWithAccess = FileMother.createWithRestrictedAccessWithAccessGranted()
+    const fileRestrictedWithAccess = FilePreviewMother.createWithRestrictedAccessWithAccessGranted()
     const fileRepository: FileRepository = {} as FileRepository
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
@@ -53,7 +53,7 @@ describe('AccessStatus', () => {
         canDownloadFile: true
       })
     )
-    const fileEmbargoed = FileMother.createWithEmbargo()
+    const fileEmbargoed = FilePreviewMother.createWithEmbargo()
     cy.customMount(
       <FilePermissionsProvider repository={fileRepository}>
         <AccessStatus file={fileEmbargoed} />{' '}
@@ -65,7 +65,7 @@ describe('AccessStatus', () => {
   })
 
   it('renders the access status embargoed restricted', () => {
-    const fileEmbargoedRestricted = FileMother.createWithEmbargoRestricted()
+    const fileEmbargoedRestricted = FilePreviewMother.createWithEmbargoRestricted()
     cy.customMount(<AccessStatus file={fileEmbargoedRestricted} />)
 
     cy.findByText('Embargoed').should('exist').should('have.class', styles.danger)
@@ -73,7 +73,7 @@ describe('AccessStatus', () => {
   })
 
   it('renders the access status embargoed restricted with access', () => {
-    const fileRestrictedWithAccess = FileMother.createWithRestrictedAccessWithAccessGranted()
+    const fileRestrictedWithAccess = FilePreviewMother.createWithRestrictedAccessWithAccessGranted()
     const fileRepository: FileRepository = {} as FileRepository
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
@@ -81,7 +81,7 @@ describe('AccessStatus', () => {
         canDownloadFile: true
       })
     )
-    const fileEmbargoedRestricted = FileMother.createWithEmbargoRestricted()
+    const fileEmbargoedRestricted = FilePreviewMother.createWithEmbargoRestricted()
     cy.customMount(
       <FilePermissionsProvider repository={fileRepository}>
         <AccessStatus file={fileEmbargoedRestricted} />{' '}
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.spec.tsx
index 912c63a18..4eb9e7ff8 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions.spec.tsx
@@ -1,11 +1,11 @@
 import { FileDownloadOptions } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileDownloadOptions'
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import { FileUserPermissionsMother } from '../../../../../../../../files/domain/models/FileUserPermissionsMother'
 import { FilePermissionsProvider } from '../../../../../../../../../../src/sections/file/file-permissions/FilePermissionsProvider'
 import { FileRepository } from '../../../../../../../../../../src/files/domain/repositories/FileRepository'
 
-const fileNonTabular = FileMother.createNonTabular()
-const fileTabular = FileMother.createTabular()
+const fileNonTabular = FilePreviewMother.createNonTabular()
+const fileTabular = FilePreviewMother.createTabular()
 const fileRepository = {} as FileRepository
 describe('FileDownloadOptions', () => {
   beforeEach(() => {
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions.spec.tsx
index 2d9cf8c17..b767a7ba0 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions.spec.tsx
@@ -1,8 +1,8 @@
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import {
   FileIngestStatus,
   FileType
-} from '../../../../../../../../../../src/files/domain/models/File'
+} from '../../../../../../../../../../src/files/domain/models/FilePreview'
 import { FileNonTabularDownloadOptions } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileNonTabularDownloadOptions'
 import { DatasetProvider } from '../../../../../../../../../../src/sections/dataset/DatasetProvider'
 import { DatasetRepository } from '../../../../../../../../../../src/dataset/domain/repositories/DatasetRepository'
@@ -11,13 +11,13 @@ import {
   DatasetMother
 } from '../../../../../../../../dataset/domain/models/DatasetMother'
 
-const fileNonTabular = FileMother.create({
+const fileNonTabular = FilePreviewMother.create({
   tabularData: undefined,
   type: new FileType('text/plain')
 })
 describe('FileNonTabularDownloadOptions', () => {
   it('renders the download options for a non-tabular file of unknown type', () => {
-    const fileNonTabularUnknown = FileMother.create({
+    const fileNonTabularUnknown = FilePreviewMother.create({
       tabularData: undefined,
       type: new FileType('unknown')
     })
@@ -39,7 +39,7 @@ describe('FileNonTabularDownloadOptions', () => {
   })
 
   it('does not render the download options for a tabular file', () => {
-    const fileTabular = FileMother.createTabular()
+    const fileTabular = FilePreviewMother.createTabular()
     cy.customMount(<FileNonTabularDownloadOptions file={fileTabular} />)
 
     cy.findByRole('link', { name: 'Original File Format' }).should('not.exist')
@@ -47,7 +47,7 @@ describe('FileNonTabularDownloadOptions', () => {
   })
 
   it('renders the options as disabled when the file ingest is in progress', () => {
-    const fileNonTabularInProgress = FileMother.create({
+    const fileNonTabularInProgress = FilePreviewMother.create({
       tabularData: undefined,
       type: new FileType('text/plain'),
       ingest: {
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions.spec.tsx
index 8dad61fb6..85f9d3582 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions.spec.tsx
@@ -1,8 +1,8 @@
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import {
   FileIngestStatus,
   FileType
-} from '../../../../../../../../../../src/files/domain/models/File'
+} from '../../../../../../../../../../src/files/domain/models/FilePreview'
 import { FileTabularDownloadOptions } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/FileTabularDownloadOptions'
 import { DatasetRepository } from '../../../../../../../../../../src/dataset/domain/repositories/DatasetRepository'
 import {
@@ -11,12 +11,12 @@ import {
 } from '../../../../../../../../dataset/domain/models/DatasetMother'
 import { DatasetProvider } from '../../../../../../../../../../src/sections/dataset/DatasetProvider'
 
-const fileNonTabular = FileMother.create({
+const fileNonTabular = FilePreviewMother.create({
   tabularData: undefined,
   type: new FileType('text/plain')
 })
-const fileTabular = FileMother.createTabular()
-const fileTabularUnknown = FileMother.createTabular({
+const fileTabular = FilePreviewMother.createTabular()
+const fileTabularUnknown = FilePreviewMother.createTabular({
   type: new FileType('text/tab-separated-values', 'Unknown')
 })
 describe('FileTabularDownloadOptions', () => {
@@ -55,7 +55,7 @@ describe('FileTabularDownloadOptions', () => {
   })
 
   it('renders the options as disabled when the file ingest is in progress', () => {
-    const fileTabularInProgress = FileMother.createTabular({
+    const fileTabularInProgress = FilePreviewMother.createTabular({
       ingest: {
         status: FileIngestStatus.IN_PROGRESS
       }
@@ -96,7 +96,7 @@ describe('FileTabularDownloadOptions', () => {
   })
 
   it('does not render the RData option if the file type is already R Data', () => {
-    const fileTabularRData = FileMother.createTabular({
+    const fileTabularRData = FilePreviewMother.createTabular({
       type: new FileType('text/tab-separated-values', 'R Data')
     })
     cy.customMount(<FileTabularDownloadOptions file={fileTabularRData} />)
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessModal.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessModal.spec.tsx
index 88002146f..d1190a20e 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessModal.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessModal.spec.tsx
@@ -1,19 +1,19 @@
 import { RequestAccessModal } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessModal'
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import { UserMother } from '../../../../../../../../users/domain/models/UserMother'
 import { UserRepository } from '../../../../../../../../../../src/users/domain/repositories/UserRepository'
 import { SessionProvider } from '../../../../../../../../../../src/sections/session/SessionProvider'
 import { Route } from '../../../../../../../../../../src/sections/Route.enum'
 describe('RequestAccessModal', () => {
   it('renders the RequestAccessModal', () => {
-    const file = FileMother.create()
+    const file = FilePreviewMother.create()
     cy.customMount(<RequestAccessModal fileId={file.id} />)
 
     cy.findByRole('button', { name: 'Request Access' }).should('exist')
   })
 
   it('shows login modal when button is clicked and user is not logged in', () => {
-    const file = FileMother.create()
+    const file = FilePreviewMother.create()
     cy.customMount(<RequestAccessModal fileId={file.id} />)
 
     cy.findByRole('button', { name: 'Request Access' }).click()
@@ -33,7 +33,7 @@ describe('RequestAccessModal', () => {
   })
 
   it('shows request access modal when button is clicked and user is logged in', () => {
-    const file = FileMother.create()
+    const file = FilePreviewMother.create()
     const user = UserMother.create()
     const userRepository = {} as UserRepository
     userRepository.getAuthenticated = cy.stub().resolves(user)
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.spec.tsx
index edf2eb32d..ef6f0e668 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption.spec.tsx
@@ -1,12 +1,12 @@
 import { RequestAccessOption } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/access-file-menu/RequestAccessOption'
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import { FileRepository } from '../../../../../../../../../../src/files/domain/repositories/FileRepository'
 import { FileUserPermissionsMother } from '../../../../../../../../files/domain/models/FileUserPermissionsMother'
 import { FilePermissionsProvider } from '../../../../../../../../../../src/sections/file/file-permissions/FilePermissionsProvider'
 
 describe('RequestAccessOption', () => {
   it('renders the embargoed message when the file is embargoed', () => {
-    const fileEmbargoed = FileMother.createWithEmbargo()
+    const fileEmbargoed = FilePreviewMother.createWithEmbargo()
     cy.customMount(<RequestAccessOption file={fileEmbargoed} />)
 
     cy.findByRole('button', { name: 'Files are unavailable during the specified embargo.' })
@@ -15,7 +15,7 @@ describe('RequestAccessOption', () => {
   })
 
   it('renders the embargo then restricted message when the file is embargoed and restricted', () => {
-    const fileEmbargoedRestricted = FileMother.createWithEmbargoRestricted()
+    const fileEmbargoedRestricted = FilePreviewMother.createWithEmbargoRestricted()
     cy.customMount(<RequestAccessOption file={fileEmbargoedRestricted} />)
 
     cy.findByRole('button', {
@@ -26,7 +26,7 @@ describe('RequestAccessOption', () => {
   })
 
   it('renders the Users may not request access to files. message when the file is restricted and access request is not allowed', () => {
-    const fileRestricted = FileMother.createWithRestrictedAccess()
+    const fileRestricted = FilePreviewMother.createWithRestrictedAccess()
     cy.customMount(<RequestAccessOption file={fileRestricted} />)
 
     cy.findByRole('button', { name: 'Users may not request access to files.' })
@@ -35,14 +35,14 @@ describe('RequestAccessOption', () => {
   })
 
   it('renders the request access button when the file is restricted and can be requested', () => {
-    const fileRestrictedCanBeRequested = FileMother.createWithAccessRequestAllowed()
+    const fileRestrictedCanBeRequested = FilePreviewMother.createWithAccessRequestAllowed()
     cy.customMount(<RequestAccessOption file={fileRestrictedCanBeRequested} />)
 
     cy.findByRole('button', { name: 'Request Access' }).should('exist')
   })
 
   it('renders the access requested message when hen the file is restricted and the access has already been requested', () => {
-    const fileAlreadyRequested = FileMother.createWithAccessRequestPending()
+    const fileAlreadyRequested = FilePreviewMother.createWithAccessRequestPending()
 
     cy.customMount(<RequestAccessOption file={fileAlreadyRequested} />)
 
@@ -52,7 +52,7 @@ describe('RequestAccessOption', () => {
   })
 
   it('does not render the request access button when the file is deaccessioned', () => {
-    const fileDeaccessioned = FileMother.createDeaccessioned()
+    const fileDeaccessioned = FilePreviewMother.createDeaccessioned()
     cy.customMount(<RequestAccessOption file={fileDeaccessioned} />)
 
     cy.findByRole('button', { name: 'Users may not request access to files.' }).should('not.exist')
@@ -67,7 +67,7 @@ describe('RequestAccessOption', () => {
   })
 
   it('does not render the request access button when the file status is public', () => {
-    const filePublic = FileMother.createWithPublicAccess()
+    const filePublic = FilePreviewMother.createWithPublicAccess()
     const fileRepository: FileRepository = {} as FileRepository
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
@@ -94,7 +94,7 @@ describe('RequestAccessOption', () => {
   })
 
   it('does not render the request access button when the file status is restricted with access granted', () => {
-    const fileRestrictedWithAccess = FileMother.createWithRestrictedAccessWithAccessGranted()
+    const fileRestrictedWithAccess = FilePreviewMother.createWithRestrictedAccessWithAccessGranted()
     const fileRepository: FileRepository = {} as FileRepository
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.spec.tsx
index e39c6dafb..d69579e11 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu.spec.tsx
@@ -1,5 +1,5 @@
 import { FileOptionsMenu } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-action-buttons/file-options-menu/FileOptionsMenu'
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import { ReactNode } from 'react'
 import { Dataset as DatasetModel } from '../../../../../../../../../../src/dataset/domain/models/Dataset'
 import { DatasetProvider } from '../../../../../../../../../../src/sections/dataset/DatasetProvider'
@@ -10,7 +10,7 @@ import {
   DatasetPermissionsMother
 } from '../../../../../../../../dataset/domain/models/DatasetMother'
 
-const file = FileMother.createDefault()
+const file = FilePreviewMother.createDefault()
 const datasetRepository: DatasetRepository = {} as DatasetRepository
 const datasetWithUpdatePermissions = DatasetMother.create({
   permissions: DatasetPermissionsMother.createWithUpdateDatasetAllowed(),
@@ -91,7 +91,7 @@ describe('FileOptionsMenu', () => {
   })
 
   it('opens fileAlreadyDeletedPrevious modal if file is already deleted', () => {
-    const file = FileMother.createDeleted()
+    const file = FilePreviewMother.createDeleted()
 
     cy.mountAuthenticated(
       withDataset(<FileOptionsMenu file={file} />, datasetWithUpdatePermissions)
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages.spec.tsx
index 8fe8355b3..37cc59003 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages.spec.tsx
@@ -1,16 +1,16 @@
 import { FileInfoMessages } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/FileInfoMessages'
-import { FileMother } from '../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../files/domain/models/FilePreviewMother'
 
 describe('FileInfoMessages', () => {
   it('renders the ingest message', () => {
-    const file = FileMother.createIngestInProgress()
+    const file = FilePreviewMother.createIngestInProgress()
     cy.customMount(<FileInfoMessages file={file} />)
 
     cy.findByText('Ingest in progress...').should('exist')
   })
 
   it('renders the access requested message', () => {
-    const file = FileMother.createWithAccessRequestPending()
+    const file = FilePreviewMother.createWithAccessRequestPending()
     cy.customMount(<FileInfoMessages file={file} />)
 
     cy.findByText('Access Requested').should('exist')
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage.spec.tsx
index ada6d3be3..3ac7e9ea6 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage.spec.tsx
@@ -1,5 +1,5 @@
 import { IngestInfoMessage } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-actions/file-actions-cell/file-info-messages/IngestInfoMessage'
-import { FileIngestMother } from '../../../../../../../files/domain/models/FileMother'
+import { FileIngestMother } from '../../../../../../../files/domain/models/FilePreviewMother'
 import { ReactNode } from 'react'
 import { Dataset as DatasetModel } from '../../../../../../../../../src/dataset/domain/models/Dataset'
 import { DatasetProvider } from '../../../../../../../../../src/sections/dataset/DatasetProvider'
diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileChecksum.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileChecksum.spec.tsx
index 8367973d0..671817a72 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileChecksum.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileChecksum.spec.tsx
@@ -1,6 +1,6 @@
 import { FileChecksum } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileChecksum'
 import styles from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.module.scss'
-import { FileChecksumMother } from '../../../../../../../files/domain/models/FileMother'
+import { FileChecksumMother } from '../../../../../../../files/domain/models/FilePreviewMother'
 
 describe('FileChecksum', () => {
   it('renders the checksum and CopyToClipboardButton when checksum is provided', () => {
diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDate.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDate.spec.tsx
index 9f605cc54..a8192fdde 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDate.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDate.spec.tsx
@@ -1,5 +1,5 @@
 import { FileDate } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDate'
-import { FileDateType } from '../../../../../../../../../src/files/domain/models/File'
+import { FileDateType } from '../../../../../../../../../src/files/domain/models/FilePreview'
 import { DateHelper } from '../../../../../../../../../src/shared/domain/helpers/DateHelper'
 
 describe('FileDate', () => {
diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDownloads.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDownloads.spec.tsx
index dfe971866..1e9bddcb3 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDownloads.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileDownloads.spec.tsx
@@ -1,4 +1,4 @@
-import { FilePublishingStatus } from '../../../../../../../../../src/files/domain/models/File'
+import { FilePublishingStatus } from '../../../../../../../../../src/files/domain/models/FilePreview'
 import { FileDownloads } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileDownloads'
 
 describe('FileDownloads', () => {
diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileEmbargoDate.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileEmbargoDate.spec.tsx
index 0e72039f8..95a8d9296 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileEmbargoDate.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileEmbargoDate.spec.tsx
@@ -1,6 +1,6 @@
 import { FileEmbargoDate } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileEmbargoDate'
-import { FilePublishingStatus } from '../../../../../../../../../src/files/domain/models/File'
-import { FileEmbargoMother } from '../../../../../../../files/domain/models/FileMother'
+import { FilePublishingStatus } from '../../../../../../../../../src/files/domain/models/FilePreview'
+import { FileEmbargoMother } from '../../../../../../../files/domain/models/FilePreviewMother'
 
 describe('FileEmbargoDate', () => {
   it('renders the embargo date when embargo exists', () => {
diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileLabels.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileLabels.spec.tsx
index fae3d5c90..41ae6a06c 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileLabels.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileLabels.spec.tsx
@@ -1,4 +1,4 @@
-import { FileLabelType } from '../../../../../../../../../src/files/domain/models/File'
+import { FileLabelType } from '../../../../../../../../../src/files/domain/models/FilePreview'
 import { FileLabels } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileLabels'
 import styles from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/FileInfoCell.module.scss'
 
diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileTitle.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileTitle.spec.tsx
index 11bee34de..55c45df94 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileTitle.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileTitle.spec.tsx
@@ -1,24 +1,17 @@
-import { FileMother } from '../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../files/domain/models/FilePreviewMother'
 import { FileTitle } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileTitle'
-import { FilePublishingStatus } from '../../../../../../../../../src/files/domain/models/File'
 
 describe('FileTitle', () => {
   it('renders the link and name correctly', () => {
     const id = 12345
-    const versionParameter = '&version=1'
     const name = 'file-name.txt'
-    const file = FileMother.create({
+    const file = FilePreviewMother.create({
       id: id,
-      version: { number: 1, publishingStatus: FilePublishingStatus.RELEASED },
       name: name
     })
 
-    cy.customMount(<FileTitle link={file.getLink()} name={file.name} />)
+    cy.customMount(<FileTitle id={file.id} name={file.name} />)
 
-    cy.findByRole('link', { name: name }).should(
-      'have.attr',
-      'href',
-      `/file?id=${id}${versionParameter}`
-    )
+    cy.findByRole('link', { name: name }).should('have.attr', 'href', `/files?id=${id}`)
   })
 })
diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileType.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileType.spec.tsx
index e68ae02c7..47731f3b8 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileType.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/FileType.spec.tsx
@@ -1,14 +1,14 @@
-import { FileMother } from '../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../files/domain/models/FilePreviewMother'
 import { FileType } from '../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/FileType'
 import {
   FileSize,
   FileSizeUnit,
   FileType as FileTypeModel
-} from '../../../../../../../../../src/files/domain/models/File'
+} from '../../../../../../../../../src/files/domain/models/FilePreview'
 
 describe('FileType', () => {
   it('renders the type and size correctly when there are no decimals', () => {
-    const file = FileMother.create({
+    const file = FilePreviewMother.create({
       type: new FileTypeModel('text/plain'),
       size: new FileSize(123.03932894722, FileSizeUnit.BYTES)
     })
@@ -18,7 +18,7 @@ describe('FileType', () => {
   })
 
   it('renders the type and size correctly when there are decimals', () => {
-    const file = FileMother.create({
+    const file = FilePreviewMother.create({
       type: new FileTypeModel('text/plain'),
       size: new FileSize(123.932894722, FileSizeUnit.MEGABYTES)
     })
@@ -28,7 +28,7 @@ describe('FileType', () => {
   })
 
   it('renders the type correctly when is a tabular file', () => {
-    const file = FileMother.createTabular({
+    const file = FilePreviewMother.createTabular({
       size: new FileSize(123.03932894722, FileSizeUnit.BYTES)
     })
 
diff --git a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.spec.tsx
index 48eadf5d1..1689053e8 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/files-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail.spec.tsx
@@ -1,14 +1,14 @@
 import { FileThumbnail } from '../../../../../../../../../../src/sections/dataset/dataset-files/files-table/file-info/file-info-cell/file-info-data/file-thumbnail/FileThumbnail'
-import { FileMother } from '../../../../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../../../../files/domain/models/FilePreviewMother'
 import { FileRepository } from '../../../../../../../../../../src/files/domain/repositories/FileRepository'
 import { FileUserPermissionsMother } from '../../../../../../../../files/domain/models/FileUserPermissionsMother'
 import { FilePermissionsProvider } from '../../../../../../../../../../src/sections/file/file-permissions/FilePermissionsProvider'
-import { FileType } from '../../../../../../../../../../src/files/domain/models/File'
+import { FileType } from '../../../../../../../../../../src/files/domain/models/FilePreview'
 
 const fileRepository: FileRepository = {} as FileRepository
 describe('FileThumbnail', () => {
   it('renders FileThumbnailPreviewImage when thumbnail is provided and file can be downloaded', () => {
-    const file = FileMother.createWithThumbnail()
+    const file = FilePreviewMother.createWithThumbnail()
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
@@ -31,7 +31,7 @@ describe('FileThumbnail', () => {
   })
 
   it('does not render FileThumbnailPreviewImage when thumbnail is provided and file cannot be downloaded', () => {
-    const file = FileMother.createWithThumbnail()
+    const file = FilePreviewMother.createWithThumbnail()
     cy.customMount(<FileThumbnail file={file} />)
 
     cy.findByAltText(file.name).should('not.exist')
@@ -40,7 +40,7 @@ describe('FileThumbnail', () => {
   })
 
   it('renders FileThumbnailPreviewImage when thumbnail is provided with unlocked icon if restricted with access', () => {
-    const file = FileMother.createWithThumbnailRestrictedWithAccessGranted()
+    const file = FilePreviewMother.createWithThumbnailRestrictedWithAccessGranted()
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
@@ -64,7 +64,7 @@ describe('FileThumbnail', () => {
   })
 
   it('does not render FileThumbnailPreviewImage when thumbnail is provided if restricted with no access', () => {
-    const file = FileMother.createWithThumbnailRestricted()
+    const file = FilePreviewMother.createWithThumbnailRestricted()
 
     cy.customMount(<FileThumbnail file={file} />)
 
@@ -77,7 +77,7 @@ describe('FileThumbnail', () => {
   })
 
   it('renders FileThumbnailIcon when thumbnail is not provided', () => {
-    const file = FileMother.createDefault({ type: new FileType('application/pdf') })
+    const file = FilePreviewMother.createDefault({ type: new FileType('application/pdf') })
 
     cy.customMount(<FileThumbnail file={file} />)
 
@@ -88,7 +88,7 @@ describe('FileThumbnail', () => {
   })
 
   it('renders FileThumbnailIcon when thumbnail is not provided with lock icon when restricted with no access', () => {
-    const file = FileMother.createWithRestrictedAccess()
+    const file = FilePreviewMother.createWithRestrictedAccess()
 
     cy.customMount(<FileThumbnail file={file} />)
 
@@ -101,7 +101,7 @@ describe('FileThumbnail', () => {
   })
 
   it('renders FileThumbnailIcon when thumbnail is not provided with unlock icon when restricted with access', () => {
-    const file = FileMother.createWithRestrictedAccessWithAccessGranted()
+    const file = FilePreviewMother.createWithRestrictedAccessWithAccessGranted()
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       FileUserPermissionsMother.create({
         fileId: file.id,
diff --git a/tests/component/sections/dataset/dataset-files/files-table/row-selection/RowSelectionMessage.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/row-selection/RowSelectionMessage.spec.tsx
index c36626009..39a673bb0 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/row-selection/RowSelectionMessage.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/row-selection/RowSelectionMessage.spec.tsx
@@ -1,5 +1,5 @@
 import { RowSelectionMessage } from '../../../../../../../src/sections/dataset/dataset-files/files-table/row-selection/RowSelectionMessage'
-import { FileMother } from '../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../files/domain/models/FilePreviewMother'
 
 let selectAllRows = () => {}
 let clearRowSelection = () => {}
@@ -12,7 +12,7 @@ describe('RowSelectionMessage', () => {
   it('renders the message when there are more than 10 files and some row is selected', () => {
     cy.customMount(
       <RowSelectionMessage
-        fileSelection={{ '1': FileMother.create() }}
+        fileSelection={{ '1': FilePreviewMother.create() }}
         totalFilesCount={11}
         selectAllRows={selectAllRows}
         clearRowSelection={clearRowSelection}
@@ -27,7 +27,7 @@ describe('RowSelectionMessage', () => {
   it('does not render the message when there are less than 10 files', () => {
     cy.customMount(
       <RowSelectionMessage
-        fileSelection={{ '1': FileMother.create() }}
+        fileSelection={{ '1': FilePreviewMother.create() }}
         totalFilesCount={9}
         selectAllRows={selectAllRows}
         clearRowSelection={clearRowSelection}
@@ -57,7 +57,7 @@ describe('RowSelectionMessage', () => {
   it('renders the plural form of the message when there is more than 1 row selected', () => {
     cy.customMount(
       <RowSelectionMessage
-        fileSelection={{ '1': FileMother.create(), '2': FileMother.create() }}
+        fileSelection={{ '1': FilePreviewMother.create(), '2': FilePreviewMother.create() }}
         totalFilesCount={11}
         selectAllRows={selectAllRows}
         clearRowSelection={clearRowSelection}
@@ -70,7 +70,7 @@ describe('RowSelectionMessage', () => {
   it("calls selectAllRows when the 'Select all' button is clicked", () => {
     cy.customMount(
       <RowSelectionMessage
-        fileSelection={{ '1': FileMother.create() }}
+        fileSelection={{ '1': FilePreviewMother.create() }}
         totalFilesCount={11}
         selectAllRows={selectAllRows}
         clearRowSelection={clearRowSelection}
@@ -85,7 +85,7 @@ describe('RowSelectionMessage', () => {
   it("calls clearRowSelection when the 'Clear selection.' button is clicked", () => {
     cy.customMount(
       <RowSelectionMessage
-        fileSelection={{ '1': FileMother.create() }}
+        fileSelection={{ '1': FilePreviewMother.create() }}
         totalFilesCount={11}
         selectAllRows={selectAllRows}
         clearRowSelection={clearRowSelection}
diff --git a/tests/component/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.spec.tsx
index 619b5560b..e7f845598 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage.spec.tsx
@@ -1,13 +1,13 @@
-import { FileMother } from '../../../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../../../files/domain/models/FilePreviewMother'
 import { ZipDownloadLimitMessage } from '../../../../../../../src/sections/dataset/dataset-files/files-table/zip-download-limit-message/ZipDownloadLimitMessage'
-import { FileSize, FileSizeUnit } from '../../../../../../../src/files/domain/models/File'
+import { FileSize, FileSizeUnit } from '../../../../../../../src/files/domain/models/FilePreview'
 import { SettingMother } from '../../../../../settings/domain/models/SettingMother'
 import { ZipDownloadLimit } from '../../../../../../../src/settings/domain/models/ZipDownloadLimit'
 import { SettingsContext } from '../../../../../../../src/sections/settings/SettingsContext'
 
 const fileSelection = {
-  0: FileMother.create({ size: new FileSize(1024, FileSizeUnit.BYTES) }),
-  1: FileMother.create({ size: new FileSize(2048, FileSizeUnit.BYTES) })
+  0: FilePreviewMother.create({ size: new FileSize(1024, FileSizeUnit.BYTES) }),
+  1: FilePreviewMother.create({ size: new FileSize(2048, FileSizeUnit.BYTES) })
 }
 const zipDownloadLimit = new ZipDownloadLimit(500, FileSizeUnit.BYTES)
 const filesTotalDownloadSize = 3072 // 3.0 KB
@@ -20,7 +20,9 @@ describe('ZipDownloadLimitMessage', () => {
     cy.customMount(
       <SettingsContext.Provider value={{ getSettingByName }}>
         <ZipDownloadLimitMessage
-          fileSelection={{ 0: FileMother.create({ size: new FileSize(1024, FileSizeUnit.BYTES) }) }}
+          fileSelection={{
+            0: FilePreviewMother.create({ size: new FileSize(1024, FileSizeUnit.BYTES) })
+          }}
           visitedFiles={{}}
           filesTotalDownloadSize={filesTotalDownloadSize}
         />
@@ -39,8 +41,8 @@ describe('ZipDownloadLimitMessage', () => {
       <SettingsContext.Provider value={{ getSettingByName }}>
         <ZipDownloadLimitMessage
           fileSelection={{
-            0: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
-            1: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) })
+            0: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            1: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) })
           }}
           visitedFiles={{}}
           filesTotalDownloadSize={filesTotalDownloadSize}
@@ -78,8 +80,8 @@ describe('ZipDownloadLimitMessage', () => {
       <SettingsContext.Provider value={{ getSettingByName }}>
         <ZipDownloadLimitMessage
           fileSelection={{
-            0: FileMother.create({ size: new FileSize(1000000, FileSizeUnit.PETABYTES) }),
-            1: FileMother.create({ size: new FileSize(1000000, FileSizeUnit.PETABYTES) })
+            0: FilePreviewMother.create({ size: new FileSize(1000000, FileSizeUnit.PETABYTES) }),
+            1: FilePreviewMother.create({ size: new FileSize(1000000, FileSizeUnit.PETABYTES) })
           }}
           visitedFiles={{}}
           filesTotalDownloadSize={filesTotalDownloadSize}
@@ -100,8 +102,8 @@ describe('ZipDownloadLimitMessage', () => {
       <SettingsContext.Provider value={{ getSettingByName }}>
         <ZipDownloadLimitMessage
           fileSelection={{
-            0: FileMother.create({ size: new FileSize(1000000, FileSizeUnit.PETABYTES) }),
-            1: FileMother.create({ size: new FileSize(1000000, FileSizeUnit.PETABYTES) }),
+            0: FilePreviewMother.create({ size: new FileSize(1000000, FileSizeUnit.PETABYTES) }),
+            1: FilePreviewMother.create({ size: new FileSize(1000000, FileSizeUnit.PETABYTES) }),
             2: undefined
           }}
           visitedFiles={{}}
@@ -126,14 +128,14 @@ describe('ZipDownloadLimitMessage', () => {
       <SettingsContext.Provider value={{ getSettingByName }}>
         <ZipDownloadLimitMessage
           fileSelection={{
-            0: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
-            1: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            0: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            1: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
             3: undefined
           }}
           visitedFiles={{
-            0: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
-            1: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
-            2: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            0: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            1: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            2: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
             3: undefined
           }}
           filesTotalDownloadSize={filesTotalDownloadSize}
@@ -157,16 +159,16 @@ describe('ZipDownloadLimitMessage', () => {
       <SettingsContext.Provider value={{ getSettingByName }}>
         <ZipDownloadLimitMessage
           fileSelection={{
-            0: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
-            1: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
-            2: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            0: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            1: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            2: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
             3: undefined,
-            4: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) })
+            4: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) })
           }}
           visitedFiles={{
-            0: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
-            1: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
-            2: FileMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            0: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            1: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
+            2: FilePreviewMother.create({ size: new FileSize(1, FileSizeUnit.BYTES) }),
             3: undefined
           }}
           filesTotalDownloadSize={filesTotalDownloadSize}
diff --git a/tests/component/sections/dataset/dataset-files/useFiles.spec.tsx b/tests/component/sections/dataset/dataset-files/useFiles.spec.tsx
index 6e958064e..3ed044b5f 100644
--- a/tests/component/sections/dataset/dataset-files/useFiles.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/useFiles.spec.tsx
@@ -1,29 +1,18 @@
 import { FilesCountInfoMother } from '../../../files/domain/models/FilesCountInfoMother'
-import { FileMother } from '../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../files/domain/models/FilePreviewMother'
 import { FileRepository } from '../../../../../src/files/domain/repositories/FileRepository'
 import { useFiles } from '../../../../../src/sections/dataset/dataset-files/useFiles'
 import { FileUserPermissionsMother } from '../../../files/domain/models/FileUserPermissionsMother'
 import { FilePermissionsProvider } from '../../../../../src/sections/file/file-permissions/FilePermissionsProvider'
 import { useState } from 'react'
-import {
-  DatasetPublishingStatus,
-  DatasetVersion
-} from '../../../../../src/dataset/domain/models/Dataset'
-import { FileCriteria, FileSortByOption } from '../../../../../src/files/domain/models/FileCriteria'
 import { FilePaginationInfo } from '../../../../../src/files/domain/models/FilePaginationInfo'
+import { FileCriteria, FileSortByOption } from '../../../../../src/files/domain/models/FileCriteria'
+import { DatasetVersionMother } from '../../../dataset/domain/models/DatasetMother'
 
-const files = FileMother.createMany(100)
+const files = FilePreviewMother.createMany(100)
 const filesCountInfo = FilesCountInfoMother.create({ total: 100 })
 const fileRepository: FileRepository = {} as FileRepository
-const datasetVersion = new DatasetVersion(
-  1,
-  DatasetPublishingStatus.RELEASED,
-  true,
-  false,
-  DatasetPublishingStatus.RELEASED,
-  1,
-  0
-)
+const datasetVersion = DatasetVersionMother.createReleased()
 
 const FilesTableTestComponent = ({ datasetPersistentId }: { datasetPersistentId: string }) => {
   const [paginationInfo, setPaginationInfo] = useState<FilePaginationInfo>(new FilePaginationInfo())
@@ -112,7 +101,7 @@ describe('useFiles', () => {
   })
 
   it('calls the file repository to get the permissions before removing the loading', () => {
-    const files = FileMother.createMany(5)
+    const files = FilePreviewMother.createMany(5)
     fileRepository.getAllByDatasetPersistentId = cy.stub().resolves(files)
     fileRepository.getUserPermissionsById = cy.stub().resolves(
       new Promise((resolve) => {
@@ -166,7 +155,7 @@ describe('useFiles', () => {
     cy.wrap(fileRepository.getFilesCountInfoByDatasetPersistentId).should(
       'be.calledOnceWith',
       'persistentId',
-      datasetVersion,
+      datasetVersion.number,
       new FileCriteria()
     )
 
@@ -176,7 +165,7 @@ describe('useFiles', () => {
     cy.wrap(fileRepository.getFilesCountInfoByDatasetPersistentId).should(
       'be.calledWith',
       'persistentId',
-      datasetVersion,
+      datasetVersion.number,
       new FileCriteria().withSortBy(FileSortByOption.NAME_ZA)
     )
   })
diff --git a/tests/component/sections/file/File.spec.tsx b/tests/component/sections/file/File.spec.tsx
new file mode 100644
index 000000000..3049c4b91
--- /dev/null
+++ b/tests/component/sections/file/File.spec.tsx
@@ -0,0 +1,48 @@
+import { FileRepository } from '../../../../src/files/domain/repositories/FileRepository'
+import { FileMother } from '../../files/domain/models/FileMother'
+import { File } from '../../../../src/sections/file/File'
+
+const fileRepository: FileRepository = {} as FileRepository
+
+describe('File', () => {
+  it('renders the File page title and details', () => {
+    const testFile = FileMother.createRealistic()
+    fileRepository.getById = cy.stub().resolves(testFile)
+
+    cy.customMount(<File repository={fileRepository} id={19} />)
+
+    cy.wrap(fileRepository.getById).should('be.calledWith', 19)
+
+    cy.findAllByText(testFile.name).should('exist')
+    cy.findByText(`This file is part of "${testFile.datasetVersion.title}".`).should('exist')
+    cy.findByText('Version 1.0').should('exist')
+  })
+
+  it('renders skeleton while loading', () => {
+    const testFile = FileMother.createRealistic()
+    fileRepository.getById = cy.stub().resolves(testFile)
+
+    cy.customMount(<File repository={fileRepository} id={19} />)
+
+    cy.findByTestId('file-skeleton').should('exist')
+    cy.wrap(fileRepository.getById).should('be.calledWith', 19)
+    cy.findByText(testFile.name).should('not.exist')
+  })
+
+  it('renders page not found when file is not found', () => {
+    fileRepository.getById = cy.stub().resolves(undefined)
+
+    cy.customMount(<File repository={fileRepository} id={19} />)
+
+    cy.findByText('Page Not Found').should('exist')
+  })
+
+  it('renders the restricted icon if the file is restricted', () => {
+    const testFile = FileMother.createRestricted()
+    fileRepository.getById = cy.stub().resolves(testFile)
+
+    cy.customMount(<File repository={fileRepository} id={19} />)
+
+    cy.findByText('Restricted File Icon').should('exist')
+  })
+})
diff --git a/tests/component/sections/file/file-access/FileAccessRestrictedIcon.spec.tsx b/tests/component/sections/file/file-access/FileAccessRestrictedIcon.spec.tsx
new file mode 100644
index 000000000..5d918e82a
--- /dev/null
+++ b/tests/component/sections/file/file-access/FileAccessRestrictedIcon.spec.tsx
@@ -0,0 +1,28 @@
+import { FileAccessRestrictedIcon } from '../../../../../src/sections/file/file-access/FileAccessRestrictedIcon'
+
+describe('FileAccessRestrictedIcon', () => {
+  it('should render the restricted icon if the file is restricted and the user cannot download the file', () => {
+    cy.customMount(<FileAccessRestrictedIcon restricted={true} canDownloadFile={false} />)
+
+    cy.findByTitle('Restricted File Icon').should('exist').parent().trigger('mouseover')
+    cy.findByText('File Access: Restricted').should('exist')
+
+    cy.findByTitle('Restricted with access Icon').should('not.exist')
+  })
+
+  it('should render the restricted with access icon if the file is restricted and the user can download the file', () => {
+    cy.customMount(<FileAccessRestrictedIcon restricted={true} canDownloadFile={true} />)
+
+    cy.findByTitle('Restricted with access Icon').should('exist').parent().trigger('mouseover')
+    cy.findByText('File Access: Restricted with Access Granted').should('exist')
+
+    cy.findByTitle('Restricted File Icon').should('not.exist')
+  })
+
+  it('should not render any icon if the file is not restricted', () => {
+    cy.customMount(<FileAccessRestrictedIcon restricted={false} canDownloadFile={true} />)
+
+    cy.findByTitle('Restricted with access Icon').should('not.exist')
+    cy.findByTitle('Restricted File Icon').should('not.exist')
+  })
+})
diff --git a/tests/component/sections/file/file-permissions/useFileDownloadPermission.spec.tsx b/tests/component/sections/file/file-permissions/useFileDownloadPermission.spec.tsx
index 9492c88d3..6254bcad8 100644
--- a/tests/component/sections/file/file-permissions/useFileDownloadPermission.spec.tsx
+++ b/tests/component/sections/file/file-permissions/useFileDownloadPermission.spec.tsx
@@ -1,13 +1,13 @@
-import { FileMother } from '../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../files/domain/models/FilePreviewMother'
 import { FilePermissionsProvider } from '../../../../../src/sections/file/file-permissions/FilePermissionsProvider'
 import { FileRepository } from '../../../../../src/files/domain/repositories/FileRepository'
-import { File } from '../../../../../src/files/domain/models/File'
+import { FilePreview } from '../../../../../src/files/domain/models/FilePreview'
 import { FileUserPermissionsMother } from '../../../files/domain/models/FileUserPermissionsMother'
 import { FilesCountInfoMother } from '../../../files/domain/models/FilesCountInfoMother'
 import { useFileDownloadPermission } from '../../../../../src/sections/file/file-permissions/useFileDownloadPermission'
 
 const fileRepository: FileRepository = {} as FileRepository
-function TestComponent({ file }: { file: File }) {
+function TestComponent({ file }: { file: FilePreview }) {
   const { sessionUserHasFileDownloadPermission } = useFileDownloadPermission(file)
 
   return (
@@ -30,7 +30,7 @@ describe('useFileDownloadPermission', () => {
   })
 
   it('should return file download permission', () => {
-    const file = FileMother.createDeaccessioned()
+    const file = FilePreviewMother.createDeaccessioned()
     fileRepository.getUserPermissionsById = cy
       .stub()
       .resolves(FileUserPermissionsMother.create({ fileId: file.id, canEditDataset: true }))
@@ -46,7 +46,7 @@ describe('useFileDownloadPermission', () => {
   })
 
   it('should return false for file download permission if there is an error', () => {
-    const file = FileMother.createDeaccessioned()
+    const file = FilePreviewMother.createDeaccessioned()
     fileRepository.getUserPermissionsById = cy
       .stub()
       .rejects(new Error('Error getting file user permissions'))
diff --git a/tests/component/sections/file/file-permissions/useFilePermissions.spec.tsx b/tests/component/sections/file/file-permissions/useFilePermissions.spec.tsx
index 127ae2f9b..89ae6215d 100644
--- a/tests/component/sections/file/file-permissions/useFilePermissions.spec.tsx
+++ b/tests/component/sections/file/file-permissions/useFilePermissions.spec.tsx
@@ -1,10 +1,10 @@
 import { useFilePermissions } from '../../../../../src/sections/file/file-permissions/FilePermissionsContext'
 import { FilePermission } from '../../../../../src/files/domain/models/FileUserPermissions'
-import { FileMother } from '../../../files/domain/models/FileMother'
+import { FilePreviewMother } from '../../../files/domain/models/FilePreviewMother'
 import { useEffect, useState } from 'react'
 import { FilePermissionsProvider } from '../../../../../src/sections/file/file-permissions/FilePermissionsProvider'
 import { FileRepository } from '../../../../../src/files/domain/repositories/FileRepository'
-import { File } from '../../../../../src/files/domain/models/File'
+import { FilePreview } from '../../../../../src/files/domain/models/FilePreview'
 import { FileUserPermissionsMother } from '../../../files/domain/models/FileUserPermissionsMother'
 import { FilesCountInfoMother } from '../../../files/domain/models/FilesCountInfoMother'
 import { AnonymizedContext } from '../../../../../src/sections/dataset/anonymized/AnonymizedContext'
@@ -15,7 +15,7 @@ function SavedPermissionsTestComponent({
   file,
   permission
 }: {
-  file: File
+  file: FilePreview
   permission: FilePermission
 }) {
   const { checkSessionUserHasFilePermission } = useFilePermissions()
@@ -52,7 +52,7 @@ function SavedPermissionsTestComponent({
   )
 }
 
-function TestComponent({ file, permission }: { file: File; permission: FilePermission }) {
+function TestComponent({ file, permission }: { file: FilePreview; permission: FilePermission }) {
   const { checkSessionUserHasFilePermission } = useFilePermissions()
   const [hasFilePermission, setHasFilePermission] = useState<boolean>(false)
   useEffect(() => {
@@ -86,7 +86,7 @@ describe('useFilePermissions', () => {
 
   describe('Download permission', () => {
     it('should not call getFileUserPermissionsById when the file is not deaccessioned nor restricted nor embargoed', () => {
-      const file = FileMother.createDefault()
+      const file = FilePreviewMother.createDefault()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id }))
@@ -101,7 +101,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should call getFileUserPermissionsById when the file is deaccessioned', () => {
-      const file = FileMother.createDeaccessioned()
+      const file = FilePreviewMother.createDeaccessioned()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id, canEditDataset: true }))
@@ -117,7 +117,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should call getFileUserPermissionsById when the file is restricted', () => {
-      const file = FileMother.createWithRestrictedAccess()
+      const file = FilePreviewMother.createWithRestrictedAccess()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id, canDownloadFile: true }))
@@ -132,7 +132,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should call getFileUserPermissionsById when the file is public but latest version is restricted', () => {
-      const file = FileMother.createWithPublicAccessButLatestVersionRestricted()
+      const file = FilePreviewMother.createWithPublicAccessButLatestVersionRestricted()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id, canDownloadFile: true }))
@@ -147,7 +147,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should call getFileUserPermissionsById when the file is embargoed', () => {
-      const file = FileMother.createWithEmbargo()
+      const file = FilePreviewMother.createWithEmbargo()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id, canDownloadFile: true }))
@@ -162,7 +162,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should return false if there is an error in the use case request', () => {
-      const file = FileMother.createWithEmbargo()
+      const file = FilePreviewMother.createWithEmbargo()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .rejects(new Error('There was an error getting the file user permissions'))
@@ -177,7 +177,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should use the saved state of the permission the second time the file is being consulted', () => {
-      const file = FileMother.createWithRestrictedAccess()
+      const file = FilePreviewMother.createWithRestrictedAccess()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id, canDownloadFile: true }))
@@ -193,7 +193,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should always allow to download if the user is in anonymized view (privateUrl)', () => {
-      const file = FileMother.createWithRestrictedAccess()
+      const file = FilePreviewMother.createWithRestrictedAccess()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id, canDownloadFile: false }))
@@ -215,7 +215,7 @@ describe('useFilePermissions', () => {
 
   describe('Edit dataset permission', () => {
     it('should call getFileUserPermissionsById when asking for edit dataset permission', () => {
-      const file = FileMother.createDefault()
+      const file = FilePreviewMother.createDefault()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id, canEditDataset: true }))
@@ -231,7 +231,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should return false if there is an error in the use case request', () => {
-      const file = FileMother.createDefault()
+      const file = FilePreviewMother.createDefault()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .rejects(new Error('There was an error getting the file user permissions'))
@@ -246,7 +246,7 @@ describe('useFilePermissions', () => {
     })
 
     it('should use the saved state of the edit dataset permission the second time the file is being consulted', () => {
-      const file = FileMother.createDefault()
+      const file = FilePreviewMother.createDefault()
       fileRepository.getUserPermissionsById = cy
         .stub()
         .resolves(FileUserPermissionsMother.create({ fileId: file.id, canEditDataset: true }))
diff --git a/tests/component/sections/home/Home.spec.tsx b/tests/component/sections/home/Home.spec.tsx
index 52fe1d34a..fb3146917 100644
--- a/tests/component/sections/home/Home.spec.tsx
+++ b/tests/component/sections/home/Home.spec.tsx
@@ -22,7 +22,7 @@ describe('Home page', () => {
     cy.wrap(datasetRepository.getAll).should('be.calledOnce')
 
     datasets.forEach((dataset) => {
-      cy.findByText(dataset.title).should('exist')
+      cy.findByText(dataset.version.title).should('exist')
     })
   })
 })
diff --git a/tests/component/sections/home/datasets-list/DatasetsList.spec.tsx b/tests/component/sections/home/datasets-list/DatasetsList.spec.tsx
index e126ce245..e5e2f79f0 100644
--- a/tests/component/sections/home/datasets-list/DatasetsList.spec.tsx
+++ b/tests/component/sections/home/datasets-list/DatasetsList.spec.tsx
@@ -17,7 +17,7 @@ describe('Datasets List', () => {
 
     cy.findByTestId('datasets-list-skeleton').should('exist')
     datasets.forEach((dataset) => {
-      cy.findByRole('link', { name: dataset.title }).should('not.exist')
+      cy.findByRole('link', { name: dataset.version.title }).should('not.exist')
     })
   })
 
@@ -38,7 +38,7 @@ describe('Datasets List', () => {
 
     cy.findByText('1 to 10 of 200 Datasets').should('exist')
     datasets.forEach((dataset) => {
-      cy.findByText(dataset.title)
+      cy.findByText(dataset.version.title)
         .should('exist')
         .should('have.attr', 'href', `/datasets?persistentId=${dataset.persistentId}`)
     })
diff --git a/tests/component/sections/home/datasets-list/dataset-card/DatasetCard.spec.tsx b/tests/component/sections/home/datasets-list/dataset-card/DatasetCard.spec.tsx
index 8b66c37d1..ad6bb084a 100644
--- a/tests/component/sections/home/datasets-list/dataset-card/DatasetCard.spec.tsx
+++ b/tests/component/sections/home/datasets-list/dataset-card/DatasetCard.spec.tsx
@@ -8,11 +8,11 @@ describe('DatasetCard', () => {
     const dataset = DatasetPreviewMother.createWithThumbnail()
     cy.customMount(<DatasetCard dataset={dataset} />)
 
-    cy.findByText(dataset.title).should('exist')
+    cy.findByText(dataset.version.title).should('exist')
 
-    cy.findByRole('img', { name: dataset.title }).should('exist')
+    cy.findByRole('img', { name: dataset.version.title }).should('exist')
     cy.findByText(DateHelper.toDisplayFormat(dataset.releaseOrCreateDate)).should('exist')
-    cy.findByText(/Finch, Fiona, 2023, "Darwin's Finches"/)
+    cy.findByText(/Admin, Dataverse, 2023, "Dataset Title",/)
       .should('exist')
       .parent()
       .should('have.class', styles['citation-box'])
diff --git a/tests/component/sections/home/datasets-list/dataset-card/DatasetCardHeader.spec.tsx b/tests/component/sections/home/datasets-list/dataset-card/DatasetCardHeader.spec.tsx
index 1e7773dfc..e428583cb 100644
--- a/tests/component/sections/home/datasets-list/dataset-card/DatasetCardHeader.spec.tsx
+++ b/tests/component/sections/home/datasets-list/dataset-card/DatasetCardHeader.spec.tsx
@@ -4,12 +4,14 @@ import { DatasetPreviewMother } from '../../../../dataset/domain/models/DatasetP
 describe('DatasetCardHeader', () => {
   it('should render the header', () => {
     const dataset = DatasetPreviewMother.create()
-    cy.customMount(<DatasetCardHeader dataset={dataset} />)
+    cy.customMount(
+      <DatasetCardHeader persistentId={dataset.persistentId} version={dataset.version} />
+    )
 
-    cy.findByText(dataset.title)
+    cy.findByText(dataset.version.title)
       .should('exist')
       .should('have.attr', 'href', `/datasets?persistentId=${dataset.persistentId}`)
-    dataset.labels.forEach((label) => {
+    dataset.version.labels.forEach((label) => {
       cy.findByText(label.value).should('exist')
     })
     cy.findByLabelText('icon-dataset').should('exist')
diff --git a/tests/component/sections/home/datasets-list/dataset-card/DatasetCardInfo.spec.tsx b/tests/component/sections/home/datasets-list/dataset-card/DatasetCardInfo.spec.tsx
index 5563fe412..f44e90ced 100644
--- a/tests/component/sections/home/datasets-list/dataset-card/DatasetCardInfo.spec.tsx
+++ b/tests/component/sections/home/datasets-list/dataset-card/DatasetCardInfo.spec.tsx
@@ -6,10 +6,16 @@ import { DatasetCardInfo } from '../../../../../../src/sections/home/datasets-li
 describe('DatasetCardInfo', () => {
   it('should render the dataset info', () => {
     const dataset = DatasetPreviewMother.createDraft()
-    cy.customMount(<DatasetCardInfo dataset={dataset} />)
+    cy.customMount(
+      <DatasetCardInfo
+        version={dataset.version}
+        releaseOrCreateDate={dataset.releaseOrCreateDate}
+        abbreviatedDescription={dataset.abbreviatedDescription}
+      />
+    )
 
     cy.findByText(DateHelper.toDisplayFormat(dataset.releaseOrCreateDate)).should('exist')
-    cy.findByText(/Finch, Fiona, 2023, "Darwin's Finches"/)
+    cy.findByText(/Admin, Dataverse, 2023, "Dataset Title",/)
       .should('exist')
       .parent()
       .should('have.class', styles['citation-box'])
@@ -18,9 +24,15 @@ describe('DatasetCardInfo', () => {
 
   it('should render the citation with the deaccessioned background if the dataset is deaccessioned', () => {
     const dataset = DatasetPreviewMother.createDeaccessioned()
-    cy.customMount(<DatasetCardInfo dataset={dataset} />)
+    cy.customMount(
+      <DatasetCardInfo
+        version={dataset.version}
+        releaseOrCreateDate={dataset.releaseOrCreateDate}
+        abbreviatedDescription={dataset.abbreviatedDescription}
+      />
+    )
 
-    cy.findByText(/Finch, Fiona, 2023, "Darwin's Finches"/)
+    cy.findByText(/Admin, Dataverse, 2023, "Dataset Title",/)
       .should('exist')
       .parent()
       .should('have.class', styles['citation-box-deaccessioned'])
diff --git a/tests/component/sections/home/datasets-list/dataset-card/DatasetCardThumbnail.spec.tsx b/tests/component/sections/home/datasets-list/dataset-card/DatasetCardThumbnail.spec.tsx
index e261e32db..b66e98a14 100644
--- a/tests/component/sections/home/datasets-list/dataset-card/DatasetCardThumbnail.spec.tsx
+++ b/tests/component/sections/home/datasets-list/dataset-card/DatasetCardThumbnail.spec.tsx
@@ -4,9 +4,15 @@ import { DatasetCardThumbnail } from '../../../../../../src/sections/home/datase
 describe('DatasetCardThumbnail', () => {
   it('should render the thumbnail', () => {
     const dataset = DatasetPreviewMother.createWithThumbnail()
-    cy.customMount(<DatasetCardThumbnail dataset={dataset} />)
+    cy.customMount(
+      <DatasetCardThumbnail
+        persistentId={dataset.persistentId}
+        version={dataset.version}
+        thumbnail={dataset.thumbnail}
+      />
+    )
 
-    cy.findByRole('img', { name: dataset.title })
+    cy.findByRole('img', { name: dataset.version.title })
       .should('exist')
       .parent('a')
       .should('have.attr', 'href', `/datasets?persistentId=${dataset.persistentId}`)
@@ -14,7 +20,13 @@ describe('DatasetCardThumbnail', () => {
 
   it('should render the placeholder if the dataset has no thumbnail', () => {
     const dataset = DatasetPreviewMother.createWithNoThumbnail()
-    cy.customMount(<DatasetCardThumbnail dataset={dataset} />)
+    cy.customMount(
+      <DatasetCardThumbnail
+        persistentId={dataset.persistentId}
+        version={dataset.version}
+        thumbnail={dataset.thumbnail}
+      />
+    )
 
     cy.findByRole('img', { name: 'icon-dataset' })
       .should('exist')
diff --git a/tests/component/settings/domain/models/SettingMother.ts b/tests/component/settings/domain/models/SettingMother.ts
index 59574ba60..b3066153c 100644
--- a/tests/component/settings/domain/models/SettingMother.ts
+++ b/tests/component/settings/domain/models/SettingMother.ts
@@ -1,7 +1,7 @@
 import { faker } from '@faker-js/faker'
 import { Setting, SettingName } from '../../../../../src/settings/domain/models/Setting'
 import { ZipDownloadLimit } from '../../../../../src/settings/domain/models/ZipDownloadLimit'
-import { FileSizeUnit } from '../../../../../src/files/domain/models/File'
+import { FileSizeUnit } from '../../../../../src/files/domain/models/FilePreview'
 
 export class SettingMother {
   static createZipDownloadLimit(value?: ZipDownloadLimit): Setting<ZipDownloadLimit> {
diff --git a/tests/e2e-integration/e2e/sections/file/File.spec.tsx b/tests/e2e-integration/e2e/sections/file/File.spec.tsx
new file mode 100644
index 000000000..dac419c86
--- /dev/null
+++ b/tests/e2e-integration/e2e/sections/file/File.spec.tsx
@@ -0,0 +1,6 @@
+describe('File', () => {
+  it('successfully loads', () => {
+    cy.visit('/spa/files?id=23')
+    cy.findAllByText('file.csv').should('exist')
+  })
+})
diff --git a/tests/e2e-integration/integration/datasets/DatasetJSDataverseRepository.spec.ts b/tests/e2e-integration/integration/datasets/DatasetJSDataverseRepository.spec.ts
index a01416885..dcdbcefd6 100644
--- a/tests/e2e-integration/integration/datasets/DatasetJSDataverseRepository.spec.ts
+++ b/tests/e2e-integration/integration/datasets/DatasetJSDataverseRepository.spec.ts
@@ -3,6 +3,8 @@ import chaiAsPromised from 'chai-as-promised'
 import { DatasetJSDataverseRepository } from '../../../../src/dataset/infrastructure/repositories/DatasetJSDataverseRepository'
 import { TestsUtils } from '../../shared/TestsUtils'
 import {
+  DatasetLabel,
+  DatasetLabelSemanticMeaning,
   DatasetLockReason,
   DatasetPublishingStatus,
   DatasetVersion
@@ -12,7 +14,7 @@ import {
   FileDownloadMode,
   FileDownloadSize,
   FileSizeUnit
-} from '../../../../src/files/domain/models/File'
+} from '../../../../src/files/domain/models/FilePreview'
 import { DatasetPaginationInfo } from '../../../../src/dataset/domain/models/DatasetPaginationInfo'
 
 chai.use(chaiAsPromised)
@@ -25,15 +27,19 @@ function getCurrentDateInYYYYMMDDFormat() {
   ).padStart(2, '0')}`
 }
 
-const datasetData = (persistentId: string, versionId: number) => {
-  const persistentIdUrl = `https://doi.org/${persistentId.replace('doi:', '')}`
+function getPersistentIdUrl(persistentId: string) {
+  return `https://doi.org/${persistentId.replace('doi:', '')}`
+}
+
+function getCitationString(persistentId: string, version: 'DRAFT VERSION' | 'V1') {
   const year = new Date().getFullYear()
+  return `Finch, Fiona, ${year}, "Darwin's Finches", <a href="${getPersistentIdUrl(
+    persistentId
+  )}" target="_blank">${getPersistentIdUrl(persistentId)}</a>, Root, ${version}`
+}
+
+const datasetData = (persistentId: string, versionId: number) => {
   return {
-    citation: `Finch, Fiona, ${year}, "Darwin's Finches", <a href="${persistentIdUrl}" target="_blank">${persistentIdUrl}</a>, Root, DRAFT VERSION`,
-    labels: [
-      { semanticMeaning: 'dataset', value: 'Draft' },
-      { semanticMeaning: 'warning', value: 'Unpublished' }
-    ],
     license: {
       name: 'CC0 1.0',
       uri: 'http://creativecommons.org/publicdomain/zero/1.0',
@@ -81,13 +87,21 @@ const datasetData = (persistentId: string, versionId: number) => {
     title: "Darwin's Finches",
     version: {
       id: versionId,
-      majorNumber: undefined,
-      minorNumber: undefined,
+      number: {
+        majorNumber: undefined,
+        minorNumber: undefined
+      },
       publishingStatus: 'draft',
-      requestedVersion: undefined,
-      latestVersionStatus: 'draft',
+      latestVersionPublishingStatus: 'draft',
       isLatest: true,
-      isInReview: false
+      isInReview: false,
+      citation: getCitationString(persistentId, 'DRAFT VERSION'),
+      title: "Darwin's Finches",
+      labels: [
+        { semanticMeaning: 'dataset', value: 'Draft' },
+        { semanticMeaning: 'warning', value: 'Unpublished' }
+      ],
+      someDatasetVersionHasBeenReleased: false
     },
     permissions: {
       canDownloadFiles: true,
@@ -125,9 +139,6 @@ describe('Dataset JSDataverse Repository', () => {
       }
       const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
 
-      expect(dataset.title).to.deep.equal(datasetExpected.title)
-      expect(dataset.citation).to.deep.equal(datasetExpected.citation)
-      expect(dataset.labels).to.deep.equal(datasetExpected.labels)
       expect(dataset.license).to.deep.equal(datasetExpected.license)
       expect(dataset.metadataBlocks).to.deep.equal(datasetExpected.metadataBlocks)
       expect(dataset.summaryFields).to.deep.equal(datasetExpected.summaryFields)
@@ -155,18 +166,22 @@ describe('Dataset JSDataverse Repository', () => {
         if (!dataset) {
           throw new Error('Dataset not found')
         }
-        const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
         const newVersion = new DatasetVersion(
           dataset.version.id,
+          "Darwin's Finches",
+          {
+            majorNumber: 1,
+            minorNumber: 0
+          },
           DatasetPublishingStatus.RELEASED,
+          getCitationString(dataset.persistentId, 'V1'),
+          [new DatasetLabel(DatasetLabelSemanticMeaning.FILE, 'Version 1.0')],
           true,
           false,
           DatasetPublishingStatus.RELEASED,
-          1,
-          0
+          true
         )
         const expectedPublicationDate = getCurrentDateInYYYYMMDDFormat()
-        expect(dataset.title).to.deep.equal(datasetExpected.title)
         expect(dataset.version).to.deep.equal(newVersion)
         expect(dataset.metadataBlocks[0].fields.publicationDate).to.deep.equal(
           expectedPublicationDate
@@ -196,15 +211,20 @@ describe('Dataset JSDataverse Repository', () => {
         const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
         const newVersion = new DatasetVersion(
           dataset.version.id,
+          "Darwin's Finches",
+          {
+            majorNumber: 1,
+            minorNumber: 0
+          },
           DatasetPublishingStatus.RELEASED,
+          getCitationString(dataset.persistentId, 'V1'),
+          [new DatasetLabel(DatasetLabelSemanticMeaning.FILE, 'Version 1.0')],
           true,
           false,
           DatasetPublishingStatus.RELEASED,
-          1,
-          0
+          true
         )
         const expectedPublicationDate = getCurrentDateInYYYYMMDDFormat()
-        expect(dataset.title).to.deep.equal(datasetExpected.title)
         expect(dataset.version).to.deep.equal(newVersion)
         expect(dataset.metadataBlocks[0].fields.publicationDate).to.deep.equal(
           expectedPublicationDate
@@ -225,7 +245,7 @@ describe('Dataset JSDataverse Repository', () => {
         }
         const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
 
-        expect(dataset.title).to.deep.equal(datasetExpected.title)
+        expect(dataset.version.title).to.deep.equal(datasetExpected.title)
         expect(dataset.version).to.deep.equal(datasetExpected.version)
       })
   })
@@ -240,7 +260,7 @@ describe('Dataset JSDataverse Repository', () => {
       }
       const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
 
-      expect(dataset.title).to.deep.equal(datasetExpected.title)
+      expect(dataset.version.title).to.deep.equal(datasetExpected.title)
       expect(dataset.version).to.deep.equal(datasetExpected.version)
       expect(dataset.permissions).to.deep.equal(datasetExpected.permissions)
     })
@@ -286,7 +306,7 @@ describe('Dataset JSDataverse Repository', () => {
 
     await datasetRepository.getAll(paginationInfo).then((datasetPreview) => {
       expect(datasetPreview.length).to.equal(1)
-      expect(datasetPreview[0].title).to.equal("Darwin's Finches")
+      expect(datasetPreview[0].version.title).to.equal("Darwin's Finches")
       expect(datasetPreview[0].persistentId).to.equal(datasetResponse.persistentId)
     })
   })
@@ -305,7 +325,7 @@ describe('Dataset JSDataverse Repository', () => {
       }
       const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
 
-      expect(dataset.title).to.deep.equal(datasetExpected.title)
+      expect(dataset.version.title).to.deep.equal(datasetExpected.title)
     })
   })
   it('gets the dataset by persistentId when is locked', async () => {
@@ -318,7 +338,7 @@ describe('Dataset JSDataverse Repository', () => {
       }
       const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
 
-      expect(dataset.title).to.deep.equal(datasetExpected.title)
+      expect(dataset.version.title).to.deep.equal(datasetExpected.title)
       expect(dataset.locks).to.deep.equal([
         {
           userPersistentId: 'dataverseAdmin',
diff --git a/tests/e2e-integration/integration/files/FileJSDataverseRepository.spec.ts b/tests/e2e-integration/integration/files/FileJSDataverseRepository.spec.ts
index d079f9e2a..92825b822 100644
--- a/tests/e2e-integration/integration/files/FileJSDataverseRepository.spec.ts
+++ b/tests/e2e-integration/integration/files/FileJSDataverseRepository.spec.ts
@@ -1,7 +1,7 @@
 import { TestsUtils } from '../../shared/TestsUtils'
 import { FileJSDataverseRepository } from '../../../../src/files/infrastructure/FileJSDataverseRepository'
 import {
-  File,
+  FilePreview,
   FileDateType,
   FileEmbargo,
   FileIngestStatus,
@@ -10,14 +10,10 @@ import {
   FileSize,
   FileSizeUnit,
   FileType
-} from '../../../../src/files/domain/models/File'
+} from '../../../../src/files/domain/models/FilePreview'
 import chai from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 import { DatasetJSDataverseRepository } from '../../../../src/dataset/infrastructure/repositories/DatasetJSDataverseRepository'
-import {
-  DatasetPublishingStatus,
-  DatasetVersion
-} from '../../../../src/dataset/domain/models/Dataset'
 import {
   FileAccessOption,
   FileCriteria,
@@ -27,6 +23,7 @@ import {
 import { DatasetHelper } from '../../shared/datasets/DatasetHelper'
 import { FileData, FileHelper } from '../../shared/files/FileHelper'
 import { FilesCountInfo } from '../../../../src/files/domain/models/FilesCountInfo'
+import { DatasetVersionMother } from '../../../component/dataset/domain/models/DatasetMother'
 import { FilePaginationInfo } from '../../../../src/files/domain/models/FilePaginationInfo'
 
 chai.use(chaiAsPromised)
@@ -37,7 +34,7 @@ const datasetRepository = new DatasetJSDataverseRepository()
 const dateNow = new Date()
 dateNow.setHours(2, 0, 0, 0)
 const fileData = (id: number) => {
-  return new File(
+  return new FilePreview(
     id,
     { number: 1, publishingStatus: FilePublishingStatus.DRAFT },
     'blob',
@@ -144,15 +141,7 @@ describe('File JSDataverse Repository', () => {
       await fileRepository
         .getAllByDatasetPersistentId(
           dataset.persistentId,
-          new DatasetVersion(
-            dataset.version.id,
-            DatasetPublishingStatus.RELEASED,
-            true,
-            false,
-            DatasetPublishingStatus.RELEASED,
-            1,
-            0
-          )
+          DatasetVersionMother.createReleased({ id: dataset.version.id })
         )
         .then((files) => {
           const expectedPublishedFile = fileData(files[0].id)
@@ -180,15 +169,7 @@ describe('File JSDataverse Repository', () => {
       await fileRepository
         .getAllByDatasetPersistentId(
           dataset.persistentId,
-          new DatasetVersion(
-            dataset.version.id,
-            DatasetPublishingStatus.DEACCESSIONED,
-            true,
-            false,
-            DatasetPublishingStatus.DEACCESSIONED,
-            1,
-            0
-          )
+          DatasetVersionMother.createDeaccessioned({ id: dataset.version.id })
         )
         .then((files) => {
           const expectedDeaccessionedFile = fileData(files[0].id)
@@ -572,7 +553,7 @@ describe('File JSDataverse Repository', () => {
       await fileRepository
         .getFilesCountInfoByDatasetPersistentId(
           dataset.persistentId,
-          dataset.version,
+          dataset.version.number,
           new FileCriteria()
         )
         .then((filesCountInfo) => {
@@ -645,7 +626,7 @@ describe('File JSDataverse Repository', () => {
       await fileRepository
         .getFilesCountInfoByDatasetPersistentId(
           dataset.persistentId,
-          dataset.version,
+          dataset.version.number,
           new FileCriteria().withFilterByType('text/csv')
         )
         .then((filesCountInfo) => {
@@ -715,7 +696,10 @@ describe('File JSDataverse Repository', () => {
           }, 0)
         })
       await fileRepository
-        .getFilesTotalDownloadSizeByDatasetPersistentId(dataset.persistentId, dataset.version)
+        .getFilesTotalDownloadSizeByDatasetPersistentId(
+          dataset.persistentId,
+          dataset.version.number
+        )
         .then((totalDownloadSize) => {
           expect(totalDownloadSize).to.deep.equal(expectedTotalDownloadSize)
         })
@@ -760,7 +744,7 @@ describe('File JSDataverse Repository', () => {
       await fileRepository
         .getFilesTotalDownloadSizeByDatasetPersistentId(
           dataset.persistentId,
-          dataset.version,
+          dataset.version.number,
           new FileCriteria().withFilterByType('csv')
         )
         .then((totalDownloadSize) => {
diff --git a/tests/e2e-integration/shared/files/FileHelper.ts b/tests/e2e-integration/shared/files/FileHelper.ts
index 7ae2c1b33..ad59011ec 100644
--- a/tests/e2e-integration/shared/files/FileHelper.ts
+++ b/tests/e2e-integration/shared/files/FileHelper.ts
@@ -1,5 +1,5 @@
 import { DataverseApiHelper } from '../DataverseApiHelper'
-import { FileLabel, FileLabelType } from '../../../../src/files/domain/models/File'
+import { FileLabel, FileLabelType } from '../../../../src/files/domain/models/FilePreview'
 import { faker } from '@faker-js/faker'
 
 interface FileResponse {